From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4w-0001vH-Jj; Tue, 02 Jun 2015 14:22:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4v-0001v9-Ir for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:05 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id DD/A2-10437-C0CBD655; Tue, 02 Jun 2015 14:22:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1433254922!12397925!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14194 invoked from network); 2 Jun 2015 14:22:03 -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; 2 Jun 2015 14:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4s-0006h2-O4 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4s-00032e-Ju for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:02 +0000 Message-Id: Date: Tue, 02 Jun 2015 14:22:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: read hotplug script once at start of day X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Ian Campbell # Date 1433253806 -7200 # Node ID 43dfca4e7fa04cfd90a8c195d592c7ab43d54b2b # Parent afe2ac5137b8c247dea886c732d09791fe44ac91 netback: read hotplug script once at start of day When we come to tear things down in netback_remove() and generate the uevent it is possible that the xenstore directory has already been removed (details below). In such cases netback_uevent() won't be able to read the hotplug script and will write a xenstore error node. A recent change to the hypervisor exposed this race such that we now sometimes lose it (where apparently we didn't ever before). Instead read the hotplug script configuration during setup and use it for the lifetime of the backend device. The apparently more obvious fix of moving the transition to state=Closed in netback_remove() to after the uevent does not work because it is possible that we are already in state=Closed (in reaction to the guest having disconnected as it shutdown). Being already in Closed means the toolstack is at liberty to start tearing down the xenstore directories. In principal it might be possible to arrange to unregister the device sooner (e.g on transition to Closing) such that xenstore would still be there but this state machine is fragile and prone to anger... A modern Xen system only relies on the hotplug uevent for driver domains, when the backend is in the same domain as the toolstack it will run the necessary setup/teardown directly in the correct sequence wrt xenstore changes. Signed-off-by: Ian Campbell Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r afe2ac5137b8 -r 43dfca4e7fa0 drivers/xen/netback/common.h --- a/drivers/xen/netback/common.h Tue Mar 10 14:38:39 2015 +0100 +++ b/drivers/xen/netback/common.h Tue Jun 02 16:03:26 2015 +0200 @@ -147,6 +147,8 @@ struct backend_info { struct xenbus_watch hotplug_status_watch; int have_hotplug_status_watch:1; + const char *hotplug_script; + /* State relating to the netback accelerator */ void *netback_accel_priv; /* The accelerator that this backend is currently using */ diff -r afe2ac5137b8 -r 43dfca4e7fa0 drivers/xen/netback/xenbus.c --- a/drivers/xen/netback/xenbus.c Tue Mar 10 14:38:39 2015 +0100 +++ b/drivers/xen/netback/xenbus.c Tue Jun 02 16:03:26 2015 +0200 @@ -42,6 +42,7 @@ static int netback_remove(struct xenbus_ netback_remove_accelerators(be, dev); netback_disconnect(&dev->dev); + kfree(be->hotplug_script); kfree(be); dev->dev.driver_data = NULL; return 0; @@ -71,6 +72,7 @@ static int netback_probe(struct xenbus_d struct xenbus_transaction xbt; int err; int sg; + const char *script; struct backend_info *be = kzalloc(sizeof(struct backend_info), GFP_KERNEL); if (!be) { @@ -133,6 +135,15 @@ static int netback_probe(struct xenbus_d netback_probe_accelerators(be, dev); + script = xenbus_read(XBT_NIL, dev->nodename, "script", NULL); + if (IS_ERR(script)) { + err = PTR_ERR(script); + xenbus_dev_fatal(dev, err, "reading script"); + goto fail; + } + + be->hotplug_script = script; + err = xenbus_switch_state(dev, XenbusStateInitWait); if (err) goto fail; @@ -165,22 +176,11 @@ static int netback_uevent(struct xenbus_ struct backend_info *be = xdev->dev.driver_data; netif_t *netif = be->netif; int i = 0, length = 0; - char *val; DPRINTK("netback_uevent"); - val = xenbus_read(XBT_NIL, xdev->nodename, "script", NULL); - if (IS_ERR(val)) { - int err = PTR_ERR(val); - xenbus_dev_fatal(xdev, err, "reading script"); - return err; - } - else { - add_uevent_var(envp, num_envp, &i, buffer, buffer_size, - &length, "script=%s", val); - kfree(val); - } - + add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, + "script=%s", be->hotplug_script); add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "vif=%s", netif->dev->name); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4y-0001w6-Uf; Tue, 02 Jun 2015 14: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 1Yzn4x-0001vW-LB for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:07 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id A5/96-26286-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-31.messagelabs.com!1433254923!12286994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2909 invoked from network); 2 Jun 2015 14:22:04 -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; 2 Jun 2015 14:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4t-0006hB-PQ for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4t-00033N-OL for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Message-Id: Date: Tue, 02 Jun 2015 14: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] scsiif: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433254152 -7200 # Node ID 62922fbe9fe2ceb749413dfccb4645d2c83bf69b # Parent aba765eb6c4449c1d8763071e63555f12c0a5d71 scsiif: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself. Signed-off-by: Jan Beulich --- diff -r aba765eb6c44 -r 62922fbe9fe2 drivers/xen/scsiback/xenbus.c --- a/drivers/xen/scsiback/xenbus.c Tue Jun 02 16:07:39 2015 +0200 +++ b/drivers/xen/scsiback/xenbus.c Tue Jun 02 16:09:12 2015 +0200 @@ -46,23 +46,11 @@ struct backend_info }; -static int __vscsiif_name(struct backend_info *be, char *buf) -{ - struct xenbus_device *dev = be->dev; - unsigned int domid, id; - - sscanf(dev->nodename, "backend/vscsi/%u/%u", &domid, &id); - snprintf(buf, TASK_COMM_LEN, "vscsi.%u.%u", be->info->domid, id); - - return 0; -} - static int scsiback_map(struct backend_info *be) { struct xenbus_device *dev = be->dev; - unsigned int ring_ref, evtchn; + unsigned int ring_ref, evtchn, dom, id; int err; - char name[TASK_COMM_LEN]; err = xenbus_gather(XBT_NIL, dev->otherend, "ring-ref", "%u", &ring_ref, @@ -76,13 +64,16 @@ static int scsiback_map(struct backend_i if (err) return err; - err = __vscsiif_name(be, name); - if (err) { - xenbus_dev_error(dev, err, "get scsiback dev name"); + err = sscanf(be->dev->nodename, "backend/vscsi/%u/%u", &dom, &id); + if (err != 2) { + if (err >= 0) + err = -EILSEQ; + xenbus_dev_error(dev, err, "get scsiback devid"); return err; } - be->info->kthread = kthread_run(scsiback_schedule, be->info, name); + be->info->kthread = kthread_run(scsiback_schedule, be->info, + "vscsi.%d.%u", be->info->domid, id); if (IS_ERR(be->info->kthread)) { err = PTR_ERR(be->info->kthread); be->info->kthread = NULL; diff -r aba765eb6c44 -r 62922fbe9fe2 drivers/xen/scsifront/xenbus.c --- a/drivers/xen/scsifront/xenbus.c Tue Jun 02 16:07:39 2015 +0200 +++ b/drivers/xen/scsifront/xenbus.c Tue Jun 02 16:09:12 2015 +0200 @@ -35,12 +35,6 @@ #include "common.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) - #define DEFAULT_TASK_COMM_LEN 16 -#else - #define DEFAULT_TASK_COMM_LEN TASK_COMM_LEN -#endif - extern struct scsi_host_template scsifront_sht; static void scsifront_free_ring(struct vscsifrnt_info *info) @@ -182,7 +176,6 @@ static int scsifront_probe(struct xenbus struct vscsifrnt_info *info; struct Scsi_Host *host; int i, err = -ENOMEM; - char name[DEFAULT_TASK_COMM_LEN]; host = scsi_host_alloc(&scsifront_sht, sizeof(*info)); if (!host) { @@ -218,9 +211,8 @@ static int scsifront_probe(struct xenbus info->waiting_pause = 0; init_waitqueue_head(&info->wq_pause); - snprintf(name, DEFAULT_TASK_COMM_LEN, "vscsiif.%d", info->host->host_no); - - info->kthread = kthread_run(scsifront_schedule, info, name); + info->kthread = kthread_run(scsifront_schedule, info, + "vscsiif.%d", info->host->host_no); if (IS_ERR(info->kthread)) { err = PTR_ERR(info->kthread); info->kthread = NULL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4y-0001w6-Uf; Tue, 02 Jun 2015 14: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 1Yzn4x-0001vW-LB for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:07 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id A5/96-26286-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-31.messagelabs.com!1433254923!12286994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2909 invoked from network); 2 Jun 2015 14:22:04 -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; 2 Jun 2015 14:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4t-0006hB-PQ for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4t-00033N-OL for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Message-Id: Date: Tue, 02 Jun 2015 14: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] scsiif: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433254152 -7200 # Node ID 62922fbe9fe2ceb749413dfccb4645d2c83bf69b # Parent aba765eb6c4449c1d8763071e63555f12c0a5d71 scsiif: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself. Signed-off-by: Jan Beulich --- diff -r aba765eb6c44 -r 62922fbe9fe2 drivers/xen/scsiback/xenbus.c --- a/drivers/xen/scsiback/xenbus.c Tue Jun 02 16:07:39 2015 +0200 +++ b/drivers/xen/scsiback/xenbus.c Tue Jun 02 16:09:12 2015 +0200 @@ -46,23 +46,11 @@ struct backend_info }; -static int __vscsiif_name(struct backend_info *be, char *buf) -{ - struct xenbus_device *dev = be->dev; - unsigned int domid, id; - - sscanf(dev->nodename, "backend/vscsi/%u/%u", &domid, &id); - snprintf(buf, TASK_COMM_LEN, "vscsi.%u.%u", be->info->domid, id); - - return 0; -} - static int scsiback_map(struct backend_info *be) { struct xenbus_device *dev = be->dev; - unsigned int ring_ref, evtchn; + unsigned int ring_ref, evtchn, dom, id; int err; - char name[TASK_COMM_LEN]; err = xenbus_gather(XBT_NIL, dev->otherend, "ring-ref", "%u", &ring_ref, @@ -76,13 +64,16 @@ static int scsiback_map(struct backend_i if (err) return err; - err = __vscsiif_name(be, name); - if (err) { - xenbus_dev_error(dev, err, "get scsiback dev name"); + err = sscanf(be->dev->nodename, "backend/vscsi/%u/%u", &dom, &id); + if (err != 2) { + if (err >= 0) + err = -EILSEQ; + xenbus_dev_error(dev, err, "get scsiback devid"); return err; } - be->info->kthread = kthread_run(scsiback_schedule, be->info, name); + be->info->kthread = kthread_run(scsiback_schedule, be->info, + "vscsi.%d.%u", be->info->domid, id); if (IS_ERR(be->info->kthread)) { err = PTR_ERR(be->info->kthread); be->info->kthread = NULL; diff -r aba765eb6c44 -r 62922fbe9fe2 drivers/xen/scsifront/xenbus.c --- a/drivers/xen/scsifront/xenbus.c Tue Jun 02 16:07:39 2015 +0200 +++ b/drivers/xen/scsifront/xenbus.c Tue Jun 02 16:09:12 2015 +0200 @@ -35,12 +35,6 @@ #include "common.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) - #define DEFAULT_TASK_COMM_LEN 16 -#else - #define DEFAULT_TASK_COMM_LEN TASK_COMM_LEN -#endif - extern struct scsi_host_template scsifront_sht; static void scsifront_free_ring(struct vscsifrnt_info *info) @@ -182,7 +176,6 @@ static int scsifront_probe(struct xenbus struct vscsifrnt_info *info; struct Scsi_Host *host; int i, err = -ENOMEM; - char name[DEFAULT_TASK_COMM_LEN]; host = scsi_host_alloc(&scsifront_sht, sizeof(*info)); if (!host) { @@ -218,9 +211,8 @@ static int scsifront_probe(struct xenbus info->waiting_pause = 0; init_waitqueue_head(&info->wq_pause); - snprintf(name, DEFAULT_TASK_COMM_LEN, "vscsiif.%d", info->host->host_no); - - info->kthread = kthread_run(scsifront_schedule, info, name); + info->kthread = kthread_run(scsifront_schedule, info, + "vscsiif.%d", info->host->host_no); if (IS_ERR(info->kthread)) { err = PTR_ERR(info->kthread); info->kthread = NULL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4y-0001vw-QD; Tue, 02 Jun 2015 14: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 1Yzn4x-0001vR-7O for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:07 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 38/31-11060-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-31.messagelabs.com!1433254924!12410662!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19410 invoked from network); 2 Jun 2015 14:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2015 14:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4u-0006hH-HC for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4u-00033s-Ft for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Message-Id: Date: Tue, 02 Jun 2015 14:22:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: fix placement of ecrit labels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1433254422 -7200 # Node ID 8f6b99f4c45fbee6c5911fbd0835353b9de1fdeb # Parent a429985613f2ad6739ddbd44eb296954678b78ce x86: fix placement of ecrit labels On the 32-bit side, they must go ahead of TRACE_IRQS_OFF. On the 64-bit side it was placed way too late (but isn't being used, so this was only a latent issue). Also rename the labels to be local ones. Signed-off-by: Jan Beulich --- diff -r a429985613f2 -r 8f6b99f4c45f arch/i386/kernel/entry-xen.S --- a/arch/i386/kernel/entry-xen.S Tue Jun 02 16:10:19 2015 +0200 +++ b/arch/i386/kernel/entry-xen.S Tue Jun 02 16:13:42 2015 +0200 @@ -362,14 +362,14 @@ 1: movl (%ebp),%ebp #ifdef CONFIG_XEN TRACE_IRQS_ON __ENABLE_INTERRUPTS -sysexit_scrit: /**** START OF SYSEXIT CRITICAL REGION ****/ +.Lsysexit_scrit: /**** START OF SYSEXIT CRITICAL REGION ****/ __TEST_PENDING jnz 14f # process more events if necessary... movl ESI(%esp), %esi sysexit 14: __DISABLE_INTERRUPTS +.Lsysexit_ecrit: /**** END OF SYSEXIT CRITICAL REGION ****/ TRACE_IRQS_OFF -sysexit_ecrit: /**** END OF SYSEXIT CRITICAL REGION ****/ push %esp call evtchn_do_upcall add $4,%esp @@ -518,7 +518,7 @@ 1: iret restore_all_enable_events: TRACE_IRQS_ON __ENABLE_INTERRUPTS -scrit: /**** START OF CRITICAL REGION ****/ +.Lscrit: /**** START OF CRITICAL REGION ****/ __TEST_PENDING jnz 14f # process more events if necessary... RESTORE_REGS @@ -530,8 +530,8 @@ 1: iret .long 1b,iret_exc .previous 14: __DISABLE_INTERRUPTS +.Lecrit: /**** END OF CRITICAL REGION ****/ TRACE_IRQS_OFF -ecrit: /**** END OF CRITICAL REGION ****/ jmp .Ldo_upcall CFI_RESTORE_STATE @@ -793,15 +793,15 @@ ENTRY(hypervisor_callback) testb $2,CS(%esp) movl EIP(%esp),%eax jnz .Ldo_upcall - cmpl $scrit,%eax + cmpl $.Lscrit,%eax jb 0f - cmpl $ecrit,%eax + cmpl $.Lecrit,%eax jb critical_region_fixup 0: #ifdef CONFIG_XEN_SUPERVISOR_MODE_KERNEL - cmpl $sysexit_scrit,%eax + cmpl $.Lsysexit_scrit,%eax jb .Ldo_upcall - cmpl $sysexit_ecrit,%eax + cmpl $.Lsysexit_ecrit,%eax ja .Ldo_upcall addl $OLDESP,%esp # Remove eflags...ebx from stack frame. #endif @@ -822,7 +822,7 @@ 0: # provides the number of bytes which have already been popped from the # interrupted stack frame. critical_region_fixup: - movsbl critical_fixup_table-scrit(%eax),%ecx # %ecx contains num slots popped + movsbl critical_fixup_table-.Lscrit(%eax),%ecx # %ecx contains num slots popped testl %ecx,%ecx leal (%esp,%ecx,4),%esi # %esi points at end of src region leal OLDESP(%esp),%edi # %edi points at end of dst region diff -r a429985613f2 -r 8f6b99f4c45f arch/x86_64/kernel/entry-xen.S --- a/arch/x86_64/kernel/entry-xen.S Tue Jun 02 16:10:19 2015 +0200 +++ b/arch/x86_64/kernel/entry-xen.S Tue Jun 02 16:13:42 2015 +0200 @@ -945,7 +945,7 @@ restore_all_enable_events: TRACE_IRQS_ON XEN_UNBLOCK_EVENTS(%rsi) # %rsi is already set up... -scrit: /**** START OF CRITICAL REGION ****/ +.Lscrit: /**** START OF CRITICAL REGION ****/ XEN_TEST_PENDING(%rsi) CFI_REMEMBER_STATE jnz 14f # process more events if necessary... @@ -955,12 +955,12 @@ scrit: /**** START OF CRITICAL REGION ** CFI_RESTORE_STATE 14: XEN_LOCKED_BLOCK_EVENTS(%rsi) +.Lecrit: /**** END OF CRITICAL REGION ****/ XEN_PUT_VCPU_INFO(%rsi) SAVE_REST movq %rsp,%rdi # set the argument again jmp 11b CFI_ENDPROC -ecrit: /**** END OF CRITICAL REGION ****/ # At this point, unlike on x86-32, we don't do the fixup to simplify the # code and the stack frame is more complex on x86-64. # When the kernel is interrupted in the critical section, the kernel _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4y-0001vw-QD; Tue, 02 Jun 2015 14: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 1Yzn4x-0001vR-7O for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:07 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 38/31-11060-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-31.messagelabs.com!1433254924!12410662!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19410 invoked from network); 2 Jun 2015 14:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2015 14:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4u-0006hH-HC for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4u-00033s-Ft for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Message-Id: Date: Tue, 02 Jun 2015 14:22:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: fix placement of ecrit labels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1433254422 -7200 # Node ID 8f6b99f4c45fbee6c5911fbd0835353b9de1fdeb # Parent a429985613f2ad6739ddbd44eb296954678b78ce x86: fix placement of ecrit labels On the 32-bit side, they must go ahead of TRACE_IRQS_OFF. On the 64-bit side it was placed way too late (but isn't being used, so this was only a latent issue). Also rename the labels to be local ones. Signed-off-by: Jan Beulich --- diff -r a429985613f2 -r 8f6b99f4c45f arch/i386/kernel/entry-xen.S --- a/arch/i386/kernel/entry-xen.S Tue Jun 02 16:10:19 2015 +0200 +++ b/arch/i386/kernel/entry-xen.S Tue Jun 02 16:13:42 2015 +0200 @@ -362,14 +362,14 @@ 1: movl (%ebp),%ebp #ifdef CONFIG_XEN TRACE_IRQS_ON __ENABLE_INTERRUPTS -sysexit_scrit: /**** START OF SYSEXIT CRITICAL REGION ****/ +.Lsysexit_scrit: /**** START OF SYSEXIT CRITICAL REGION ****/ __TEST_PENDING jnz 14f # process more events if necessary... movl ESI(%esp), %esi sysexit 14: __DISABLE_INTERRUPTS +.Lsysexit_ecrit: /**** END OF SYSEXIT CRITICAL REGION ****/ TRACE_IRQS_OFF -sysexit_ecrit: /**** END OF SYSEXIT CRITICAL REGION ****/ push %esp call evtchn_do_upcall add $4,%esp @@ -518,7 +518,7 @@ 1: iret restore_all_enable_events: TRACE_IRQS_ON __ENABLE_INTERRUPTS -scrit: /**** START OF CRITICAL REGION ****/ +.Lscrit: /**** START OF CRITICAL REGION ****/ __TEST_PENDING jnz 14f # process more events if necessary... RESTORE_REGS @@ -530,8 +530,8 @@ 1: iret .long 1b,iret_exc .previous 14: __DISABLE_INTERRUPTS +.Lecrit: /**** END OF CRITICAL REGION ****/ TRACE_IRQS_OFF -ecrit: /**** END OF CRITICAL REGION ****/ jmp .Ldo_upcall CFI_RESTORE_STATE @@ -793,15 +793,15 @@ ENTRY(hypervisor_callback) testb $2,CS(%esp) movl EIP(%esp),%eax jnz .Ldo_upcall - cmpl $scrit,%eax + cmpl $.Lscrit,%eax jb 0f - cmpl $ecrit,%eax + cmpl $.Lecrit,%eax jb critical_region_fixup 0: #ifdef CONFIG_XEN_SUPERVISOR_MODE_KERNEL - cmpl $sysexit_scrit,%eax + cmpl $.Lsysexit_scrit,%eax jb .Ldo_upcall - cmpl $sysexit_ecrit,%eax + cmpl $.Lsysexit_ecrit,%eax ja .Ldo_upcall addl $OLDESP,%esp # Remove eflags...ebx from stack frame. #endif @@ -822,7 +822,7 @@ 0: # provides the number of bytes which have already been popped from the # interrupted stack frame. critical_region_fixup: - movsbl critical_fixup_table-scrit(%eax),%ecx # %ecx contains num slots popped + movsbl critical_fixup_table-.Lscrit(%eax),%ecx # %ecx contains num slots popped testl %ecx,%ecx leal (%esp,%ecx,4),%esi # %esi points at end of src region leal OLDESP(%esp),%edi # %edi points at end of dst region diff -r a429985613f2 -r 8f6b99f4c45f arch/x86_64/kernel/entry-xen.S --- a/arch/x86_64/kernel/entry-xen.S Tue Jun 02 16:10:19 2015 +0200 +++ b/arch/x86_64/kernel/entry-xen.S Tue Jun 02 16:13:42 2015 +0200 @@ -945,7 +945,7 @@ restore_all_enable_events: TRACE_IRQS_ON XEN_UNBLOCK_EVENTS(%rsi) # %rsi is already set up... -scrit: /**** START OF CRITICAL REGION ****/ +.Lscrit: /**** START OF CRITICAL REGION ****/ XEN_TEST_PENDING(%rsi) CFI_REMEMBER_STATE jnz 14f # process more events if necessary... @@ -955,12 +955,12 @@ scrit: /**** START OF CRITICAL REGION ** CFI_RESTORE_STATE 14: XEN_LOCKED_BLOCK_EVENTS(%rsi) +.Lecrit: /**** END OF CRITICAL REGION ****/ XEN_PUT_VCPU_INFO(%rsi) SAVE_REST movq %rsp,%rdi # set the argument again jmp 11b CFI_ENDPROC -ecrit: /**** END OF CRITICAL REGION ****/ # At this point, unlike on x86-32, we don't do the fixup to simplify the # code and the stack frame is more complex on x86-64. # When the kernel is interrupted in the critical section, the kernel _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4w-0001vH-Jj; Tue, 02 Jun 2015 14:22:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4v-0001v9-Ir for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:05 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id DD/A2-10437-C0CBD655; Tue, 02 Jun 2015 14:22:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1433254922!12397925!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14194 invoked from network); 2 Jun 2015 14:22:03 -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; 2 Jun 2015 14:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4s-0006h2-O4 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4s-00032e-Ju for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:02 +0000 Message-Id: Date: Tue, 02 Jun 2015 14:22:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: read hotplug script once at start of day X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Ian Campbell # Date 1433253806 -7200 # Node ID 43dfca4e7fa04cfd90a8c195d592c7ab43d54b2b # Parent afe2ac5137b8c247dea886c732d09791fe44ac91 netback: read hotplug script once at start of day When we come to tear things down in netback_remove() and generate the uevent it is possible that the xenstore directory has already been removed (details below). In such cases netback_uevent() won't be able to read the hotplug script and will write a xenstore error node. A recent change to the hypervisor exposed this race such that we now sometimes lose it (where apparently we didn't ever before). Instead read the hotplug script configuration during setup and use it for the lifetime of the backend device. The apparently more obvious fix of moving the transition to state=Closed in netback_remove() to after the uevent does not work because it is possible that we are already in state=Closed (in reaction to the guest having disconnected as it shutdown). Being already in Closed means the toolstack is at liberty to start tearing down the xenstore directories. In principal it might be possible to arrange to unregister the device sooner (e.g on transition to Closing) such that xenstore would still be there but this state machine is fragile and prone to anger... A modern Xen system only relies on the hotplug uevent for driver domains, when the backend is in the same domain as the toolstack it will run the necessary setup/teardown directly in the correct sequence wrt xenstore changes. Signed-off-by: Ian Campbell Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r afe2ac5137b8 -r 43dfca4e7fa0 drivers/xen/netback/common.h --- a/drivers/xen/netback/common.h Tue Mar 10 14:38:39 2015 +0100 +++ b/drivers/xen/netback/common.h Tue Jun 02 16:03:26 2015 +0200 @@ -147,6 +147,8 @@ struct backend_info { struct xenbus_watch hotplug_status_watch; int have_hotplug_status_watch:1; + const char *hotplug_script; + /* State relating to the netback accelerator */ void *netback_accel_priv; /* The accelerator that this backend is currently using */ diff -r afe2ac5137b8 -r 43dfca4e7fa0 drivers/xen/netback/xenbus.c --- a/drivers/xen/netback/xenbus.c Tue Mar 10 14:38:39 2015 +0100 +++ b/drivers/xen/netback/xenbus.c Tue Jun 02 16:03:26 2015 +0200 @@ -42,6 +42,7 @@ static int netback_remove(struct xenbus_ netback_remove_accelerators(be, dev); netback_disconnect(&dev->dev); + kfree(be->hotplug_script); kfree(be); dev->dev.driver_data = NULL; return 0; @@ -71,6 +72,7 @@ static int netback_probe(struct xenbus_d struct xenbus_transaction xbt; int err; int sg; + const char *script; struct backend_info *be = kzalloc(sizeof(struct backend_info), GFP_KERNEL); if (!be) { @@ -133,6 +135,15 @@ static int netback_probe(struct xenbus_d netback_probe_accelerators(be, dev); + script = xenbus_read(XBT_NIL, dev->nodename, "script", NULL); + if (IS_ERR(script)) { + err = PTR_ERR(script); + xenbus_dev_fatal(dev, err, "reading script"); + goto fail; + } + + be->hotplug_script = script; + err = xenbus_switch_state(dev, XenbusStateInitWait); if (err) goto fail; @@ -165,22 +176,11 @@ static int netback_uevent(struct xenbus_ struct backend_info *be = xdev->dev.driver_data; netif_t *netif = be->netif; int i = 0, length = 0; - char *val; DPRINTK("netback_uevent"); - val = xenbus_read(XBT_NIL, xdev->nodename, "script", NULL); - if (IS_ERR(val)) { - int err = PTR_ERR(val); - xenbus_dev_fatal(xdev, err, "reading script"); - return err; - } - else { - add_uevent_var(envp, num_envp, &i, buffer, buffer_size, - &length, "script=%s", val); - kfree(val); - } - + add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, + "script=%s", be->hotplug_script); add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "vif=%s", netif->dev->name); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4x-0001vi-Lx; Tue, 02 Jun 2015 14:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4w-0001vE-Fc for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:06 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id A8/CF-18733-D0CBD655; Tue, 02 Jun 2015 14:22:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1433254923!19626950!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20516 invoked from network); 2 Jun 2015 14:22:04 -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; 2 Jun 2015 14:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4t-0006h5-32 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4t-00032t-1t for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Message-Id: Date: Tue, 02 Jun 2015 14:22:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] blkback: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433253999 -7200 # Node ID bad892a4682644c989bd33b8534459814771db6a # Parent 43dfca4e7fa04cfd90a8c195d592c7ab43d54b2b blkback: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself, at once allowing us to eliminate the theoretical risk of unintentionally passing a % character in the name. Also shorten the static part of the name. Signed-off-by: Jan Beulich --- diff -r 43dfca4e7fa0 -r bad892a46826 drivers/xen/blkback/xenbus.c --- a/drivers/xen/blkback/xenbus.c Tue Jun 02 16:03:26 2015 +0200 +++ b/drivers/xen/blkback/xenbus.c Tue Jun 02 16:06:39 2015 +0200 @@ -34,30 +34,21 @@ static int connect_ring(struct backend_i static void backend_changed(struct xenbus_watch *, const char **, unsigned int); -static int blkback_name(blkif_t *blkif, char *buf) +static char *blkback_name(const struct xenbus_device *dev) { char *devpath, *devname; - struct xenbus_device *dev = blkif->be->dev; devpath = xenbus_read(XBT_NIL, dev->nodename, "dev", NULL); - if (IS_ERR(devpath)) - return PTR_ERR(devpath); - - if ((devname = strstr(devpath, "/dev/")) != NULL) - devname += strlen("/dev/"); - else - devname = devpath; + if (!IS_ERR(devpath) && (devname = strstr(devpath, "/dev/")) != NULL) + return devname + strlen("/dev/"); - snprintf(buf, TASK_COMM_LEN, "blkback.%d.%s", blkif->domid, devname); - kfree(devpath); - - return 0; + return devpath; } static void update_blkif_status(blkif_t *blkif) { int err; - char name[TASK_COMM_LEN]; + char *devname; /* Not ready to connect? */ if (!blkif->irq || !blkif->vbd.bdev) @@ -72,12 +63,6 @@ static void update_blkif_status(blkif_t if (blkif->be->dev->state != XenbusStateConnected) return; - err = blkback_name(blkif, name); - if (err) { - xenbus_dev_error(blkif->be->dev, err, "get blkback dev name"); - return; - } - err = filemap_write_and_wait(blkif->vbd.bdev->bd_inode->i_mapping); if (err) { xenbus_dev_error(blkif->be->dev, err, "block flush"); @@ -85,7 +70,16 @@ static void update_blkif_status(blkif_t } invalidate_inode_pages2(blkif->vbd.bdev->bd_inode->i_mapping); - blkif->xenblkd = kthread_run(blkif_schedule, blkif, name); + devname = blkback_name(blkif->be->dev); + if (IS_ERR(devname)) { + xenbus_dev_error(blkif->be->dev, PTR_ERR(devname), + "get blkback dev name"); + return; + } + + blkif->xenblkd = kthread_run(blkif_schedule, blkif, + "blkbk.%d.%s", blkif->domid, devname); + kfree(devname); if (IS_ERR(blkif->xenblkd)) { err = PTR_ERR(blkif->xenblkd); blkif->xenblkd = NULL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4y-0001w1-SP; Tue, 02 Jun 2015 14: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 1Yzn4x-0001vQ-8F for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:07 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 52/7C-16813-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1433254924!12059778!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23478 invoked from network); 2 Jun 2015 14:22:05 -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; 2 Jun 2015 14:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4u-0006hE-6M for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4u-00033c-3c for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Message-Id: Date: Tue, 02 Jun 2015 14: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] usbif: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433254219 -7200 # Node ID a429985613f2ad6739ddbd44eb296954678b78ce # Parent 62922fbe9fe2ceb749413dfccb4645d2c83bf69b usbif: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself. Signed-off-by: Jan Beulich --- diff -r 62922fbe9fe2 -r a429985613f2 drivers/xen/usbback/xenbus.c --- a/drivers/xen/usbback/xenbus.c Tue Jun 02 16:09:12 2015 +0200 +++ b/drivers/xen/usbback/xenbus.c Tue Jun 02 16:10:19 2015 +0200 @@ -48,11 +48,9 @@ static int start_xenusbd(usbif_t *usbif) { int err = 0; - char name[TASK_COMM_LEN]; - snprintf(name, TASK_COMM_LEN, "usbback.%d.%d", usbif->domid, - usbif->handle); - usbif->xenusbd = kthread_run(usbbk_schedule, usbif, name); + usbif->xenusbd = kthread_run(usbbk_schedule, usbif, "usbback.%d.%u", + usbif->domid, usbif->handle); if (IS_ERR(usbif->xenusbd)) { err = PTR_ERR(usbif->xenusbd); usbif->xenusbd = NULL; diff -r 62922fbe9fe2 -r a429985613f2 drivers/xen/usbfront/xenbus.c --- a/drivers/xen/usbfront/xenbus.c Tue Jun 02 16:09:12 2015 +0200 +++ b/drivers/xen/usbfront/xenbus.c Tue Jun 02 16:10:19 2015 +0200 @@ -190,17 +190,15 @@ static int connect(struct xenbus_device usbif_conn_request_t *req; int i, idx, err; int notify; - char name[TASK_COMM_LEN]; struct usb_hcd *hcd; - hcd = info_to_hcd(info); - snprintf(name, TASK_COMM_LEN, "xenhcd.%d", hcd->self.busnum); - err = talk_to_backend(dev, info); if (err) return err; - info->kthread = kthread_run(xenhcd_schedule, info, name); + hcd = info_to_hcd(info); + info->kthread = kthread_run(xenhcd_schedule, info, + "xenhcd.%d", hcd->self.busnum); if (IS_ERR(info->kthread)) { err = PTR_ERR(info->kthread); info->kthread = NULL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4y-0001w1-SP; Tue, 02 Jun 2015 14: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 1Yzn4x-0001vQ-8F for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:07 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 52/7C-16813-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1433254924!12059778!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23478 invoked from network); 2 Jun 2015 14:22:05 -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; 2 Jun 2015 14:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4u-0006hE-6M for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4u-00033c-3c for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:04 +0000 Message-Id: Date: Tue, 02 Jun 2015 14: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] usbif: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433254219 -7200 # Node ID a429985613f2ad6739ddbd44eb296954678b78ce # Parent 62922fbe9fe2ceb749413dfccb4645d2c83bf69b usbif: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself. Signed-off-by: Jan Beulich --- diff -r 62922fbe9fe2 -r a429985613f2 drivers/xen/usbback/xenbus.c --- a/drivers/xen/usbback/xenbus.c Tue Jun 02 16:09:12 2015 +0200 +++ b/drivers/xen/usbback/xenbus.c Tue Jun 02 16:10:19 2015 +0200 @@ -48,11 +48,9 @@ static int start_xenusbd(usbif_t *usbif) { int err = 0; - char name[TASK_COMM_LEN]; - snprintf(name, TASK_COMM_LEN, "usbback.%d.%d", usbif->domid, - usbif->handle); - usbif->xenusbd = kthread_run(usbbk_schedule, usbif, name); + usbif->xenusbd = kthread_run(usbbk_schedule, usbif, "usbback.%d.%u", + usbif->domid, usbif->handle); if (IS_ERR(usbif->xenusbd)) { err = PTR_ERR(usbif->xenusbd); usbif->xenusbd = NULL; diff -r 62922fbe9fe2 -r a429985613f2 drivers/xen/usbfront/xenbus.c --- a/drivers/xen/usbfront/xenbus.c Tue Jun 02 16:09:12 2015 +0200 +++ b/drivers/xen/usbfront/xenbus.c Tue Jun 02 16:10:19 2015 +0200 @@ -190,17 +190,15 @@ static int connect(struct xenbus_device usbif_conn_request_t *req; int i, idx, err; int notify; - char name[TASK_COMM_LEN]; struct usb_hcd *hcd; - hcd = info_to_hcd(info); - snprintf(name, TASK_COMM_LEN, "xenhcd.%d", hcd->self.busnum); - err = talk_to_backend(dev, info); if (err) return err; - info->kthread = kthread_run(xenhcd_schedule, info, name); + hcd = info_to_hcd(info); + info->kthread = kthread_run(xenhcd_schedule, info, + "xenhcd.%d", hcd->self.busnum); if (IS_ERR(info->kthread)) { err = PTR_ERR(info->kthread); info->kthread = NULL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4x-0001vn-Nu; Tue, 02 Jun 2015 14:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4w-0001vG-Mj for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:06 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 59/CD-01139-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-206.messagelabs.com!1433254923!3669295!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3419 invoked from network); 2 Jun 2015 14:22:04 -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; 2 Jun 2015 14:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4t-0006h8-E9 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4t-000338-D6 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Message-Id: Date: Tue, 02 Jun 2015 14: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] blktap: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433254059 -7200 # Node ID aba765eb6c4449c1d8763071e63555f12c0a5d71 # Parent bad892a4682644c989bd33b8534459814771db6a blktap: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself, at once allowing us to eliminate the theoretical risk of unintentionally passing a % character in the name. Signed-off-by: Jan Beulich --- diff -r bad892a46826 -r aba765eb6c44 drivers/xen/blktap/xenbus.c --- a/drivers/xen/blktap/xenbus.c Tue Jun 02 16:06:39 2015 +0200 +++ b/drivers/xen/blktap/xenbus.c Tue Jun 02 16:07:39 2015 +0200 @@ -92,24 +92,16 @@ static long get_id(const char *str) return simple_strtol(num, NULL, 10); } -static int blktap_name(blkif_t *blkif, char *buf) +static char *blktap_name(const struct xenbus_device *dev) { char *devpath, *devname; - struct xenbus_device *dev = blkif->be->dev; devpath = xenbus_read(XBT_NIL, dev->nodename, "dev", NULL); - if (IS_ERR(devpath)) - return PTR_ERR(devpath); - if ((devname = strstr(devpath, "/dev/")) != NULL) - devname += strlen("/dev/"); - else - devname = devpath; + if (!IS_ERR(devpath) && (devname = strstr(devpath, "/dev/")) != NULL) + return devname + strlen("/dev/"); - snprintf(buf, TASK_COMM_LEN, "blktap.%d.%s", blkif->domid, devname); - kfree(devpath); - - return 0; + return devpath; } /**************************************************************** @@ -206,7 +198,7 @@ static int blktap_remove(struct xenbus_d static void tap_update_blkif_status(blkif_t *blkif) { int err; - char name[TASK_COMM_LEN]; + char *devname; /* Not ready to connect? */ if(!blkif->irq || !blkif->sectors) { @@ -222,12 +214,6 @@ static void tap_update_blkif_status(blki if (blkif->be->dev->state != XenbusStateConnected) return; - err = blktap_name(blkif, name); - if (err) { - xenbus_dev_error(blkif->be->dev, err, "get blktap dev name"); - return; - } - if (!blkif->be->group_added) { err = xentap_sysfs_addif(blkif->be->dev); if (err) { @@ -237,16 +223,25 @@ static void tap_update_blkif_status(blki } } - blkif->xenblkd = kthread_run(tap_blkif_schedule, blkif, name); + devname = blktap_name(blkif->be->dev); + if (IS_ERR(devname)) { + xenbus_dev_error(blkif->be->dev, PTR_ERR(devname), + "get blktap dev name"); + return; + } + + blkif->xenblkd = kthread_run(tap_blkif_schedule, blkif, + "blktap.%d.%s", blkif->domid, devname); if (IS_ERR(blkif->xenblkd)) { err = PTR_ERR(blkif->xenblkd); blkif->xenblkd = NULL; xenbus_dev_fatal(blkif->be->dev, err, "start xenblkd"); - WPRINTK("Error starting thread %s\n", name); + WPRINTK("Error starting d%d:%s thread\n", + blkif->domid, devname); } else DPRINTK("Thread started for domid %d, connected disk %d\n", blkif->domid, blkif->dev_num); - + kfree(devname); } /** _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4x-0001vi-Lx; Tue, 02 Jun 2015 14:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4w-0001vE-Fc for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:06 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id A8/CF-18733-D0CBD655; Tue, 02 Jun 2015 14:22:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1433254923!19626950!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20516 invoked from network); 2 Jun 2015 14:22:04 -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; 2 Jun 2015 14:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4t-0006h5-32 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4t-00032t-1t for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Message-Id: Date: Tue, 02 Jun 2015 14:22:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] blkback: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433253999 -7200 # Node ID bad892a4682644c989bd33b8534459814771db6a # Parent 43dfca4e7fa04cfd90a8c195d592c7ab43d54b2b blkback: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself, at once allowing us to eliminate the theoretical risk of unintentionally passing a % character in the name. Also shorten the static part of the name. Signed-off-by: Jan Beulich --- diff -r 43dfca4e7fa0 -r bad892a46826 drivers/xen/blkback/xenbus.c --- a/drivers/xen/blkback/xenbus.c Tue Jun 02 16:03:26 2015 +0200 +++ b/drivers/xen/blkback/xenbus.c Tue Jun 02 16:06:39 2015 +0200 @@ -34,30 +34,21 @@ static int connect_ring(struct backend_i static void backend_changed(struct xenbus_watch *, const char **, unsigned int); -static int blkback_name(blkif_t *blkif, char *buf) +static char *blkback_name(const struct xenbus_device *dev) { char *devpath, *devname; - struct xenbus_device *dev = blkif->be->dev; devpath = xenbus_read(XBT_NIL, dev->nodename, "dev", NULL); - if (IS_ERR(devpath)) - return PTR_ERR(devpath); - - if ((devname = strstr(devpath, "/dev/")) != NULL) - devname += strlen("/dev/"); - else - devname = devpath; + if (!IS_ERR(devpath) && (devname = strstr(devpath, "/dev/")) != NULL) + return devname + strlen("/dev/"); - snprintf(buf, TASK_COMM_LEN, "blkback.%d.%s", blkif->domid, devname); - kfree(devpath); - - return 0; + return devpath; } static void update_blkif_status(blkif_t *blkif) { int err; - char name[TASK_COMM_LEN]; + char *devname; /* Not ready to connect? */ if (!blkif->irq || !blkif->vbd.bdev) @@ -72,12 +63,6 @@ static void update_blkif_status(blkif_t if (blkif->be->dev->state != XenbusStateConnected) return; - err = blkback_name(blkif, name); - if (err) { - xenbus_dev_error(blkif->be->dev, err, "get blkback dev name"); - return; - } - err = filemap_write_and_wait(blkif->vbd.bdev->bd_inode->i_mapping); if (err) { xenbus_dev_error(blkif->be->dev, err, "block flush"); @@ -85,7 +70,16 @@ static void update_blkif_status(blkif_t } invalidate_inode_pages2(blkif->vbd.bdev->bd_inode->i_mapping); - blkif->xenblkd = kthread_run(blkif_schedule, blkif, name); + devname = blkback_name(blkif->be->dev); + if (IS_ERR(devname)) { + xenbus_dev_error(blkif->be->dev, PTR_ERR(devname), + "get blkback dev name"); + return; + } + + blkif->xenblkd = kthread_run(blkif_schedule, blkif, + "blkbk.%d.%s", blkif->domid, devname); + kfree(devname); if (IS_ERR(blkif->xenblkd)) { err = PTR_ERR(blkif->xenblkd); blkif->xenblkd = NULL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 14:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 14:22: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 1Yzn4x-0001vn-Nu; Tue, 02 Jun 2015 14:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4w-0001vG-Mj for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:06 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 59/CD-01139-E0CBD655; Tue, 02 Jun 2015 14:22:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-206.messagelabs.com!1433254923!3669295!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3419 invoked from network); 2 Jun 2015 14:22:04 -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; 2 Jun 2015 14:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yzn4t-0006h8-E9 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yzn4t-000338-D6 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 14:22:03 +0000 Message-Id: Date: Tue, 02 Jun 2015 14: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] blktap: simplify kthread name generation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1433254059 -7200 # Node ID aba765eb6c4449c1d8763071e63555f12c0a5d71 # Parent bad892a4682644c989bd33b8534459814771db6a blktap: simplify kthread name generation kthread_run() taking a format string it can quite well do all the formatting itself, at once allowing us to eliminate the theoretical risk of unintentionally passing a % character in the name. Signed-off-by: Jan Beulich --- diff -r bad892a46826 -r aba765eb6c44 drivers/xen/blktap/xenbus.c --- a/drivers/xen/blktap/xenbus.c Tue Jun 02 16:06:39 2015 +0200 +++ b/drivers/xen/blktap/xenbus.c Tue Jun 02 16:07:39 2015 +0200 @@ -92,24 +92,16 @@ static long get_id(const char *str) return simple_strtol(num, NULL, 10); } -static int blktap_name(blkif_t *blkif, char *buf) +static char *blktap_name(const struct xenbus_device *dev) { char *devpath, *devname; - struct xenbus_device *dev = blkif->be->dev; devpath = xenbus_read(XBT_NIL, dev->nodename, "dev", NULL); - if (IS_ERR(devpath)) - return PTR_ERR(devpath); - if ((devname = strstr(devpath, "/dev/")) != NULL) - devname += strlen("/dev/"); - else - devname = devpath; + if (!IS_ERR(devpath) && (devname = strstr(devpath, "/dev/")) != NULL) + return devname + strlen("/dev/"); - snprintf(buf, TASK_COMM_LEN, "blktap.%d.%s", blkif->domid, devname); - kfree(devpath); - - return 0; + return devpath; } /**************************************************************** @@ -206,7 +198,7 @@ static int blktap_remove(struct xenbus_d static void tap_update_blkif_status(blkif_t *blkif) { int err; - char name[TASK_COMM_LEN]; + char *devname; /* Not ready to connect? */ if(!blkif->irq || !blkif->sectors) { @@ -222,12 +214,6 @@ static void tap_update_blkif_status(blki if (blkif->be->dev->state != XenbusStateConnected) return; - err = blktap_name(blkif, name); - if (err) { - xenbus_dev_error(blkif->be->dev, err, "get blktap dev name"); - return; - } - if (!blkif->be->group_added) { err = xentap_sysfs_addif(blkif->be->dev); if (err) { @@ -237,16 +223,25 @@ static void tap_update_blkif_status(blki } } - blkif->xenblkd = kthread_run(tap_blkif_schedule, blkif, name); + devname = blktap_name(blkif->be->dev); + if (IS_ERR(devname)) { + xenbus_dev_error(blkif->be->dev, PTR_ERR(devname), + "get blktap dev name"); + return; + } + + blkif->xenblkd = kthread_run(tap_blkif_schedule, blkif, + "blktap.%d.%s", blkif->domid, devname); if (IS_ERR(blkif->xenblkd)) { err = PTR_ERR(blkif->xenblkd); blkif->xenblkd = NULL; xenbus_dev_fatal(blkif->be->dev, err, "start xenblkd"); - WPRINTK("Error starting thread %s\n", name); + WPRINTK("Error starting d%d:%s thread\n", + blkif->domid, devname); } else DPRINTK("Thread started for domid %d, connected disk %d\n", blkif->domid, blkif->dev_num); - + kfree(devname); } /** _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:44: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 1YzpIN-0006TT-Vv; Tue, 02 Jun 2015 16:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIM-0006TD-OR for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:06 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 65/AC-01139-65DDD655; Tue, 02 Jun 2015 16:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433263444!11277257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23971 invoked from network); 2 Jun 2015 16:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2015 16:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIK-0000Nj-A1 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIK-0000Md-5G for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:04 +0000 Date: Tue, 02 Jun 2015 16:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 771f857e03fa47a1434f6e468efcc24752aac991 Author: Ian Jackson AuthorDate: Wed May 27 16:55:39 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:55:39 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b9a89a1..d5d293d 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc1 -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TRADITIONAL_REVISION ?= e42b84cf1c524d017208b981c7749dc5945dda72 +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # 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. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:44: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 1YzpIN-0006TT-Vv; Tue, 02 Jun 2015 16:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIM-0006TD-OR for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:06 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 65/AC-01139-65DDD655; Tue, 02 Jun 2015 16:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433263444!11277257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23971 invoked from network); 2 Jun 2015 16:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2015 16:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIK-0000Nj-A1 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIK-0000Md-5G for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:04 +0000 Date: Tue, 02 Jun 2015 16:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 771f857e03fa47a1434f6e468efcc24752aac991 Author: Ian Jackson AuthorDate: Wed May 27 16:55:39 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:55:39 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b9a89a1..d5d293d 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc1 -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TRADITIONAL_REVISION ?= e42b84cf1c524d017208b981c7749dc5945dda72 +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # 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. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16: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 1YzpIi-0006Vq-2R; Tue, 02 Jun 2015 16:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIh-0006Ve-1Y for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:27 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 11/03-00727-A6DDD655; Tue, 02 Jun 2015 16:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433263464!12508851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4811 invoked from network); 2 Jun 2015 16:44: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; 2 Jun 2015 16:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIe-0000Nu-LF for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIe-0000Nt-Ji for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:24 +0000 Date: Tue, 02 Jun 2015 16:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Domain destroy: unlock userdata earlier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9b13f32dcf414e7406ed8518a20ac0022d41aa4 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:58 2015 -0600 Commit: Ian Jackson CommitDate: Wed May 27 17:02:48 2015 +0100 libxl: Domain destroy: unlock userdata earlier Unlock the userdata before we actually call xc_domain_destroy. This leaves open the possibility that other libxl callers will see the half-destroyed domain (with no devices, paused), but this is fine. Signed-off-by: Ian Jackson CC: Wei Liu Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 1c91d6fba20c1517d78076d412d33cb41f501be5) --- tools/libxl/libxl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9a6faa0..0b1168c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1626,7 +1626,7 @@ static void devices_destroy_cb(libxl__egc *egc, uint32_t domid = dis->domid; char *dom_path; char *vm_path; - libxl__domain_userdata_lock *lock = NULL; + libxl__domain_userdata_lock *lock; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { @@ -1660,6 +1660,8 @@ static void devices_destroy_cb(libxl__egc *egc, } libxl__userdata_destroyall(gc, domid); + libxl__unlock_domain_userdata(lock); + rc = xc_domain_destroy(ctx->xch, domid); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_destroy failed for %d", domid); @@ -1669,7 +1671,6 @@ static void devices_destroy_cb(libxl__egc *egc, rc = 0; out: - if (lock) libxl__unlock_domain_userdata(lock); dis->callback(egc, dis, rc); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16: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 1YzpIi-0006Vq-2R; Tue, 02 Jun 2015 16:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIh-0006Ve-1Y for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:27 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 11/03-00727-A6DDD655; Tue, 02 Jun 2015 16:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433263464!12508851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4811 invoked from network); 2 Jun 2015 16:44: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; 2 Jun 2015 16:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIe-0000Nu-LF for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIe-0000Nt-Ji for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:24 +0000 Date: Tue, 02 Jun 2015 16:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Domain destroy: unlock userdata earlier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9b13f32dcf414e7406ed8518a20ac0022d41aa4 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:58 2015 -0600 Commit: Ian Jackson CommitDate: Wed May 27 17:02:48 2015 +0100 libxl: Domain destroy: unlock userdata earlier Unlock the userdata before we actually call xc_domain_destroy. This leaves open the possibility that other libxl callers will see the half-destroyed domain (with no devices, paused), but this is fine. Signed-off-by: Ian Jackson CC: Wei Liu Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 1c91d6fba20c1517d78076d412d33cb41f501be5) --- tools/libxl/libxl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9a6faa0..0b1168c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1626,7 +1626,7 @@ static void devices_destroy_cb(libxl__egc *egc, uint32_t domid = dis->domid; char *dom_path; char *vm_path; - libxl__domain_userdata_lock *lock = NULL; + libxl__domain_userdata_lock *lock; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { @@ -1660,6 +1660,8 @@ static void devices_destroy_cb(libxl__egc *egc, } libxl__userdata_destroyall(gc, domid); + libxl__unlock_domain_userdata(lock); + rc = xc_domain_destroy(ctx->xch, domid); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_destroy failed for %d", domid); @@ -1669,7 +1671,6 @@ static void devices_destroy_cb(libxl__egc *egc, rc = 0; out: - if (lock) libxl__unlock_domain_userdata(lock); dis->callback(egc, dis, rc); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16: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 1YzpIs-0006Xa-54; Tue, 02 Jun 2015 16:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIr-0006XN-F7 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:37 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id BE/33-00727-47DDD655; Tue, 02 Jun 2015 16:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433263475!11199042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24088 invoked from network); 2 Jun 2015 16:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2015 16:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIo-0000O5-Qb for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIo-0000OM-P7 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:34 +0000 Date: Tue, 02 Jun 2015 16:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Domain destroy: fork X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa62913ea76b0129cd76ef06ce4cd5d946c25d13 Author: Ian Jackson AuthorDate: Thu Mar 5 16:28:04 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:02:52 2015 +0100 libxl: Domain destroy: fork Call xc_domain_destroy in a subprocess. That allows us to do so asynchronously, rather than blocking the whole process calling libxl. The changes in detail: * Provide an libxl__ev_child in libxl__domain_destroy_state, and initialise it in libxl__domain_destroy. There is no possibility to `clean up' a libxl__ev_child, but there need to clean it up, as the control flow ensures that we only continue after the child has exited. * Call libxl__ev_child_fork at the right point and put the call to xc_domain_destroy and associated logging in the child. (The child opens a new xenctrl handle because we mustn't use the parent's.) * Consequently, the success return path from domain_destroy_domid_cb no longer calls dis->callback. Instead it simply returns. * We plumb the errorno value through the child's exit status, if it fits. This means we normally do the logging only in the parent. * Incidentally, we fix the bug that we were treating the return value from xc_domain_destroy as an errno value when in fact it is a return value from do_domctl (in this case, 0 or -1 setting errno). Signed-off-by: Ian Jackson Reviewed-by: Wei Liu Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Ian Campbell (cherry picked from commit 188e9c541f698109a76cf334b925c77b6007aba1) --- tools/libxl/libxl.c | 57 ++++++++++++++++++++++++++++++++++++++--- tools/libxl/libxl_internal.h | 1 + 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0b1168c..1f4dce2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1548,6 +1548,10 @@ static void devices_destroy_cb(libxl__egc *egc, libxl__devices_remove_state *drs, int rc); +static void domain_destroy_domid_cb(libxl__egc *egc, + libxl__ev_child *destroyer, + pid_t pid, int status); + void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) { STATE_AO_GC(dis->ao); @@ -1557,6 +1561,8 @@ void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) char *pid; int rc, dm_present; + libxl__ev_child_init(&dis->destroyer); + rc = libxl_domain_info(ctx, NULL, domid); switch(rc) { case 0: @@ -1662,17 +1668,58 @@ static void devices_destroy_cb(libxl__egc *egc, libxl__unlock_domain_userdata(lock); - rc = xc_domain_destroy(ctx->xch, domid); - if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_destroy failed for %d", domid); + rc = libxl__ev_child_fork(gc, &dis->destroyer, domain_destroy_domid_cb); + if (rc < 0) goto out; + if (!rc) { /* child */ + ctx->xch = xc_interface_open(ctx->lg,0,0); + if (!ctx->xch) goto badchild; + + rc = xc_domain_destroy(ctx->xch, domid); + if (rc < 0) goto badchild; + _exit(0); + + badchild: + if (errno > 0 && errno < 126) { + _exit(errno); + } else { + LOGE(ERROR, + "xc_domain_destroy failed for %d (with difficult errno value %d)", + domid, errno); + _exit(-1); + } + } + LOG(INFO, "forked pid %ld for destroy of domain %d", (long)rc, domid); + + return; + +out: + dis->callback(egc, dis, rc); + return; +} + +static void domain_destroy_domid_cb(libxl__egc *egc, + libxl__ev_child *destroyer, + pid_t pid, int status) +{ + libxl__destroy_domid_state *dis = CONTAINER_OF(destroyer, *dis, destroyer); + STATE_AO_GC(dis->ao); + int rc; + + if (status) { + if (WIFEXITED(status) && WEXITSTATUS(status)<126) { + LOGEV(ERROR, WEXITSTATUS(status), + "xc_domain_destroy failed for %"PRIu32"", dis->domid); + } else { + libxl_report_child_exitstatus(CTX, XTL_ERROR, + "async domain destroy", pid, status); + } rc = ERROR_FAIL; goto out; } rc = 0; -out: + out: dis->callback(egc, dis, rc); - return; } int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6dac0f8..a1624fd 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2957,6 +2957,7 @@ struct libxl__destroy_domid_state { libxl__domid_destroy_cb *callback; /* private to implementation */ libxl__devices_remove_state drs; + libxl__ev_child destroyer; }; struct libxl__domain_destroy_state { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16: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 1YzpIs-0006Xa-54; Tue, 02 Jun 2015 16:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIr-0006XN-F7 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:37 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id BE/33-00727-47DDD655; Tue, 02 Jun 2015 16:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433263475!11199042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24088 invoked from network); 2 Jun 2015 16:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2015 16:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIo-0000O5-Qb for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIo-0000OM-P7 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:34 +0000 Date: Tue, 02 Jun 2015 16:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Domain destroy: fork X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa62913ea76b0129cd76ef06ce4cd5d946c25d13 Author: Ian Jackson AuthorDate: Thu Mar 5 16:28:04 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:02:52 2015 +0100 libxl: Domain destroy: fork Call xc_domain_destroy in a subprocess. That allows us to do so asynchronously, rather than blocking the whole process calling libxl. The changes in detail: * Provide an libxl__ev_child in libxl__domain_destroy_state, and initialise it in libxl__domain_destroy. There is no possibility to `clean up' a libxl__ev_child, but there need to clean it up, as the control flow ensures that we only continue after the child has exited. * Call libxl__ev_child_fork at the right point and put the call to xc_domain_destroy and associated logging in the child. (The child opens a new xenctrl handle because we mustn't use the parent's.) * Consequently, the success return path from domain_destroy_domid_cb no longer calls dis->callback. Instead it simply returns. * We plumb the errorno value through the child's exit status, if it fits. This means we normally do the logging only in the parent. * Incidentally, we fix the bug that we were treating the return value from xc_domain_destroy as an errno value when in fact it is a return value from do_domctl (in this case, 0 or -1 setting errno). Signed-off-by: Ian Jackson Reviewed-by: Wei Liu Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Ian Campbell (cherry picked from commit 188e9c541f698109a76cf334b925c77b6007aba1) --- tools/libxl/libxl.c | 57 ++++++++++++++++++++++++++++++++++++++--- tools/libxl/libxl_internal.h | 1 + 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0b1168c..1f4dce2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1548,6 +1548,10 @@ static void devices_destroy_cb(libxl__egc *egc, libxl__devices_remove_state *drs, int rc); +static void domain_destroy_domid_cb(libxl__egc *egc, + libxl__ev_child *destroyer, + pid_t pid, int status); + void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) { STATE_AO_GC(dis->ao); @@ -1557,6 +1561,8 @@ void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) char *pid; int rc, dm_present; + libxl__ev_child_init(&dis->destroyer); + rc = libxl_domain_info(ctx, NULL, domid); switch(rc) { case 0: @@ -1662,17 +1668,58 @@ static void devices_destroy_cb(libxl__egc *egc, libxl__unlock_domain_userdata(lock); - rc = xc_domain_destroy(ctx->xch, domid); - if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_destroy failed for %d", domid); + rc = libxl__ev_child_fork(gc, &dis->destroyer, domain_destroy_domid_cb); + if (rc < 0) goto out; + if (!rc) { /* child */ + ctx->xch = xc_interface_open(ctx->lg,0,0); + if (!ctx->xch) goto badchild; + + rc = xc_domain_destroy(ctx->xch, domid); + if (rc < 0) goto badchild; + _exit(0); + + badchild: + if (errno > 0 && errno < 126) { + _exit(errno); + } else { + LOGE(ERROR, + "xc_domain_destroy failed for %d (with difficult errno value %d)", + domid, errno); + _exit(-1); + } + } + LOG(INFO, "forked pid %ld for destroy of domain %d", (long)rc, domid); + + return; + +out: + dis->callback(egc, dis, rc); + return; +} + +static void domain_destroy_domid_cb(libxl__egc *egc, + libxl__ev_child *destroyer, + pid_t pid, int status) +{ + libxl__destroy_domid_state *dis = CONTAINER_OF(destroyer, *dis, destroyer); + STATE_AO_GC(dis->ao); + int rc; + + if (status) { + if (WIFEXITED(status) && WEXITSTATUS(status)<126) { + LOGEV(ERROR, WEXITSTATUS(status), + "xc_domain_destroy failed for %"PRIu32"", dis->domid); + } else { + libxl_report_child_exitstatus(CTX, XTL_ERROR, + "async domain destroy", pid, status); + } rc = ERROR_FAIL; goto out; } rc = 0; -out: + out: dis->callback(egc, dis, rc); - return; } int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6dac0f8..a1624fd 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2957,6 +2957,7 @@ struct libxl__destroy_domid_state { libxl__domid_destroy_cb *callback; /* private to implementation */ libxl__devices_remove_state drs; + libxl__ev_child destroyer; }; struct libxl__domain_destroy_state { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16: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 1YzpJ2-0006Zc-7l; Tue, 02 Jun 2015 16:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJ1-0006ZD-8t for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:47 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 02/2B-29702-E7DDD655; Tue, 02 Jun 2015 16:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1433263485!11287298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30855 invoked from network); 2 Jun 2015 16:44:46 -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; 2 Jun 2015 16:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIy-0000OB-VU for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIy-0000Oj-UF for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:44 +0000 Date: Tue, 02 Jun 2015 16:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] ocaml/xenctrl: Check return values from 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 c91ed889ea3c3781a94a30909f30c3aad56c97d5 Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:03:36 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index f0810eb..92d064f 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -457,6 +457,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -821,6 +824,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16: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 1YzpJ2-0006Zc-7l; Tue, 02 Jun 2015 16:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJ1-0006ZD-8t for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:47 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 02/2B-29702-E7DDD655; Tue, 02 Jun 2015 16:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1433263485!11287298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30855 invoked from network); 2 Jun 2015 16:44:46 -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; 2 Jun 2015 16:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpIy-0000OB-VU for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIy-0000Oj-UF for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:44 +0000 Date: Tue, 02 Jun 2015 16:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] ocaml/xenctrl: Check return values from 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 c91ed889ea3c3781a94a30909f30c3aad56c97d5 Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:03:36 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index f0810eb..92d064f 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -457,6 +457,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -821,6 +824,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJD-0006bV-AX; Tue, 02 Jun 2015 16:44:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJC-0006bD-GX for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:58 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 58/D0-19853-98DDD655; Tue, 02 Jun 2015 16:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1433263495!11293319!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19133 invoked from network); 2 Jun 2015 16:44:56 -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; 2 Jun 2015 16:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJ9-0000OL-48 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJ9-0000P5-38 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:55 +0000 Date: Tue, 02 Jun 2015 16:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 032673c8836e28d9e291e0d02235001c41aedaab Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:03 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 92d064f..6a95528 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJD-0006bV-AX; Tue, 02 Jun 2015 16:44:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJC-0006bD-GX for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:58 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 58/D0-19853-98DDD655; Tue, 02 Jun 2015 16:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1433263495!11293319!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19133 invoked from network); 2 Jun 2015 16:44:56 -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; 2 Jun 2015 16:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJ9-0000OL-48 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJ9-0000P5-38 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:55 +0000 Date: Tue, 02 Jun 2015 16:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 032673c8836e28d9e291e0d02235001c41aedaab Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:03 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 92d064f..6a95528 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJN-0006dL-D2; Tue, 02 Jun 2015 16:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJM-0006d5-09 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 74/3E-31880-39DDD655; Tue, 02 Jun 2015 16:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433263505!7173589!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16115 invoked from network); 2 Jun 2015 16:45:06 -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; 2 Jun 2015 16:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJJ-0000PK-A3 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJJ-0000Ph-83 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:05 +0000 Date: Tue, 02 Jun 2015 16:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfc4c43be14e60608ed0b8173365c737950afe41 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:15 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 6a95528..64f1137 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -530,26 +530,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJN-0006dL-D2; Tue, 02 Jun 2015 16:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJM-0006d5-09 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 74/3E-31880-39DDD655; Tue, 02 Jun 2015 16:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433263505!7173589!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16115 invoked from network); 2 Jun 2015 16:45:06 -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; 2 Jun 2015 16:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJJ-0000PK-A3 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJJ-0000Ph-83 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:05 +0000 Date: Tue, 02 Jun 2015 16:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfc4c43be14e60608ed0b8173365c737950afe41 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:15 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 6a95528..64f1137 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -530,26 +530,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJW-0006f0-Gr; Tue, 02 Jun 2015 16:45:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJV-0006el-N7 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:17 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 0B/0C-08467-D9DDD655; Tue, 02 Jun 2015 16:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433263515!11340337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10790 invoked from network); 2 Jun 2015 16:45:16 -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; 2 Jun 2015 16:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJT-0000PW-Fs for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJT-0000R1-DQ for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:15 +0000 Date: Tue, 02 Jun 2015 16:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: systemd: Don't ever kill xenstored X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a984d860ee0612f30c1aebbdb94dba801eb7a6e6 Author: Ross Lagerwall AuthorDate: Tue Feb 24 08:05:50 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:23 2015 +0100 tools/hotplug: systemd: Don't ever kill xenstored Don't kill xenstored as part of the usual service shutdown process to prevent hangs on shutdown where the kernel tries to unplug a VIF after xenstored has exited. In an ideal case with all guests cooperating, xendomains will have shut down all guests before xenstored is killed. However in the uncooperative case, malicious or crashed guests may still be running after xendomains has exited and this should not block the shutdown/reboot of dom0. Xenstored has no state to sync to disk, and never used to be killed in the sysvinit case; observe the warning in xencommons. Our testing has shown regressions caused by the change in behaviour between sysvinit and systemd when it comes to killing xenstored. Signed-off-by: Ross Lagerwall Acked-by: Wei Liu [ ijc -- added systemd to title ] (cherry picked from commit 96e0ee8386cf690c28c46a2c9f75cd2b03f646e1) --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 0f0ac58..a5f836b 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -8,6 +8,7 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify +KillMode=none Environment=XENSTORED_ARGS= Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJW-0006f0-Gr; Tue, 02 Jun 2015 16:45:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJV-0006el-N7 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:17 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 0B/0C-08467-D9DDD655; Tue, 02 Jun 2015 16:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433263515!11340337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10790 invoked from network); 2 Jun 2015 16:45:16 -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; 2 Jun 2015 16:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJT-0000PW-Fs for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJT-0000R1-DQ for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:15 +0000 Date: Tue, 02 Jun 2015 16:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: systemd: Don't ever kill xenstored X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a984d860ee0612f30c1aebbdb94dba801eb7a6e6 Author: Ross Lagerwall AuthorDate: Tue Feb 24 08:05:50 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:23 2015 +0100 tools/hotplug: systemd: Don't ever kill xenstored Don't kill xenstored as part of the usual service shutdown process to prevent hangs on shutdown where the kernel tries to unplug a VIF after xenstored has exited. In an ideal case with all guests cooperating, xendomains will have shut down all guests before xenstored is killed. However in the uncooperative case, malicious or crashed guests may still be running after xendomains has exited and this should not block the shutdown/reboot of dom0. Xenstored has no state to sync to disk, and never used to be killed in the sysvinit case; observe the warning in xencommons. Our testing has shown regressions caused by the change in behaviour between sysvinit and systemd when it comes to killing xenstored. Signed-off-by: Ross Lagerwall Acked-by: Wei Liu [ ijc -- added systemd to title ] (cherry picked from commit 96e0ee8386cf690c28c46a2c9f75cd2b03f646e1) --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 0f0ac58..a5f836b 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -8,6 +8,7 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify +KillMode=none Environment=XENSTORED_ARGS= Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45: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 1YzpJh-0006hF-O0; Tue, 02 Jun 2015 16:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJg-0006gx-8k for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:28 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 8A/11-21325-7ADDD655; Tue, 02 Jun 2015 16:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1433263525!11293419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22218 invoked from network); 2 Jun 2015 16:45:26 -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; 2 Jun 2015 16:45:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJd-0000Pe-LS for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJd-0000RO-KD for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:25 +0000 Date: Tue, 02 Jun 2015 16:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:40 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45: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 1YzpJh-0006hF-O0; Tue, 02 Jun 2015 16:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJg-0006gx-8k for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:28 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 8A/11-21325-7ADDD655; Tue, 02 Jun 2015 16:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1433263525!11293419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22218 invoked from network); 2 Jun 2015 16:45:26 -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; 2 Jun 2015 16:45:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJd-0000Pe-LS for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJd-0000RO-KD for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:25 +0000 Date: Tue, 02 Jun 2015 16:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Wed May 27 17:04:40 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJr-0006j6-T6; Tue, 02 Jun 2015 16:45:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJq-0006ir-Ji for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:38 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id AC/19-11060-1BDDD655; Tue, 02 Jun 2015 16:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433263536!10022666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1029 invoked from network); 2 Jun 2015 16:45:36 -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; 2 Jun 2015 16:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJn-0000Pm-SI for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJn-0000Rm-Qb for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:35 +0000 Date: Tue, 02 Jun 2015 16:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/EFI: keep EFI runtime services top level page tables up-to-date X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ca0609a7b5346eb299e5ee4e54afdc3b5b80503 Author: Jan Beulich AuthorDate: Thu May 28 12:27:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:27:47 2015 +0200 x86/EFI: keep EFI runtime services top level page tables up-to-date Updates to idle_pg_table[] need to be mirrored into the page tables used for invoking EFI runtime services. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: db83975f0fcd30370392ed288a7bd2420624ed4e master date: 2015-05-19 11:39:09 +0200 --- xen/arch/x86/efi/runtime.h | 7 +++++++ xen/arch/x86/efi/stub.c | 3 +++ xen/arch/x86/mm.c | 5 ++++- xen/include/asm-x86/page.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h index 0eb2fb9..d9eb8f5 100644 --- a/xen/arch/x86/efi/runtime.h +++ b/xen/arch/x86/efi/runtime.h @@ -1,5 +1,12 @@ +#include #include #ifndef COMPAT l4_pgentry_t *__read_mostly efi_l4_pgtable; + +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) +{ + if ( efi_l4_pgtable ) + l4e_write(efi_l4_pgtable + l4idx, l4e); +} #endif diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index b8f49f8..627009f 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef efi_enabled const bool_t efi_enabled = 0; @@ -9,6 +10,8 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } + paddr_t efi_rs_page_table(void) { BUG(); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d4965da..262d59e 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5287,7 +5287,10 @@ static l3_pgentry_t *virt_to_xen_l3e(unsigned long v) spin_lock(&map_pgdir_lock); if ( !(l4e_get_flags(*pl4e) & _PAGE_PRESENT) ) { - l4e_write(pl4e, l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR)); + l4_pgentry_t l4e = l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR); + + l4e_write(pl4e, l4e); + efi_update_l4_pgtable(l4_table_offset(v), l4e); pl3e = NULL; } if ( locking ) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index a8bc999..ccf0752 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -286,6 +286,7 @@ extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */ #define _PAGE_NONE _AC(0x000,U) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:45:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJr-0006j6-T6; Tue, 02 Jun 2015 16:45:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJq-0006ir-Ji for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:38 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id AC/19-11060-1BDDD655; Tue, 02 Jun 2015 16:45:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433263536!10022666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1029 invoked from network); 2 Jun 2015 16:45:36 -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; 2 Jun 2015 16:45:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJn-0000Pm-SI for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJn-0000Rm-Qb for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:35 +0000 Date: Tue, 02 Jun 2015 16:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/EFI: keep EFI runtime services top level page tables up-to-date X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ca0609a7b5346eb299e5ee4e54afdc3b5b80503 Author: Jan Beulich AuthorDate: Thu May 28 12:27:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:27:47 2015 +0200 x86/EFI: keep EFI runtime services top level page tables up-to-date Updates to idle_pg_table[] need to be mirrored into the page tables used for invoking EFI runtime services. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: db83975f0fcd30370392ed288a7bd2420624ed4e master date: 2015-05-19 11:39:09 +0200 --- xen/arch/x86/efi/runtime.h | 7 +++++++ xen/arch/x86/efi/stub.c | 3 +++ xen/arch/x86/mm.c | 5 ++++- xen/include/asm-x86/page.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h index 0eb2fb9..d9eb8f5 100644 --- a/xen/arch/x86/efi/runtime.h +++ b/xen/arch/x86/efi/runtime.h @@ -1,5 +1,12 @@ +#include #include #ifndef COMPAT l4_pgentry_t *__read_mostly efi_l4_pgtable; + +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) +{ + if ( efi_l4_pgtable ) + l4e_write(efi_l4_pgtable + l4idx, l4e); +} #endif diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index b8f49f8..627009f 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef efi_enabled const bool_t efi_enabled = 0; @@ -9,6 +10,8 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } + paddr_t efi_rs_page_table(void) { BUG(); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d4965da..262d59e 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5287,7 +5287,10 @@ static l3_pgentry_t *virt_to_xen_l3e(unsigned long v) spin_lock(&map_pgdir_lock); if ( !(l4e_get_flags(*pl4e) & _PAGE_PRESENT) ) { - l4e_write(pl4e, l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR)); + l4_pgentry_t l4e = l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR); + + l4e_write(pl4e, l4e); + efi_update_l4_pgtable(l4_table_offset(v), l4e); pl3e = NULL; } if ( locking ) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index a8bc999..ccf0752 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -286,6 +286,7 @@ extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */ #define _PAGE_NONE _AC(0x000,U) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 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 1YzpK4-0006lN-10; Tue, 02 Jun 2015 16:45:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpK2-0006l7-8E for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:50 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 9C/36-30151-DBDDD655; Tue, 02 Jun 2015 16:45:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433263546!19722162!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30252 invoked from network); 2 Jun 2015 16:45:47 -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; 2 Jun 2015 16:45:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJy-0000Pu-0h for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJx-0000SL-Vh for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:45 +0000 Date: Tue, 02 Jun 2015 16:45:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't unconditionally touch the hvm_domain union during domain construction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c3d34da0c4af86ebecc0af140144a35902e2986 Author: Andrew Cooper AuthorDate: Thu May 28 12:29:19 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:29:19 2015 +0200 x86: don't unconditionally touch the hvm_domain union during domain construction It may not be the appropriate half to touch. Drop the superfluous mem_sharing_enabled assignment, and move the hap_enabled assignment to a suitable conditional before it is actually needed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 74d0932448245cc4776d50811ceb80365623893c master date: 2015-05-20 13:25:12 +0200 --- xen/arch/x86/domain.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f1fc993..61deaff 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -519,12 +519,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) int i, paging_initialised = 0; int rc = -ENOMEM; - d->arch.hvm_domain.hap_enabled = - has_hvm_container_domain(d) && - hvm_funcs.hap_supported && - (domcr_flags & DOMCRF_hap); - d->arch.hvm_domain.mem_sharing_enabled = 0; - d->arch.s3_integrity = !!(domcr_flags & DOMCRF_s3_integrity); INIT_LIST_HEAD(&d->arch.pdev_list); @@ -547,7 +541,12 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) } if ( has_hvm_container_domain(d) ) + { + d->arch.hvm_domain.hap_enabled = + hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + } else if ( is_idle_domain(d) ) rc = 0; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:45:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 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 1YzpK4-0006lN-10; Tue, 02 Jun 2015 16:45:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpK2-0006l7-8E for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:50 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 9C/36-30151-DBDDD655; Tue, 02 Jun 2015 16:45:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433263546!19722162!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30252 invoked from network); 2 Jun 2015 16:45:47 -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; 2 Jun 2015 16:45:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpJy-0000Pu-0h for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpJx-0000SL-Vh for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:45 +0000 Date: Tue, 02 Jun 2015 16:45:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't unconditionally touch the hvm_domain union during domain construction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c3d34da0c4af86ebecc0af140144a35902e2986 Author: Andrew Cooper AuthorDate: Thu May 28 12:29:19 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:29:19 2015 +0200 x86: don't unconditionally touch the hvm_domain union during domain construction It may not be the appropriate half to touch. Drop the superfluous mem_sharing_enabled assignment, and move the hap_enabled assignment to a suitable conditional before it is actually needed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 74d0932448245cc4776d50811ceb80365623893c master date: 2015-05-20 13:25:12 +0200 --- xen/arch/x86/domain.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f1fc993..61deaff 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -519,12 +519,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) int i, paging_initialised = 0; int rc = -ENOMEM; - d->arch.hvm_domain.hap_enabled = - has_hvm_container_domain(d) && - hvm_funcs.hap_supported && - (domcr_flags & DOMCRF_hap); - d->arch.hvm_domain.mem_sharing_enabled = 0; - d->arch.s3_integrity = !!(domcr_flags & DOMCRF_s3_integrity); INIT_LIST_HEAD(&d->arch.pdev_list); @@ -547,7 +541,12 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) } if ( has_hvm_container_domain(d) ) + { + d->arch.hvm_domain.hap_enabled = + hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + } else if ( is_idle_domain(d) ) rc = 0; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:46:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKD-0006nE-7V; Tue, 02 Jun 2015 16:46:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKB-0006mn-Gf for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:59 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 11/A5-00727-6CDDD655; Tue, 02 Jun 2015 16:45:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433263556!12509210!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19145 invoked from network); 2 Jun 2015 16:45:57 -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; 2 Jun 2015 16:45:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpK8-0000Q6-5j for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpK8-0000Sl-4W for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:56 +0000 Date: Tue, 02 Jun 2015 16:45:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/irq: limit the maximum number of domain PIRQs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5eac1be2570d9d56a4a1fe9b4c0c24d5d120c904 Author: Andrew Cooper AuthorDate: Thu May 28 12:29:49 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:29:49 2015 +0200 x86/irq: limit the maximum number of domain PIRQs c/s 7e73a6e "have architectures specify the number of PIRQs a hardware domain gets" increased the default number of pirqs for dom0, as 256 was found to be too low in some cases. However, it didn't account for the upper bound presented by the domains EOI bitmap, registered with the PHYSDEVOP_pirq_eoi_gmfn_v* hypercall. On a server with 240 cpus, Xen was observed to be attempting to clear the EOI bit for dom0's pirq 0xb40f, which hit a pagefault. Signed-off-by: Andrew Cooper master commit: 75d28c917094b0e264874e92e8980b00a372b99f master date: 2015-05-22 10:13:04 +0200 --- xen/arch/x86/io_apic.c | 4 ++++ xen/arch/x86/irq.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 01f816b..4a053a6 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2614,6 +2614,10 @@ unsigned int arch_hwdom_irqs(domid_t domid) if ( !domid ) n = min(n, dom0_max_vcpus()); n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, nr_irqs); + + /* Bounded by the domain pirq eoi bitmap gfn. */ + n = min_t(unsigned int, n, PAGE_SIZE * BITS_PER_BYTE); + printk("Dom%d has maximum %u PIRQs\n", domid, n); return n; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 3cf6777..e7ebeff 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1073,13 +1073,19 @@ bool_t cpu_has_pending_apic_eoi(void) static inline void set_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); set_bit(irq, d->arch.pirq_eoi_map); + } } static inline void clear_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); clear_bit(irq, d->arch.pirq_eoi_map); + } } static void set_eoi_ready(void *data); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:46:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:46:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKD-0006nE-7V; Tue, 02 Jun 2015 16:46:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKB-0006mn-Gf for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:59 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 11/A5-00727-6CDDD655; Tue, 02 Jun 2015 16:45:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433263556!12509210!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19145 invoked from network); 2 Jun 2015 16:45:57 -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; 2 Jun 2015 16:45:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpK8-0000Q6-5j for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpK8-0000Sl-4W for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:45:56 +0000 Date: Tue, 02 Jun 2015 16:45:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/irq: limit the maximum number of domain PIRQs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5eac1be2570d9d56a4a1fe9b4c0c24d5d120c904 Author: Andrew Cooper AuthorDate: Thu May 28 12:29:49 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:29:49 2015 +0200 x86/irq: limit the maximum number of domain PIRQs c/s 7e73a6e "have architectures specify the number of PIRQs a hardware domain gets" increased the default number of pirqs for dom0, as 256 was found to be too low in some cases. However, it didn't account for the upper bound presented by the domains EOI bitmap, registered with the PHYSDEVOP_pirq_eoi_gmfn_v* hypercall. On a server with 240 cpus, Xen was observed to be attempting to clear the EOI bit for dom0's pirq 0xb40f, which hit a pagefault. Signed-off-by: Andrew Cooper master commit: 75d28c917094b0e264874e92e8980b00a372b99f master date: 2015-05-22 10:13:04 +0200 --- xen/arch/x86/io_apic.c | 4 ++++ xen/arch/x86/irq.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 01f816b..4a053a6 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2614,6 +2614,10 @@ unsigned int arch_hwdom_irqs(domid_t domid) if ( !domid ) n = min(n, dom0_max_vcpus()); n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, nr_irqs); + + /* Bounded by the domain pirq eoi bitmap gfn. */ + n = min_t(unsigned int, n, PAGE_SIZE * BITS_PER_BYTE); + printk("Dom%d has maximum %u PIRQs\n", domid, n); return n; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 3cf6777..e7ebeff 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1073,13 +1073,19 @@ bool_t cpu_has_pending_apic_eoi(void) static inline void set_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); set_bit(irq, d->arch.pirq_eoi_map); + } } static inline void clear_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); clear_bit(irq, d->arch.pirq_eoi_map); + } } static void set_eoi_ready(void *data); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:46:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:46:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKW-0006pm-Bb; Tue, 02 Jun 2015 16:46:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKV-0006pb-11 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:19 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 1A/89-18676-ADDDD655; Tue, 02 Jun 2015 16:46:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1433263576!19691657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20526 invoked from network); 2 Jun 2015 16:46:17 -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; 2 Jun 2015 16:46:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKS-0000Qm-GX for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpKS-0000UL-FN for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:16 +0000 Date: Tue, 02 Jun 2015 16:46:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] cpupool: assigning a CPU to a pool can fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f237ee493b19c0a4190e09fac338c741776f7506 Author: Dario Faggioli AuthorDate: Thu May 28 14:01:03 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 14:01:03 2015 +0200 cpupool: assigning a CPU to a pool can fail which means such an event must be handled at the call sites of cpupool_assign_cpu_locked(), and the error, if occurring, properly propagated. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross master commit: d415a81b2245ac4b27f8cbf4e314449ef275333a master date: 2015-05-07 15:15:53 +0200 --- xen/common/cpupool.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index cd6aab9..62c61e6 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -457,8 +457,10 @@ void cpupool_rm_domain(struct domain *d) * unless we are resuming from S3, in which case we put the cpu back * in the cpupool it was in prior to suspend. */ -static void cpupool_cpu_add(unsigned int cpu) +static int cpupool_cpu_add(unsigned int cpu) { + int ret = -EINVAL; + spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); cpumask_set_cpu(cpu, &cpupool_free_cpus); @@ -471,15 +473,20 @@ static void cpupool_cpu_add(unsigned int cpu) { if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) { - cpupool_assign_cpu_locked(*c, cpu); + ret = cpupool_assign_cpu_locked(*c, cpu); + if ( ret ) + goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); } } } if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) - cpupool_assign_cpu_locked(cpupool0, cpu); + ret = cpupool_assign_cpu_locked(cpupool0, cpu); + out: spin_unlock(&cpupool_lock); + + return ret; } /* @@ -703,7 +710,7 @@ static int cpu_callback( { case CPU_DOWN_FAILED: case CPU_ONLINE: - cpupool_cpu_add(cpu); + rc = cpupool_cpu_add(cpu); break; case CPU_DOWN_PREPARE: rc = cpupool_cpu_remove(cpu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:46:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:46:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKW-0006pm-Bb; Tue, 02 Jun 2015 16:46:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKV-0006pb-11 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:19 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 1A/89-18676-ADDDD655; Tue, 02 Jun 2015 16:46:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1433263576!19691657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20526 invoked from network); 2 Jun 2015 16:46:17 -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; 2 Jun 2015 16:46:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKS-0000Qm-GX for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpKS-0000UL-FN for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:16 +0000 Date: Tue, 02 Jun 2015 16:46:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] cpupool: assigning a CPU to a pool can fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f237ee493b19c0a4190e09fac338c741776f7506 Author: Dario Faggioli AuthorDate: Thu May 28 14:01:03 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 14:01:03 2015 +0200 cpupool: assigning a CPU to a pool can fail which means such an event must be handled at the call sites of cpupool_assign_cpu_locked(), and the error, if occurring, properly propagated. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross master commit: d415a81b2245ac4b27f8cbf4e314449ef275333a master date: 2015-05-07 15:15:53 +0200 --- xen/common/cpupool.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index cd6aab9..62c61e6 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -457,8 +457,10 @@ void cpupool_rm_domain(struct domain *d) * unless we are resuming from S3, in which case we put the cpu back * in the cpupool it was in prior to suspend. */ -static void cpupool_cpu_add(unsigned int cpu) +static int cpupool_cpu_add(unsigned int cpu) { + int ret = -EINVAL; + spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); cpumask_set_cpu(cpu, &cpupool_free_cpus); @@ -471,15 +473,20 @@ static void cpupool_cpu_add(unsigned int cpu) { if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) { - cpupool_assign_cpu_locked(*c, cpu); + ret = cpupool_assign_cpu_locked(*c, cpu); + if ( ret ) + goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); } } } if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) - cpupool_assign_cpu_locked(cpupool0, cpu); + ret = cpupool_assign_cpu_locked(cpupool0, cpu); + out: spin_unlock(&cpupool_lock); + + return ret; } /* @@ -703,7 +710,7 @@ static int cpu_callback( { case CPU_DOWN_FAILED: case CPU_ONLINE: - cpupool_cpu_add(cpu); + rc = cpupool_cpu_add(cpu); break; case CPU_DOWN_PREPARE: rc = cpupool_cpu_remove(cpu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:46:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:46:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKg-0006tm-Ev; Tue, 02 Jun 2015 16:46:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKf-0006tH-5J for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:29 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 20/BC-21300-4EDDD655; Tue, 02 Jun 2015 16:46:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433263586!19674081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31393 invoked from network); 2 Jun 2015 16:46:27 -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; 2 Jun 2015 16:46:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKc-0000Qy-LJ for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpKc-0000Uh-Jj for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:26 +0000 Date: Tue, 02 Jun 2015 16:46:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] cpupools: avoid crashing if shutting down with free CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09f76cb8b843ba155229e39f0788e7c5f4a72023 Author: Dario Faggioli AuthorDate: Thu May 28 14:01:48 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 14:01:48 2015 +0200 cpupools: avoid crashing if shutting down with free CPUs in fact, before this change, shutting down or suspending the system with some CPUs not assigned to any cpupool, would crash as follows: (XEN) Xen call trace: (XEN) [] disable_nonboot_cpus+0xb5/0x138 (XEN) [] enter_state_helper+0xbd/0x369 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Xen BUG at cpu.c:191 (XEN) **************************************** This is because, for free CPUs, -EBUSY were being returned when trying to tear them down, making cpu_down() unhappy. It is certainly unpractical to forbid shutting down or suspenging if there are unassigned CPUs, so this change fixes the above by just avoiding returning -EBUSY for those CPUs. If shutting off, that does not matter much anyway. If suspending, we make sure that the CPUs remain unassigned when resuming. While there, take the chance to: - fix the doc comment of cpupool_cpu_remove() (it was wrong); - improve comments in general around and in cpupool_cpu_remove() and cpupool_cpu_add(); - add a couple of ASSERT()-s for checking consistency. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Tested-by: Juergen Gross master commit: 7ff6f1fc39ebf2fa939d78a6ca3f883adff04bc9 master date: 2015-05-13 15:08:30 +0200 --- xen/common/cpupool.c | 82 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 62c61e6..2a557f3 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -452,14 +452,16 @@ void cpupool_rm_domain(struct domain *d) } /* - * called to add a new cpu to pool admin - * we add a hotplugged cpu to the cpupool0 to be able to add it to dom0, - * unless we are resuming from S3, in which case we put the cpu back - * in the cpupool it was in prior to suspend. + * Called to add a cpu to a pool. CPUs being hot-plugged are added to pool0, + * as they must have been in there when unplugged. + * + * If, on the other hand, we are adding CPUs because we are resuming (e.g., + * after ACPI S3) we put the cpu back in the pool where it was in prior when + * we suspended. */ static int cpupool_cpu_add(unsigned int cpu) { - int ret = -EINVAL; + int ret = 0; spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); @@ -477,12 +479,28 @@ static int cpupool_cpu_add(unsigned int cpu) if ( ret ) goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); + break; } } - } - if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) + /* + * Either cpu has been found as suspended in a pool, and added back + * there, or it stayed free (if it did not belong to any pool when + * suspending), and we don't want to do anything. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_valid)); + } + else + { + /* + * If we are not resuming, we are hot-plugging cpu, and in which case + * we add it to pool0, as it certainly was there when hot-unplagged + * (or unplugging would have failed) and that is the default behavior + * anyway. + */ ret = cpupool_assign_cpu_locked(cpupool0, cpu); + } out: spin_unlock(&cpupool_lock); @@ -490,29 +508,52 @@ static int cpupool_cpu_add(unsigned int cpu) } /* - * called to remove a cpu from pool admin - * the cpu to be removed is locked to avoid removing it from dom0 - * returns failure if not in pool0 + * Called to remove a CPU from a pool. The CPU is locked, to forbid removing + * it from pool0. In fact, if we want to hot-unplug a CPU, it must belong to + * pool0, or we fail. + * + * However, if we are suspending (e.g., to ACPI S3), we mark the CPU in such + * a way that it can be put back in its pool when resuming. */ static int cpupool_cpu_remove(unsigned int cpu) { int ret = -EBUSY; - struct cpupool **c; spin_lock(&cpupool_lock); - if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) - ret = 0; - else + if ( system_state == SYS_STATE_suspend ) { + struct cpupool **c; + for_each_cpupool(c) { - if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) { - ret = 0; + cpumask_set_cpu(cpu, (*c)->cpu_suspended); break; } } + + /* + * Either we found cpu in a pool, or it must be free (if it has been + * hot-unplagged, then we must have found it in pool0). It is, of + * course, fine to suspend or shutdown with CPUs not assigned to a + * pool, and (in case of suspend) they will stay free when resuming. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_suspended)); + ASSERT(cpumask_test_cpu(cpu, &cpu_online_map) || + cpumask_test_cpu(cpu, cpupool0->cpu_suspended)); + ret = 0; + } + else if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + { + /* + * If we are not suspending, we are hot-unplugging cpu, and that is + * allowed only for CPUs in pool0. + */ + ret = 0; } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); @@ -697,15 +738,6 @@ static int cpu_callback( unsigned int cpu = (unsigned long)hcpu; int rc = 0; - if ( system_state == SYS_STATE_suspend ) - { - struct cpupool **c; - - for_each_cpupool(c) - if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) - cpumask_set_cpu(cpu, (*c)->cpu_suspended); - } - switch ( action ) { case CPU_DOWN_FAILED: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:46:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:46:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKg-0006tm-Ev; Tue, 02 Jun 2015 16:46:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKf-0006tH-5J for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:29 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 20/BC-21300-4EDDD655; Tue, 02 Jun 2015 16:46:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433263586!19674081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31393 invoked from network); 2 Jun 2015 16:46:27 -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; 2 Jun 2015 16:46:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKc-0000Qy-LJ for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpKc-0000Uh-Jj for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:26 +0000 Date: Tue, 02 Jun 2015 16:46:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] cpupools: avoid crashing if shutting down with free CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09f76cb8b843ba155229e39f0788e7c5f4a72023 Author: Dario Faggioli AuthorDate: Thu May 28 14:01:48 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 14:01:48 2015 +0200 cpupools: avoid crashing if shutting down with free CPUs in fact, before this change, shutting down or suspending the system with some CPUs not assigned to any cpupool, would crash as follows: (XEN) Xen call trace: (XEN) [] disable_nonboot_cpus+0xb5/0x138 (XEN) [] enter_state_helper+0xbd/0x369 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Xen BUG at cpu.c:191 (XEN) **************************************** This is because, for free CPUs, -EBUSY were being returned when trying to tear them down, making cpu_down() unhappy. It is certainly unpractical to forbid shutting down or suspenging if there are unassigned CPUs, so this change fixes the above by just avoiding returning -EBUSY for those CPUs. If shutting off, that does not matter much anyway. If suspending, we make sure that the CPUs remain unassigned when resuming. While there, take the chance to: - fix the doc comment of cpupool_cpu_remove() (it was wrong); - improve comments in general around and in cpupool_cpu_remove() and cpupool_cpu_add(); - add a couple of ASSERT()-s for checking consistency. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Tested-by: Juergen Gross master commit: 7ff6f1fc39ebf2fa939d78a6ca3f883adff04bc9 master date: 2015-05-13 15:08:30 +0200 --- xen/common/cpupool.c | 82 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 62c61e6..2a557f3 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -452,14 +452,16 @@ void cpupool_rm_domain(struct domain *d) } /* - * called to add a new cpu to pool admin - * we add a hotplugged cpu to the cpupool0 to be able to add it to dom0, - * unless we are resuming from S3, in which case we put the cpu back - * in the cpupool it was in prior to suspend. + * Called to add a cpu to a pool. CPUs being hot-plugged are added to pool0, + * as they must have been in there when unplugged. + * + * If, on the other hand, we are adding CPUs because we are resuming (e.g., + * after ACPI S3) we put the cpu back in the pool where it was in prior when + * we suspended. */ static int cpupool_cpu_add(unsigned int cpu) { - int ret = -EINVAL; + int ret = 0; spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); @@ -477,12 +479,28 @@ static int cpupool_cpu_add(unsigned int cpu) if ( ret ) goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); + break; } } - } - if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) + /* + * Either cpu has been found as suspended in a pool, and added back + * there, or it stayed free (if it did not belong to any pool when + * suspending), and we don't want to do anything. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_valid)); + } + else + { + /* + * If we are not resuming, we are hot-plugging cpu, and in which case + * we add it to pool0, as it certainly was there when hot-unplagged + * (or unplugging would have failed) and that is the default behavior + * anyway. + */ ret = cpupool_assign_cpu_locked(cpupool0, cpu); + } out: spin_unlock(&cpupool_lock); @@ -490,29 +508,52 @@ static int cpupool_cpu_add(unsigned int cpu) } /* - * called to remove a cpu from pool admin - * the cpu to be removed is locked to avoid removing it from dom0 - * returns failure if not in pool0 + * Called to remove a CPU from a pool. The CPU is locked, to forbid removing + * it from pool0. In fact, if we want to hot-unplug a CPU, it must belong to + * pool0, or we fail. + * + * However, if we are suspending (e.g., to ACPI S3), we mark the CPU in such + * a way that it can be put back in its pool when resuming. */ static int cpupool_cpu_remove(unsigned int cpu) { int ret = -EBUSY; - struct cpupool **c; spin_lock(&cpupool_lock); - if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) - ret = 0; - else + if ( system_state == SYS_STATE_suspend ) { + struct cpupool **c; + for_each_cpupool(c) { - if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) { - ret = 0; + cpumask_set_cpu(cpu, (*c)->cpu_suspended); break; } } + + /* + * Either we found cpu in a pool, or it must be free (if it has been + * hot-unplagged, then we must have found it in pool0). It is, of + * course, fine to suspend or shutdown with CPUs not assigned to a + * pool, and (in case of suspend) they will stay free when resuming. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_suspended)); + ASSERT(cpumask_test_cpu(cpu, &cpu_online_map) || + cpumask_test_cpu(cpu, cpupool0->cpu_suspended)); + ret = 0; + } + else if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + { + /* + * If we are not suspending, we are hot-unplugging cpu, and that is + * allowed only for CPUs in pool0. + */ + ret = 0; } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); @@ -697,15 +738,6 @@ static int cpu_callback( unsigned int cpu = (unsigned long)hcpu; int rc = 0; - if ( system_state == SYS_STATE_suspend ) - { - struct cpupool **c; - - for_each_cpupool(c) - if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) - cpumask_set_cpu(cpu, (*c)->cpu_suspended); - } - switch ( action ) { case CPU_DOWN_FAILED: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:47:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:47: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 1YzpLr-00071S-MO; Tue, 02 Jun 2015 16:47:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpLq-00071G-CE for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:47:42 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 40/A4-19853-D2EDD655; Tue, 02 Jun 2015 16:47:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433263566!11284469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32274 invoked from network); 2 Jun 2015 16:46: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; 2 Jun 2015 16:46:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKI-0000Qe-BL for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpKI-0000TI-9a for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:06 +0000 Date: Tue, 02 Jun 2015 16:46:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen: common: Use unbounded array for symbols_offset. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b986072c2bbbe4f64d7f215b6ef834626ad40e42 Author: Ian Campbell AuthorDate: Thu May 28 14:00:20 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 14:00:20 2015 +0200 xen: common: Use unbounded array for symbols_offset. Using a singleton array causes gcc5 to report: symbols.c: In function 'symbols_lookup': symbols.c:128:359: error: array subscript is above array bounds [-Werror=array-bounds] symbols.c:136:176: error: array subscript is above array bounds [-Werror=array-bounds] Signed-off-by: Ian Campbell Acked-by: Jan Beulich master commit: 3f82ea62826d4eb06002d8dba475bafcc454b845 master date: 2015-03-20 12:02:03 +0000 --- xen/common/symbols.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/symbols.c b/xen/common/symbols.c index bc2fde6..fc7c9e7 100644 --- a/xen/common/symbols.c +++ b/xen/common/symbols.c @@ -19,7 +19,7 @@ #include #ifdef SYMBOLS_ORIGIN -extern const unsigned int symbols_offsets[1]; +extern const unsigned int symbols_offsets[]; #define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) #else extern const unsigned long symbols_addresses[]; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:47:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:47: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 1YzpLr-00071S-MO; Tue, 02 Jun 2015 16:47:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpLq-00071G-CE for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:47:42 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 40/A4-19853-D2EDD655; Tue, 02 Jun 2015 16:47:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433263566!11284469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32274 invoked from network); 2 Jun 2015 16:46: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; 2 Jun 2015 16:46:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpKI-0000Qe-BL for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpKI-0000TI-9a for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:46:06 +0000 Date: Tue, 02 Jun 2015 16:46:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen: common: Use unbounded array for symbols_offset. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b986072c2bbbe4f64d7f215b6ef834626ad40e42 Author: Ian Campbell AuthorDate: Thu May 28 14:00:20 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 14:00:20 2015 +0200 xen: common: Use unbounded array for symbols_offset. Using a singleton array causes gcc5 to report: symbols.c: In function 'symbols_lookup': symbols.c:128:359: error: array subscript is above array bounds [-Werror=array-bounds] symbols.c:136:176: error: array subscript is above array bounds [-Werror=array-bounds] Signed-off-by: Ian Campbell Acked-by: Jan Beulich master commit: 3f82ea62826d4eb06002d8dba475bafcc454b845 master date: 2015-03-20 12:02:03 +0000 --- xen/common/symbols.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/symbols.c b/xen/common/symbols.c index bc2fde6..fc7c9e7 100644 --- a/xen/common/symbols.c +++ b/xen/common/symbols.c @@ -19,7 +19,7 @@ #include #ifdef SYMBOLS_ORIGIN -extern const unsigned int symbols_offsets[1]; +extern const unsigned int symbols_offsets[]; #define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) #else extern const unsigned long symbols_addresses[]; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:57:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:57: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 1YzpVH-0008Ca-0v; Tue, 02 Jun 2015 16:57:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpVF-0008CL-80 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:57:25 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 68/50-23096-470ED655; Tue, 02 Jun 2015 16:57:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433263455!11284142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20425 invoked from network); 2 Jun 2015 16:44:17 -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 Jun 2015 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 1YzpIU-0000Np-GB for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIU-0000NX-EL for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:14 +0000 Date: Tue, 02 Jun 2015 16:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b19348f3cd176e4badb173dd0054c49346a6ce1 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Wed May 27 17:02:41 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 372dd3b..9a6faa0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1158,22 +1158,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -1183,8 +1181,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1247,7 +1247,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 02 16:57:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Jun 2015 16:57: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 1YzpVH-0008Ca-0v; Tue, 02 Jun 2015 16:57:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YzpVF-0008CL-80 for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:57:25 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 68/50-23096-470ED655; Tue, 02 Jun 2015 16:57:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433263455!11284142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20425 invoked from network); 2 Jun 2015 16:44:17 -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 Jun 2015 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 1YzpIU-0000Np-GB for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YzpIU-0000NX-EL for xen-changelog@lists.xensource.com; Tue, 02 Jun 2015 16:44:14 +0000 Date: Tue, 02 Jun 2015 16:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b19348f3cd176e4badb173dd0054c49346a6ce1 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Wed May 27 17:02:41 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 372dd3b..9a6faa0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1158,22 +1158,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -1183,8 +1181,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1247,7 +1247,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 05 21:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Jun 2015 21: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 1Z0zZz-0001k1-13; Fri, 05 Jun 2015 21:55:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z0zZy-0001jt-8Q for xen-changelog@lists.xensource.com; Fri, 05 Jun 2015 21:55:06 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id F2/0B-16518-9BA12755; Fri, 05 Jun 2015 21:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1433541303!13589323!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9649 invoked from network); 5 Jun 2015 21:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jun 2015 21:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z0zZv-0001qL-Bp for xen-changelog@lists.xensource.com; Fri, 05 Jun 2015 21:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z0zZu-0002OZ-V8 for xen-changelog@lists.xensource.com; Fri, 05 Jun 2015 21:55:03 +0000 Date: Fri, 05 Jun 2015 21:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f4362b43fbe2eb87b280f87c1ff89dff623bfdd Author: Jan Beulich AuthorDate: Wed Jun 3 09:10:15 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:10:15 2015 +0200 update Xen version to 4.5.1-rc2 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d5d293d..7c1670f 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1-rc2 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= e42b84cf1c524d017208b981c7749dc5945dda72 +QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc2 # Wed May 6 09:48:59 2015 +0200 # fdc: force the fifo access to be in bounds of the allocated buffer diff --git a/xen/Makefile b/xen/Makefile index 5720393..a5b47f7 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .1-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-rc2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 05 21:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Jun 2015 21: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 1Z0zZz-0001k1-13; Fri, 05 Jun 2015 21:55:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z0zZy-0001jt-8Q for xen-changelog@lists.xensource.com; Fri, 05 Jun 2015 21:55:06 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id F2/0B-16518-9BA12755; Fri, 05 Jun 2015 21:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1433541303!13589323!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9649 invoked from network); 5 Jun 2015 21:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Jun 2015 21:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z0zZv-0001qL-Bp for xen-changelog@lists.xensource.com; Fri, 05 Jun 2015 21:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z0zZu-0002OZ-V8 for xen-changelog@lists.xensource.com; Fri, 05 Jun 2015 21:55:03 +0000 Date: Fri, 05 Jun 2015 21:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f4362b43fbe2eb87b280f87c1ff89dff623bfdd Author: Jan Beulich AuthorDate: Wed Jun 3 09:10:15 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:10:15 2015 +0200 update Xen version to 4.5.1-rc2 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d5d293d..7c1670f 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1-rc2 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= e42b84cf1c524d017208b981c7749dc5945dda72 +QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc2 # Wed May 6 09:48:59 2015 +0200 # fdc: force the fifo access to be in bounds of the allocated buffer diff --git a/xen/Makefile b/xen/Makefile index 5720393..a5b47f7 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .1-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-rc2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fL-0004S9-8u; Sat, 06 Jun 2015 06:33:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fJ-0004S3-5R for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:09 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 5F/17-12923-42492755; Sat, 06 Jun 2015 06:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1433572386!12259645!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17602 invoked from network); 6 Jun 2015 06:33:07 -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; 6 Jun 2015 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 1Z17fG-0006WF-H4 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fG-00071O-8d for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:06 +0000 Date: Sat, 06 Jun 2015 06:33:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: refactor of send_domain_memory_live() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfa955591caea5d7ec505cdcbf4442f2d6e889e1 Author: Yang Hongyang AuthorDate: Mon May 18 15:03:54 2015 +0800 Commit: Ian Campbell CommitDate: Fri May 29 12:25:00 2015 +0100 libxc/save: refactor of send_domain_memory_live() Split the send_domain_memory_live() into three helper function: - send_memory_live() do the actually live send - suspend_and_send_dirty() suspend the guest and send dirty pages - send_memory_verify() The motivation of this is that when we send checkpointed stream, we will skip the actually live part. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 137 +++++++++++++++++++++++++++++++++------------- 1 files changed, 98 insertions(+), 39 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 1d0a46d..c08a49e 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -455,21 +455,15 @@ static int update_progress_string(struct xc_sr_context *ctx, } /* - * Send all domain memory. This is the heart of the live migration loop. + * Send memory while guest is running. */ -static int send_domain_memory_live(struct xc_sr_context *ctx) +static int send_memory_live(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; char *progress_str = NULL; unsigned x; int rc = -1; - DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, - &ctx->save.dirty_bitmap_hbuf); - - rc = enable_logdirty(ctx); - if ( rc ) - goto out; rc = update_progress_string(ctx, &progress_str, 0); if ( rc ) @@ -485,7 +479,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) { if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, - HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, + &ctx->save.dirty_bitmap_hbuf, ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -505,6 +499,26 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) goto out; } + out: + xc_set_progress_prefix(xch, NULL); + free(progress_str); + return rc; +} + +/* + * Suspend the domain and send dirty memory. + * This is the last iteration of the live migration and the + * heart of the checkpointed stream. + */ +static int suspend_and_send_dirty(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; + char *progress_str = NULL; + int rc = -1; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + rc = suspend_domain(ctx); if ( rc ) goto out; @@ -519,9 +533,15 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) goto out; } - rc = update_progress_string(ctx, &progress_str, ctx->save.max_iterations); - if ( rc ) - goto out; + if ( ctx->save.live ) + { + rc = update_progress_string(ctx, &progress_str, + ctx->save.max_iterations); + if ( rc ) + goto out; + } + else + xc_set_progress_prefix(xch, "Checkpointed save"); bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); @@ -529,42 +549,81 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - if ( ctx->save.debug ) + bitmap_clear(ctx->save.deferred_pages, ctx->save.p2m_size); + ctx->save.nr_deferred_pages = 0; + + out: + xc_set_progress_prefix(xch, NULL); + free(progress_str); + return rc; +} + +static int send_memory_verify(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; + int rc = -1; + struct xc_sr_record rec = { - struct xc_sr_record rec = - { - .type = REC_TYPE_VERIFY, - .length = 0, - }; + .type = REC_TYPE_VERIFY, + .length = 0, + }; - DPRINTF("Enabling verify mode"); + DPRINTF("Enabling verify mode"); - rc = write_record(ctx, &rec); - if ( rc ) - goto out; + rc = write_record(ctx, &rec); + if ( rc ) + goto out; - xc_set_progress_prefix(xch, "Memory verify"); - rc = send_all_pages(ctx); - if ( rc ) - goto out; + xc_set_progress_prefix(xch, "Memory verify"); + rc = send_all_pages(ctx); + if ( rc ) + goto out; - if ( xc_shadow_control( - xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_PEEK, - HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, - NULL, 0, &stats) != ctx->save.p2m_size ) - { - PERROR("Failed to retrieve logdirty bitmap"); - rc = -1; - goto out; - } + if ( xc_shadow_control( + xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_PEEK, + &ctx->save.dirty_bitmap_hbuf, ctx->save.p2m_size, + NULL, 0, &stats) != ctx->save.p2m_size ) + { + PERROR("Failed to retrieve logdirty bitmap"); + rc = -1; + goto out; + } - DPRINTF(" Further stats: faults %u, dirty %u", - stats.fault_count, stats.dirty_count); + DPRINTF(" Further stats: faults %u, dirty %u", + stats.fault_count, stats.dirty_count); + + out: + return rc; +} + +/* + * Send all domain memory. This is the heart of the live migration loop. + */ +static int send_domain_memory_live(struct xc_sr_context *ctx) +{ + int rc = -1; + + rc = enable_logdirty(ctx); + if ( rc ) + goto out; + + rc = send_memory_live(ctx); + if ( rc ) + goto out; + + rc = suspend_and_send_dirty(ctx); + if ( rc ) + goto out; + + if ( ctx->save.debug && !ctx->save.checkpointed ) + { + rc = send_memory_verify(ctx); + if ( rc ) + goto out; } out: - xc_set_progress_prefix(xch, NULL); - free(progress_str); 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 Jun 06 06:33:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fL-0004S9-8u; Sat, 06 Jun 2015 06:33:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fJ-0004S3-5R for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:09 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 5F/17-12923-42492755; Sat, 06 Jun 2015 06:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1433572386!12259645!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17602 invoked from network); 6 Jun 2015 06:33:07 -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; 6 Jun 2015 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 1Z17fG-0006WF-H4 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fG-00071O-8d for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:06 +0000 Date: Sat, 06 Jun 2015 06:33:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: refactor of send_domain_memory_live() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfa955591caea5d7ec505cdcbf4442f2d6e889e1 Author: Yang Hongyang AuthorDate: Mon May 18 15:03:54 2015 +0800 Commit: Ian Campbell CommitDate: Fri May 29 12:25:00 2015 +0100 libxc/save: refactor of send_domain_memory_live() Split the send_domain_memory_live() into three helper function: - send_memory_live() do the actually live send - suspend_and_send_dirty() suspend the guest and send dirty pages - send_memory_verify() The motivation of this is that when we send checkpointed stream, we will skip the actually live part. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 137 +++++++++++++++++++++++++++++++++------------- 1 files changed, 98 insertions(+), 39 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 1d0a46d..c08a49e 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -455,21 +455,15 @@ static int update_progress_string(struct xc_sr_context *ctx, } /* - * Send all domain memory. This is the heart of the live migration loop. + * Send memory while guest is running. */ -static int send_domain_memory_live(struct xc_sr_context *ctx) +static int send_memory_live(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; char *progress_str = NULL; unsigned x; int rc = -1; - DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, - &ctx->save.dirty_bitmap_hbuf); - - rc = enable_logdirty(ctx); - if ( rc ) - goto out; rc = update_progress_string(ctx, &progress_str, 0); if ( rc ) @@ -485,7 +479,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) { if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, - HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, + &ctx->save.dirty_bitmap_hbuf, ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -505,6 +499,26 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) goto out; } + out: + xc_set_progress_prefix(xch, NULL); + free(progress_str); + return rc; +} + +/* + * Suspend the domain and send dirty memory. + * This is the last iteration of the live migration and the + * heart of the checkpointed stream. + */ +static int suspend_and_send_dirty(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; + char *progress_str = NULL; + int rc = -1; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + rc = suspend_domain(ctx); if ( rc ) goto out; @@ -519,9 +533,15 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) goto out; } - rc = update_progress_string(ctx, &progress_str, ctx->save.max_iterations); - if ( rc ) - goto out; + if ( ctx->save.live ) + { + rc = update_progress_string(ctx, &progress_str, + ctx->save.max_iterations); + if ( rc ) + goto out; + } + else + xc_set_progress_prefix(xch, "Checkpointed save"); bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); @@ -529,42 +549,81 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - if ( ctx->save.debug ) + bitmap_clear(ctx->save.deferred_pages, ctx->save.p2m_size); + ctx->save.nr_deferred_pages = 0; + + out: + xc_set_progress_prefix(xch, NULL); + free(progress_str); + return rc; +} + +static int send_memory_verify(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; + int rc = -1; + struct xc_sr_record rec = { - struct xc_sr_record rec = - { - .type = REC_TYPE_VERIFY, - .length = 0, - }; + .type = REC_TYPE_VERIFY, + .length = 0, + }; - DPRINTF("Enabling verify mode"); + DPRINTF("Enabling verify mode"); - rc = write_record(ctx, &rec); - if ( rc ) - goto out; + rc = write_record(ctx, &rec); + if ( rc ) + goto out; - xc_set_progress_prefix(xch, "Memory verify"); - rc = send_all_pages(ctx); - if ( rc ) - goto out; + xc_set_progress_prefix(xch, "Memory verify"); + rc = send_all_pages(ctx); + if ( rc ) + goto out; - if ( xc_shadow_control( - xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_PEEK, - HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, - NULL, 0, &stats) != ctx->save.p2m_size ) - { - PERROR("Failed to retrieve logdirty bitmap"); - rc = -1; - goto out; - } + if ( xc_shadow_control( + xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_PEEK, + &ctx->save.dirty_bitmap_hbuf, ctx->save.p2m_size, + NULL, 0, &stats) != ctx->save.p2m_size ) + { + PERROR("Failed to retrieve logdirty bitmap"); + rc = -1; + goto out; + } - DPRINTF(" Further stats: faults %u, dirty %u", - stats.fault_count, stats.dirty_count); + DPRINTF(" Further stats: faults %u, dirty %u", + stats.fault_count, stats.dirty_count); + + out: + return rc; +} + +/* + * Send all domain memory. This is the heart of the live migration loop. + */ +static int send_domain_memory_live(struct xc_sr_context *ctx) +{ + int rc = -1; + + rc = enable_logdirty(ctx); + if ( rc ) + goto out; + + rc = send_memory_live(ctx); + if ( rc ) + goto out; + + rc = suspend_and_send_dirty(ctx); + if ( rc ) + goto out; + + if ( ctx->save.debug && !ctx->save.checkpointed ) + { + rc = send_memory_verify(ctx); + if ( rc ) + goto out; } out: - xc_set_progress_prefix(xch, NULL); - free(progress_str); 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 Jun 06 06:33:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fV-0004T5-Bm; Sat, 06 Jun 2015 06:33:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fT-0004Ss-Bv for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:19 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 15/BE-25925-E2492755; Sat, 06 Jun 2015 06:33:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433572397!12218484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17275 invoked from network); 6 Jun 2015 06:33:18 -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; 6 Jun 2015 06:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fQ-0006WI-Vl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fQ-00071r-KW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:16 +0000 Date: Sat, 06 Jun 2015 06:33:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: implement Remus checkpointed save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a25e4e96fc95150f5c58d069de1b204aa6487ed8 Author: Yang Hongyang AuthorDate: Mon May 18 15:03:55 2015 +0800 Commit: Ian Campbell CommitDate: Fri May 29 12:25:00 2015 +0100 libxc/save: implement Remus checkpointed save With Remus, the save flow should be: live migration->{ periodically save(checkpointed save) } Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 80 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 61 insertions(+), 19 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index c08a49e..d63b783 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -57,6 +57,16 @@ static int write_end_record(struct xc_sr_context *ctx) } /* + * Writes a CHECKPOINT record into the stream. + */ +static int write_checkpoint_record(struct xc_sr_context *ctx) +{ + struct xc_sr_record checkpoint = { REC_TYPE_CHECKPOINT, 0, NULL }; + + return write_record(ctx, &checkpoint); +} + +/* * Writes a batch of memory as a PAGE_DATA record into the stream. The batch * is constructed in ctx->save.batch_pfns. * @@ -628,6 +638,14 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) } /* + * Checkpointed save. + */ +static int send_domain_memory_checkpointed(struct xc_sr_context *ctx) +{ + return suspend_and_send_dirty(ctx); +} + +/* * Send all domain memory, pausing the domain first. Generally used for * suspend-to-file. */ @@ -726,29 +744,53 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( rc ) goto err; - rc = ctx->save.ops.start_of_checkpoint(ctx); - if ( rc ) - goto err; + do { + rc = ctx->save.ops.start_of_checkpoint(ctx); + if ( rc ) + goto err; - if ( ctx->save.live ) - rc = send_domain_memory_live(ctx); - else - rc = send_domain_memory_nonlive(ctx); + if ( ctx->save.live ) + rc = send_domain_memory_live(ctx); + else if ( ctx->save.checkpointed ) + rc = send_domain_memory_checkpointed(ctx); + else + rc = send_domain_memory_nonlive(ctx); - if ( rc ) - goto err; + if ( rc ) + goto err; - if ( !ctx->dominfo.shutdown || - (ctx->dominfo.shutdown_reason != SHUTDOWN_suspend) ) - { - ERROR("Domain has not been suspended"); - rc = -1; - goto err; - } + if ( !ctx->dominfo.shutdown || + (ctx->dominfo.shutdown_reason != SHUTDOWN_suspend) ) + { + ERROR("Domain has not been suspended"); + rc = -1; + goto err; + } - rc = ctx->save.ops.end_of_checkpoint(ctx); - if ( rc ) - goto err; + rc = ctx->save.ops.end_of_checkpoint(ctx); + if ( rc ) + goto err; + + if ( ctx->save.checkpointed ) + { + /* + * We have now completed the initial live portion of the checkpoint + * process. Therefore switch into periodically sending synchronous + * batches of pages. + */ + ctx->save.live = false; + + rc = write_checkpoint_record(ctx); + if ( rc ) + goto err; + + ctx->save.callbacks->postcopy(ctx->save.callbacks->data); + + rc = ctx->save.callbacks->checkpoint(ctx->save.callbacks->data); + if ( rc <= 0 ) + ctx->save.checkpointed = false; + } + } while ( ctx->save.checkpointed ); xc_report_progress_single(xch, "End of stream"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fV-0004T5-Bm; Sat, 06 Jun 2015 06:33:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fT-0004Ss-Bv for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:19 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 15/BE-25925-E2492755; Sat, 06 Jun 2015 06:33:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433572397!12218484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17275 invoked from network); 6 Jun 2015 06:33:18 -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; 6 Jun 2015 06:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fQ-0006WI-Vl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fQ-00071r-KW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:16 +0000 Date: Sat, 06 Jun 2015 06:33:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: implement Remus checkpointed save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a25e4e96fc95150f5c58d069de1b204aa6487ed8 Author: Yang Hongyang AuthorDate: Mon May 18 15:03:55 2015 +0800 Commit: Ian Campbell CommitDate: Fri May 29 12:25:00 2015 +0100 libxc/save: implement Remus checkpointed save With Remus, the save flow should be: live migration->{ periodically save(checkpointed save) } Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 80 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 61 insertions(+), 19 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index c08a49e..d63b783 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -57,6 +57,16 @@ static int write_end_record(struct xc_sr_context *ctx) } /* + * Writes a CHECKPOINT record into the stream. + */ +static int write_checkpoint_record(struct xc_sr_context *ctx) +{ + struct xc_sr_record checkpoint = { REC_TYPE_CHECKPOINT, 0, NULL }; + + return write_record(ctx, &checkpoint); +} + +/* * Writes a batch of memory as a PAGE_DATA record into the stream. The batch * is constructed in ctx->save.batch_pfns. * @@ -628,6 +638,14 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) } /* + * Checkpointed save. + */ +static int send_domain_memory_checkpointed(struct xc_sr_context *ctx) +{ + return suspend_and_send_dirty(ctx); +} + +/* * Send all domain memory, pausing the domain first. Generally used for * suspend-to-file. */ @@ -726,29 +744,53 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( rc ) goto err; - rc = ctx->save.ops.start_of_checkpoint(ctx); - if ( rc ) - goto err; + do { + rc = ctx->save.ops.start_of_checkpoint(ctx); + if ( rc ) + goto err; - if ( ctx->save.live ) - rc = send_domain_memory_live(ctx); - else - rc = send_domain_memory_nonlive(ctx); + if ( ctx->save.live ) + rc = send_domain_memory_live(ctx); + else if ( ctx->save.checkpointed ) + rc = send_domain_memory_checkpointed(ctx); + else + rc = send_domain_memory_nonlive(ctx); - if ( rc ) - goto err; + if ( rc ) + goto err; - if ( !ctx->dominfo.shutdown || - (ctx->dominfo.shutdown_reason != SHUTDOWN_suspend) ) - { - ERROR("Domain has not been suspended"); - rc = -1; - goto err; - } + if ( !ctx->dominfo.shutdown || + (ctx->dominfo.shutdown_reason != SHUTDOWN_suspend) ) + { + ERROR("Domain has not been suspended"); + rc = -1; + goto err; + } - rc = ctx->save.ops.end_of_checkpoint(ctx); - if ( rc ) - goto err; + rc = ctx->save.ops.end_of_checkpoint(ctx); + if ( rc ) + goto err; + + if ( ctx->save.checkpointed ) + { + /* + * We have now completed the initial live portion of the checkpoint + * process. Therefore switch into periodically sending synchronous + * batches of pages. + */ + ctx->save.live = false; + + rc = write_checkpoint_record(ctx); + if ( rc ) + goto err; + + ctx->save.callbacks->postcopy(ctx->save.callbacks->data); + + rc = ctx->save.callbacks->checkpoint(ctx->save.callbacks->data); + if ( rc <= 0 ) + ctx->save.checkpointed = false; + } + } while ( ctx->save.checkpointed ); xc_report_progress_single(xch, "End of stream"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17ff-0004UK-Eh; Sat, 06 Jun 2015 06:33:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fe-0004UC-4D for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:30 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id D8/1F-03371-93492755; Sat, 06 Jun 2015 06:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1433572407!16227740!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5553 invoked from network); 6 Jun 2015 06:33:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:33:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fb-0006WR-8K for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fb-00072H-48 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:27 +0000 Date: Sat, 06 Jun 2015 06:33:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: implement Remus checkpointed restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 088e9b2796bd1f9ebe4fda800275cc689677b699 Author: Yang Hongyang AuthorDate: Mon May 18 15:03:56 2015 +0800 Commit: Ian Campbell CommitDate: Fri May 29 12:25:01 2015 +0100 libxc/restore: implement Remus checkpointed restore With Remus, the restore flow should be: the first full migration stream -> { periodically restore stream } Signed-off-by: Yang Hongyang Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 15 +++++ tools/libxc/xc_sr_restore.c | 134 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 136 insertions(+), 13 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index f8121e7..565c5da 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -208,6 +208,21 @@ struct xc_sr_context /* Plain VM, or checkpoints over time. */ bool checkpointed; + /* Currently buffering records between a checkpoint */ + bool buffer_all_records; + +/* + * With Remus, we buffer the records sent by the primary at checkpoint, + * in case the primary will fail, we can recover from the last + * checkpoint state. + * This should be enough for most of the cases because primary only send + * dirty pages at checkpoint. + */ +#define DEFAULT_BUF_RECORDS 1024 + struct xc_sr_record *buffered_records; + unsigned allocated_rec_num; + unsigned buffered_rec_num; + /* * Xenstore and Console parameters. * INPUT: evtchn & domid diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 9ab5760..9e27dba 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -468,6 +468,67 @@ static int handle_page_data(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec); +static int handle_checkpoint(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + int rc = 0; + unsigned i; + + if ( !ctx->restore.checkpointed ) + { + ERROR("Found checkpoint in non-checkpointed stream"); + rc = -1; + goto err; + } + + if ( ctx->restore.buffer_all_records ) + { + IPRINTF("All records buffered"); + + for ( i = 0; i < ctx->restore.buffered_rec_num; i++ ) + { + rc = process_record(ctx, &ctx->restore.buffered_records[i]); + if ( rc ) + goto err; + } + ctx->restore.buffered_rec_num = 0; + IPRINTF("All records processed"); + } + else + ctx->restore.buffer_all_records = true; + + err: + return rc; +} + +static int buffer_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) +{ + xc_interface *xch = ctx->xch; + unsigned new_alloc_num; + struct xc_sr_record *p; + + if ( ctx->restore.buffered_rec_num >= ctx->restore.allocated_rec_num ) + { + new_alloc_num = ctx->restore.allocated_rec_num + DEFAULT_BUF_RECORDS; + p = realloc(ctx->restore.buffered_records, + new_alloc_num * sizeof(struct xc_sr_record)); + if ( !p ) + { + ERROR("Failed to realloc memory for buffered records"); + return -1; + } + + ctx->restore.buffered_records = p; + ctx->restore.allocated_rec_num = new_alloc_num; + } + + memcpy(&ctx->restore.buffered_records[ctx->restore.buffered_rec_num++], + rec, sizeof(*rec)); + + return 0; +} + static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) { xc_interface *xch = ctx->xch; @@ -487,12 +548,17 @@ static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) ctx->restore.verify = true; break; + case REC_TYPE_CHECKPOINT: + rc = handle_checkpoint(ctx); + break; + default: rc = ctx->restore.ops.process_record(ctx, rec); break; } free(rec->data); + rec->data = NULL; if ( rc == RECORD_NOT_PROCESSED ) { @@ -529,6 +595,16 @@ static int setup(struct xc_sr_context *ctx) goto err; } + ctx->restore.buffered_records = malloc( + DEFAULT_BUF_RECORDS * sizeof(struct xc_sr_record)); + if ( !ctx->restore.buffered_records ) + { + ERROR("Unable to allocate memory for buffered records"); + rc = -1; + goto err; + } + ctx->restore.allocated_rec_num = DEFAULT_BUF_RECORDS; + err: return rc; } @@ -536,7 +612,12 @@ static int setup(struct xc_sr_context *ctx) static void cleanup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; + unsigned i; + + for ( i = 0; i < ctx->restore.buffered_rec_num; i++ ) + free(ctx->restore.buffered_records[i].data); + free(ctx->restore.buffered_records); free(ctx->restore.populated_pfns); if ( ctx->restore.ops.cleanup(ctx) ) PERROR("Failed to clean up"); @@ -564,23 +645,50 @@ static int restore(struct xc_sr_context *ctx) { rc = read_record(ctx, &rec); if ( rc ) - goto err; - - rc = process_record(ctx, &rec); - if ( rc ) - goto err; - - } while ( rec.type != REC_TYPE_END ); + { + if ( ctx->restore.buffer_all_records ) + goto remus_failover; + else + goto err; + } #ifdef XG_LIBXL_HVM_COMPAT - if ( ctx->dominfo.hvm ) - { - rc = read_qemu(ctx); - if ( rc ) - goto err; - } + if ( ctx->dominfo.hvm && + (rec.type == REC_TYPE_END || rec.type == REC_TYPE_CHECKPOINT) ) + { + rc = read_qemu(ctx); + if ( rc ) + { + if ( ctx->restore.buffer_all_records ) + goto remus_failover; + else + goto err; + } + } #endif + if ( ctx->restore.buffer_all_records && + rec.type != REC_TYPE_END && + rec.type != REC_TYPE_CHECKPOINT ) + { + rc = buffer_record(ctx, &rec); + if ( rc ) + goto err; + } + else + { + rc = process_record(ctx, &rec); + if ( rc ) + goto err; + } + + } while ( rec.type != REC_TYPE_END ); + + remus_failover: + /* + * With Remus, if we reach here, there must be some error on primary, + * failover from the last checkpoint state. + */ rc = ctx->restore.ops.stream_complete(ctx); if ( rc ) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17ff-0004UK-Eh; Sat, 06 Jun 2015 06:33:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fe-0004UC-4D for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:30 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id D8/1F-03371-93492755; Sat, 06 Jun 2015 06:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1433572407!16227740!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5553 invoked from network); 6 Jun 2015 06:33:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:33:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fb-0006WR-8K for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fb-00072H-48 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:27 +0000 Date: Sat, 06 Jun 2015 06:33:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: implement Remus checkpointed restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 088e9b2796bd1f9ebe4fda800275cc689677b699 Author: Yang Hongyang AuthorDate: Mon May 18 15:03:56 2015 +0800 Commit: Ian Campbell CommitDate: Fri May 29 12:25:01 2015 +0100 libxc/restore: implement Remus checkpointed restore With Remus, the restore flow should be: the first full migration stream -> { periodically restore stream } Signed-off-by: Yang Hongyang Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 15 +++++ tools/libxc/xc_sr_restore.c | 134 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 136 insertions(+), 13 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index f8121e7..565c5da 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -208,6 +208,21 @@ struct xc_sr_context /* Plain VM, or checkpoints over time. */ bool checkpointed; + /* Currently buffering records between a checkpoint */ + bool buffer_all_records; + +/* + * With Remus, we buffer the records sent by the primary at checkpoint, + * in case the primary will fail, we can recover from the last + * checkpoint state. + * This should be enough for most of the cases because primary only send + * dirty pages at checkpoint. + */ +#define DEFAULT_BUF_RECORDS 1024 + struct xc_sr_record *buffered_records; + unsigned allocated_rec_num; + unsigned buffered_rec_num; + /* * Xenstore and Console parameters. * INPUT: evtchn & domid diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 9ab5760..9e27dba 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -468,6 +468,67 @@ static int handle_page_data(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec); +static int handle_checkpoint(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + int rc = 0; + unsigned i; + + if ( !ctx->restore.checkpointed ) + { + ERROR("Found checkpoint in non-checkpointed stream"); + rc = -1; + goto err; + } + + if ( ctx->restore.buffer_all_records ) + { + IPRINTF("All records buffered"); + + for ( i = 0; i < ctx->restore.buffered_rec_num; i++ ) + { + rc = process_record(ctx, &ctx->restore.buffered_records[i]); + if ( rc ) + goto err; + } + ctx->restore.buffered_rec_num = 0; + IPRINTF("All records processed"); + } + else + ctx->restore.buffer_all_records = true; + + err: + return rc; +} + +static int buffer_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) +{ + xc_interface *xch = ctx->xch; + unsigned new_alloc_num; + struct xc_sr_record *p; + + if ( ctx->restore.buffered_rec_num >= ctx->restore.allocated_rec_num ) + { + new_alloc_num = ctx->restore.allocated_rec_num + DEFAULT_BUF_RECORDS; + p = realloc(ctx->restore.buffered_records, + new_alloc_num * sizeof(struct xc_sr_record)); + if ( !p ) + { + ERROR("Failed to realloc memory for buffered records"); + return -1; + } + + ctx->restore.buffered_records = p; + ctx->restore.allocated_rec_num = new_alloc_num; + } + + memcpy(&ctx->restore.buffered_records[ctx->restore.buffered_rec_num++], + rec, sizeof(*rec)); + + return 0; +} + static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) { xc_interface *xch = ctx->xch; @@ -487,12 +548,17 @@ static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) ctx->restore.verify = true; break; + case REC_TYPE_CHECKPOINT: + rc = handle_checkpoint(ctx); + break; + default: rc = ctx->restore.ops.process_record(ctx, rec); break; } free(rec->data); + rec->data = NULL; if ( rc == RECORD_NOT_PROCESSED ) { @@ -529,6 +595,16 @@ static int setup(struct xc_sr_context *ctx) goto err; } + ctx->restore.buffered_records = malloc( + DEFAULT_BUF_RECORDS * sizeof(struct xc_sr_record)); + if ( !ctx->restore.buffered_records ) + { + ERROR("Unable to allocate memory for buffered records"); + rc = -1; + goto err; + } + ctx->restore.allocated_rec_num = DEFAULT_BUF_RECORDS; + err: return rc; } @@ -536,7 +612,12 @@ static int setup(struct xc_sr_context *ctx) static void cleanup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; + unsigned i; + + for ( i = 0; i < ctx->restore.buffered_rec_num; i++ ) + free(ctx->restore.buffered_records[i].data); + free(ctx->restore.buffered_records); free(ctx->restore.populated_pfns); if ( ctx->restore.ops.cleanup(ctx) ) PERROR("Failed to clean up"); @@ -564,23 +645,50 @@ static int restore(struct xc_sr_context *ctx) { rc = read_record(ctx, &rec); if ( rc ) - goto err; - - rc = process_record(ctx, &rec); - if ( rc ) - goto err; - - } while ( rec.type != REC_TYPE_END ); + { + if ( ctx->restore.buffer_all_records ) + goto remus_failover; + else + goto err; + } #ifdef XG_LIBXL_HVM_COMPAT - if ( ctx->dominfo.hvm ) - { - rc = read_qemu(ctx); - if ( rc ) - goto err; - } + if ( ctx->dominfo.hvm && + (rec.type == REC_TYPE_END || rec.type == REC_TYPE_CHECKPOINT) ) + { + rc = read_qemu(ctx); + if ( rc ) + { + if ( ctx->restore.buffer_all_records ) + goto remus_failover; + else + goto err; + } + } #endif + if ( ctx->restore.buffer_all_records && + rec.type != REC_TYPE_END && + rec.type != REC_TYPE_CHECKPOINT ) + { + rc = buffer_record(ctx, &rec); + if ( rc ) + goto err; + } + else + { + rc = process_record(ctx, &rec); + if ( rc ) + goto err; + } + + } while ( rec.type != REC_TYPE_END ); + + remus_failover: + /* + * With Remus, if we reach here, there must be some error on primary, + * failover from the last checkpoint state. + */ rc = ctx->restore.ops.stream_complete(ctx); if ( rc ) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fp-0004Vj-ID; Sat, 06 Jun 2015 06:33:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fo-0004VU-Ad for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:40 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C0/C8-21325-34492755; Sat, 06 Jun 2015 06:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1433572418!6829723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4847 invoked from network); 6 Jun 2015 06:33:39 -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; 6 Jun 2015 06:33:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fm-0006WZ-27 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fl-00074A-Rs for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:37 +0000 Date: Sat, 06 Jun 2015 06:33:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public: fix xen_domctl_monitor_op_t 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 d4d39de054a6f6c5a474aee62999a8ea7c2fd180 Author: Vitaly Kuznetsov AuthorDate: Thu May 28 10:55:43 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 10:55:43 2015 +0200 public: fix xen_domctl_monitor_op_t definition It seems xen_domctl_monitor_op_t was supposed to be a typedef for struct xen_domctl_monitor_op and not the non-existent xen_domctl__op. Signed-off-by: Vitaly Kuznetsov --- xen/include/public/domctl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 53cdf08..88f8002 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1036,7 +1036,7 @@ struct xen_domctl_monitor_op { } mov_to_msr; } u; }; -typedef struct xen_domctl__op xen_domctl_monitor_op_t; +typedef struct xen_domctl_monitor_op xen_domctl_monitor_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_monitor_op_t); struct xen_domctl { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fp-0004Vj-ID; Sat, 06 Jun 2015 06:33:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fo-0004VU-Ad for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:40 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C0/C8-21325-34492755; Sat, 06 Jun 2015 06:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1433572418!6829723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4847 invoked from network); 6 Jun 2015 06:33:39 -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; 6 Jun 2015 06:33:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fm-0006WZ-27 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fl-00074A-Rs for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:37 +0000 Date: Sat, 06 Jun 2015 06:33:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public: fix xen_domctl_monitor_op_t 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 d4d39de054a6f6c5a474aee62999a8ea7c2fd180 Author: Vitaly Kuznetsov AuthorDate: Thu May 28 10:55:43 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 10:55:43 2015 +0200 public: fix xen_domctl_monitor_op_t definition It seems xen_domctl_monitor_op_t was supposed to be a typedef for struct xen_domctl_monitor_op and not the non-existent xen_domctl__op. Signed-off-by: Vitaly Kuznetsov --- xen/include/public/domctl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 53cdf08..88f8002 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1036,7 +1036,7 @@ struct xen_domctl_monitor_op { } mov_to_msr; } u; }; -typedef struct xen_domctl__op xen_domctl_monitor_op_t; +typedef struct xen_domctl_monitor_op xen_domctl_monitor_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_monitor_op_t); struct xen_domctl { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fz-0004Xl-P6; Sat, 06 Jun 2015 06:33:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fy-0004XT-P1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:50 +0000 Content-Length: 1954 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 61/A6-18947-E4492755; Sat, 06 Jun 2015 06:33:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1433572428!20848598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15388 invoked from network); 6 Jun 2015 06:33:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:33:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fw-0006Wf-7y for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fw-00074Z-5p for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:48 +0000 Date: Sat, 06 Jun 2015 06:33:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: disable posted interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1201806609239825804==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1201806609239825804== Content-Length: 1538 Content-Transfer-Encoding: quoted-printable commit cf6b3ccf28faee01a078311fcfe671148c81ea75 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu May 28 10:56:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 10:56:08 2015 +0200 x86/pvh: disable posted interrupts Enabling posted interrupts requires the virtual interrupt delivery feature, which is disabled for PVH guests, so make sure posted interrupts are also disabled or else vmlaunch will fail. Signed-off-by: Roger Pau Monn=C3=A9 Reported-and-Tested-by: Lars Eggert Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 877ec10..3aff365 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -976,6 +976,10 @@ static int construct_vmcs(struct vcpu *v) | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); v->arch.hvm_vmx.exec_control &=3D ~CPU_BASED_TPR_SHADOW; + /* In turn, disable posted interrupts. */ + __vmwrite(PIN_BASED_VM_EXEC_CONTROL, + vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1201806609239825804== 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 --===============1201806609239825804==-- From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:33:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:33: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 1Z17fz-0004Xl-P6; Sat, 06 Jun 2015 06:33:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fy-0004XT-P1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:50 +0000 Content-Length: 1954 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 61/A6-18947-E4492755; Sat, 06 Jun 2015 06:33:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1433572428!20848598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15388 invoked from network); 6 Jun 2015 06:33:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:33:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17fw-0006Wf-7y for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17fw-00074Z-5p for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:48 +0000 Date: Sat, 06 Jun 2015 06:33:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: disable posted interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1201806609239825804==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1201806609239825804== Content-Length: 1538 Content-Transfer-Encoding: quoted-printable commit cf6b3ccf28faee01a078311fcfe671148c81ea75 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu May 28 10:56:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 10:56:08 2015 +0200 x86/pvh: disable posted interrupts Enabling posted interrupts requires the virtual interrupt delivery feature, which is disabled for PVH guests, so make sure posted interrupts are also disabled or else vmlaunch will fail. Signed-off-by: Roger Pau Monn=C3=A9 Reported-and-Tested-by: Lars Eggert Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 877ec10..3aff365 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -976,6 +976,10 @@ static int construct_vmcs(struct vcpu *v) | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); v->arch.hvm_vmx.exec_control &=3D ~CPU_BASED_TPR_SHADOW; + /* In turn, disable posted interrupts. */ + __vmwrite(PIN_BASED_VM_EXEC_CONTROL, + vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1201806609239825804== 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 --===============1201806609239825804==-- From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17g9-0004Zc-Rp; Sat, 06 Jun 2015 06:34:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17g9-0004ZQ-7c for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:01 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 2C/E4-29702-85492755; Sat, 06 Jun 2015 06:34:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1433572438!12229771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11409 invoked from network); 6 Jun 2015 06:33:59 -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; 6 Jun 2015 06:33:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17g6-0006Wo-EE for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17g6-000754-Cu for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:58 +0000 Date: Sat, 06 Jun 2015 06:33:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86, arm: remove asm/spinlock.h from all architectures" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 814ca12647f06b023f4aac8eae837ba9b417acc7 Author: Jan Beulich AuthorDate: Thu May 28 11:59:34 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 11:59:34 2015 +0200 Revert "x86,arm: remove asm/spinlock.h from all architectures" This reverts commit e62e49e6d5d4e8d22f3df0b75443ede65a812435 as its prerequisite 45fcc4568c is going to be reverted. --- xen/arch/arm/README.LinuxPrimitives | 28 ++++++++++++++ xen/include/asm-arm/arm32/spinlock.h | 66 ++++++++++++++++++++++++++++++++++ xen/include/asm-arm/arm64/spinlock.h | 63 ++++++++++++++++++++++++++++++++ xen/include/asm-arm/spinlock.h | 23 ++++++++++++ xen/include/asm-x86/spinlock.h | 37 +++++++++++++++++++ xen/include/xen/spinlock.h | 1 + 6 files changed, 218 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 3115f51..7f33fc7 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -25,6 +25,16 @@ linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- +spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) + +linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h + +Skipped: + 5686b06 arm64: lockref: add support for lockless lockrefs using cmpxchg + 52ea2a5 arm64: locks: introduce ticket-based spinlock implementation + +--------------------------------------------------------------------- + mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S @@ -93,6 +103,24 @@ linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h --------------------------------------------------------------------- +spinlocks: last sync: 15e7e5c1ebf5 + +linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h + +*** Linux has switched to ticket locks but we still use bitlocks. + +resync to v3.14-rc7: + + 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev + 0cbad9c ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64 + 9bb17be ARM: locks: prefetch the destination word for write prior to strex + 27a8479 ARM: smp_on_up: move inline asm ALT_SMP patching macro out of spinlock. + 00efaa0 ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lo + afa31d8 ARM: 7811/1: locks: use early clobber in arch_spin_trylock + 73a6fdc ARM: spinlock: use inner-shareable dsb variant prior to sev instruction + +--------------------------------------------------------------------- + mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h new file mode 100644 index 0000000..bc0343c --- /dev/null +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -0,0 +1,66 @@ +#ifndef __ASM_ARM32_SPINLOCK_H +#define __ASM_ARM32_SPINLOCK_H + +static inline void dsb_sev(void) +{ + __asm__ __volatile__ ( + "dsb\n" + "sev\n" + ); +} + +typedef struct { + volatile unsigned int lock; +} raw_spinlock_t; + +#define _RAW_SPIN_LOCK_UNLOCKED { 0 } + +#define _raw_spin_is_locked(x) ((x)->lock != 0) + +static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) +{ + ASSERT(_raw_spin_is_locked(lock)); + + smp_mb(); + + __asm__ __volatile__( +" str %1, [%0]\n" + : + : "r" (&lock->lock), "r" (0) + : "cc"); + + dsb_sev(); +} + +static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) +{ + unsigned long contended, res; + + do { + __asm__ __volatile__( + " ldrex %0, [%2]\n" + " teq %0, #0\n" + " strexeq %1, %3, [%2]\n" + " movne %1, #0\n" + : "=&r" (contended), "=r" (res) + : "r" (&lock->lock), "r" (1) + : "cc"); + } while (res); + + if (!contended) { + smp_mb(); + return 1; + } else { + return 0; + } +} + +#endif /* __ASM_SPINLOCK_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h new file mode 100644 index 0000000..5ae034d --- /dev/null +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -0,0 +1,63 @@ +/* + * Derived from Linux arch64 spinlock.h which is: + * Copyright (C) 2012 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __ASM_ARM64_SPINLOCK_H +#define __ASM_ARM64_SPINLOCK_H + +typedef struct { + volatile unsigned int lock; +} raw_spinlock_t; + +#define _RAW_SPIN_LOCK_UNLOCKED { 0 } + +#define _raw_spin_is_locked(x) ((x)->lock != 0) + +static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) +{ + ASSERT(_raw_spin_is_locked(lock)); + + asm volatile( + " stlr %w1, %0\n" + : "=Q" (lock->lock) : "r" (0) : "memory"); +} + +static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) +{ + unsigned int tmp; + + asm volatile( + "2: ldaxr %w0, %1\n" + " cbnz %w0, 1f\n" + " stxr %w0, %w2, %1\n" + " cbnz %w0, 2b\n" + "1:\n" + : "=&r" (tmp), "+Q" (lock->lock) + : "r" (1) + : "cc", "memory"); + + return !tmp; +} + +#endif /* __ASM_SPINLOCK_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h new file mode 100644 index 0000000..a064f73 --- /dev/null +++ b/xen/include/asm-arm/spinlock.h @@ -0,0 +1,23 @@ +#ifndef __ASM_SPINLOCK_H +#define __ASM_SPINLOCK_H + +#include +#include + +#if defined(CONFIG_ARM_32) +# include +#elif defined(CONFIG_ARM_64) +# include +#else +# error "unknown ARM variant" +#endif + +#endif /* __ASM_SPINLOCK_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h new file mode 100644 index 0000000..757e20b --- /dev/null +++ b/xen/include/asm-x86/spinlock.h @@ -0,0 +1,37 @@ +#ifndef __ASM_SPINLOCK_H +#define __ASM_SPINLOCK_H + +#include +#include +#include + +typedef struct { + volatile s16 lock; +} raw_spinlock_t; + +#define _RAW_SPIN_LOCK_UNLOCKED /*(raw_spinlock_t)*/ { 1 } + +#define _raw_spin_is_locked(x) ((x)->lock <= 0) + +static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) +{ + ASSERT(_raw_spin_is_locked(lock)); + asm volatile ( + "movw $1,%0" + : "=m" (lock->lock) : : "memory" ); +} + +static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) +{ + s16 oldval; + asm volatile ( + "xchgw %w0,%1" + :"=r" (oldval), "=m" (lock->lock) + :"0" ((s16)0) : "memory" ); + return (oldval > 0); +} + +#define _raw_read_unlock(l) \ + asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) + +#endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 9286543..fb0438e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,6 +2,7 @@ #define __SPINLOCK_H__ #include +#include #ifndef NDEBUG struct lock_debug { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17g9-0004Zc-Rp; Sat, 06 Jun 2015 06:34:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17g9-0004ZQ-7c for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:01 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 2C/E4-29702-85492755; Sat, 06 Jun 2015 06:34:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1433572438!12229771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11409 invoked from network); 6 Jun 2015 06:33:59 -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; 6 Jun 2015 06:33:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17g6-0006Wo-EE for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17g6-000754-Cu for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:33:58 +0000 Date: Sat, 06 Jun 2015 06:33:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86, arm: remove asm/spinlock.h from all architectures" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 814ca12647f06b023f4aac8eae837ba9b417acc7 Author: Jan Beulich AuthorDate: Thu May 28 11:59:34 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 11:59:34 2015 +0200 Revert "x86,arm: remove asm/spinlock.h from all architectures" This reverts commit e62e49e6d5d4e8d22f3df0b75443ede65a812435 as its prerequisite 45fcc4568c is going to be reverted. --- xen/arch/arm/README.LinuxPrimitives | 28 ++++++++++++++ xen/include/asm-arm/arm32/spinlock.h | 66 ++++++++++++++++++++++++++++++++++ xen/include/asm-arm/arm64/spinlock.h | 63 ++++++++++++++++++++++++++++++++ xen/include/asm-arm/spinlock.h | 23 ++++++++++++ xen/include/asm-x86/spinlock.h | 37 +++++++++++++++++++ xen/include/xen/spinlock.h | 1 + 6 files changed, 218 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 3115f51..7f33fc7 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -25,6 +25,16 @@ linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- +spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) + +linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h + +Skipped: + 5686b06 arm64: lockref: add support for lockless lockrefs using cmpxchg + 52ea2a5 arm64: locks: introduce ticket-based spinlock implementation + +--------------------------------------------------------------------- + mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S @@ -93,6 +103,24 @@ linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h --------------------------------------------------------------------- +spinlocks: last sync: 15e7e5c1ebf5 + +linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h + +*** Linux has switched to ticket locks but we still use bitlocks. + +resync to v3.14-rc7: + + 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev + 0cbad9c ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64 + 9bb17be ARM: locks: prefetch the destination word for write prior to strex + 27a8479 ARM: smp_on_up: move inline asm ALT_SMP patching macro out of spinlock. + 00efaa0 ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lo + afa31d8 ARM: 7811/1: locks: use early clobber in arch_spin_trylock + 73a6fdc ARM: spinlock: use inner-shareable dsb variant prior to sev instruction + +--------------------------------------------------------------------- + mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h new file mode 100644 index 0000000..bc0343c --- /dev/null +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -0,0 +1,66 @@ +#ifndef __ASM_ARM32_SPINLOCK_H +#define __ASM_ARM32_SPINLOCK_H + +static inline void dsb_sev(void) +{ + __asm__ __volatile__ ( + "dsb\n" + "sev\n" + ); +} + +typedef struct { + volatile unsigned int lock; +} raw_spinlock_t; + +#define _RAW_SPIN_LOCK_UNLOCKED { 0 } + +#define _raw_spin_is_locked(x) ((x)->lock != 0) + +static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) +{ + ASSERT(_raw_spin_is_locked(lock)); + + smp_mb(); + + __asm__ __volatile__( +" str %1, [%0]\n" + : + : "r" (&lock->lock), "r" (0) + : "cc"); + + dsb_sev(); +} + +static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) +{ + unsigned long contended, res; + + do { + __asm__ __volatile__( + " ldrex %0, [%2]\n" + " teq %0, #0\n" + " strexeq %1, %3, [%2]\n" + " movne %1, #0\n" + : "=&r" (contended), "=r" (res) + : "r" (&lock->lock), "r" (1) + : "cc"); + } while (res); + + if (!contended) { + smp_mb(); + return 1; + } else { + return 0; + } +} + +#endif /* __ASM_SPINLOCK_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h new file mode 100644 index 0000000..5ae034d --- /dev/null +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -0,0 +1,63 @@ +/* + * Derived from Linux arch64 spinlock.h which is: + * Copyright (C) 2012 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __ASM_ARM64_SPINLOCK_H +#define __ASM_ARM64_SPINLOCK_H + +typedef struct { + volatile unsigned int lock; +} raw_spinlock_t; + +#define _RAW_SPIN_LOCK_UNLOCKED { 0 } + +#define _raw_spin_is_locked(x) ((x)->lock != 0) + +static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) +{ + ASSERT(_raw_spin_is_locked(lock)); + + asm volatile( + " stlr %w1, %0\n" + : "=Q" (lock->lock) : "r" (0) : "memory"); +} + +static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) +{ + unsigned int tmp; + + asm volatile( + "2: ldaxr %w0, %1\n" + " cbnz %w0, 1f\n" + " stxr %w0, %w2, %1\n" + " cbnz %w0, 2b\n" + "1:\n" + : "=&r" (tmp), "+Q" (lock->lock) + : "r" (1) + : "cc", "memory"); + + return !tmp; +} + +#endif /* __ASM_SPINLOCK_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h new file mode 100644 index 0000000..a064f73 --- /dev/null +++ b/xen/include/asm-arm/spinlock.h @@ -0,0 +1,23 @@ +#ifndef __ASM_SPINLOCK_H +#define __ASM_SPINLOCK_H + +#include +#include + +#if defined(CONFIG_ARM_32) +# include +#elif defined(CONFIG_ARM_64) +# include +#else +# error "unknown ARM variant" +#endif + +#endif /* __ASM_SPINLOCK_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h new file mode 100644 index 0000000..757e20b --- /dev/null +++ b/xen/include/asm-x86/spinlock.h @@ -0,0 +1,37 @@ +#ifndef __ASM_SPINLOCK_H +#define __ASM_SPINLOCK_H + +#include +#include +#include + +typedef struct { + volatile s16 lock; +} raw_spinlock_t; + +#define _RAW_SPIN_LOCK_UNLOCKED /*(raw_spinlock_t)*/ { 1 } + +#define _raw_spin_is_locked(x) ((x)->lock <= 0) + +static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) +{ + ASSERT(_raw_spin_is_locked(lock)); + asm volatile ( + "movw $1,%0" + : "=m" (lock->lock) : : "memory" ); +} + +static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) +{ + s16 oldval; + asm volatile ( + "xchgw %w0,%1" + :"=r" (oldval), "=m" (lock->lock) + :"0" ((s16)0) : "memory" ); + return (oldval > 0); +} + +#define _raw_read_unlock(l) \ + asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) + +#endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 9286543..fb0438e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,6 +2,7 @@ #define __SPINLOCK_H__ #include +#include #ifndef NDEBUG struct lock_debug { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gM-0004bF-2j; Sat, 06 Jun 2015 06:34:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gL-0004b1-4i for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:13 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 42/05-29702-26492755; Sat, 06 Jun 2015 06:34:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1433572448!12258418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26351 invoked from network); 6 Jun 2015 06:34:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:34:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gG-0006XM-Mf for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gG-00075j-Id for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:08 +0000 Date: Sat, 06 Jun 2015 06:34:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "spinlock: fix build with older GCC" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 02cdd81aa0a88007addc788c6cf93e2f1cb1a314 Author: Jan Beulich AuthorDate: Thu May 28 12:06:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:06:47 2015 +0200 Revert "spinlock: fix build with older GCC" This reverts commit 1037e33c88bb0e1fe530c164f242df17030102e1 as its prereq commit 45fcc4568c is about to be reverted. --- xen/common/spinlock.c | 2 +- xen/include/xen/spinlock.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 29149d1..c8dc8ba 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -132,7 +132,7 @@ static always_inline u16 observe_head(spinlock_tickets_t *t) void _spin_lock(spinlock_t *lock) { - spinlock_tickets_t tickets = SPINLOCK_TICKET_INC; + spinlock_tickets_t tickets = { .tail = 1, }; LOCK_PROFILE_VAR; check_lock(&lock->debug); diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index fb0438e..bafbc74 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -133,8 +133,6 @@ typedef union { }; } spinlock_tickets_t; -#define SPINLOCK_TICKET_INC { .head_tail = 0x10000, } - typedef struct spinlock { spinlock_tickets_t tickets; u16 recurse_cpu:12; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gM-0004bF-2j; Sat, 06 Jun 2015 06:34:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gL-0004b1-4i for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:13 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 42/05-29702-26492755; Sat, 06 Jun 2015 06:34:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1433572448!12258418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26351 invoked from network); 6 Jun 2015 06:34:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:34:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gG-0006XM-Mf for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gG-00075j-Id for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:08 +0000 Date: Sat, 06 Jun 2015 06:34:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "spinlock: fix build with older GCC" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 02cdd81aa0a88007addc788c6cf93e2f1cb1a314 Author: Jan Beulich AuthorDate: Thu May 28 12:06:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:06:47 2015 +0200 Revert "spinlock: fix build with older GCC" This reverts commit 1037e33c88bb0e1fe530c164f242df17030102e1 as its prereq commit 45fcc4568c is about to be reverted. --- xen/common/spinlock.c | 2 +- xen/include/xen/spinlock.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 29149d1..c8dc8ba 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -132,7 +132,7 @@ static always_inline u16 observe_head(spinlock_tickets_t *t) void _spin_lock(spinlock_t *lock) { - spinlock_tickets_t tickets = SPINLOCK_TICKET_INC; + spinlock_tickets_t tickets = { .tail = 1, }; LOCK_PROFILE_VAR; check_lock(&lock->debug); diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index fb0438e..bafbc74 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -133,8 +133,6 @@ typedef union { }; } spinlock_tickets_t; -#define SPINLOCK_TICKET_INC { .head_tail = 0x10000, } - typedef struct spinlock { spinlock_tickets_t tickets; u16 recurse_cpu:12; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gV-0004cl-5A; Sat, 06 Jun 2015 06:34:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gT-0004cQ-IG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:21 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id FA/FB-16813-C6492755; Sat, 06 Jun 2015 06:34:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1433572459!20777203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20757 invoked from network); 6 Jun 2015 06:34:19 -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; 6 Jun 2015 06:34:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gQ-0006XS-Sm for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gQ-00076N-R6 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:18 +0000 Date: Sat, 06 Jun 2015 06:34:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "use ticket locks for spin locks" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 818e376d3b17845d39735517650224c64c9e0078 Author: Jan Beulich AuthorDate: Thu May 28 12:07:33 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:07:33 2015 +0200 Revert "use ticket locks for spin locks" This reverts commit 45fcc4568c5162b00fb3907fb158af82dd484a3d as it introduces yet to be explained issues on ARM. --- xen/common/spinlock.c | 116 ++++++++++++++++++------------------------ xen/include/asm-arm/system.h | 3 - xen/include/asm-x86/system.h | 11 ---- xen/include/xen/spinlock.h | 16 ++---- 4 files changed, 54 insertions(+), 92 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index c8dc8ba..5fd8b1c 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -115,134 +115,125 @@ void spin_debug_disable(void) #endif -static always_inline spinlock_tickets_t observe_lock(spinlock_tickets_t *t) -{ - spinlock_tickets_t v; - - smp_rmb(); - v.head_tail = read_atomic(&t->head_tail); - return v; -} - -static always_inline u16 observe_head(spinlock_tickets_t *t) -{ - smp_rmb(); - return read_atomic(&t->head); -} - void _spin_lock(spinlock_t *lock) { - spinlock_tickets_t tickets = { .tail = 1, }; LOCK_PROFILE_VAR; check_lock(&lock->debug); - tickets.head_tail = arch_fetch_and_add(&lock->tickets.head_tail, - tickets.head_tail); - while ( tickets.tail != observe_head(&lock->tickets) ) + while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) { LOCK_PROFILE_BLOCK; - cpu_relax(); + while ( likely(_raw_spin_is_locked(&lock->raw)) ) + cpu_relax(); } LOCK_PROFILE_GOT; preempt_disable(); - arch_lock_acquire_barrier(); } void _spin_lock_irq(spinlock_t *lock) { + LOCK_PROFILE_VAR; + ASSERT(local_irq_is_enabled()); local_irq_disable(); - _spin_lock(lock); + check_lock(&lock->debug); + while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + { + LOCK_PROFILE_BLOCK; + local_irq_enable(); + while ( likely(_raw_spin_is_locked(&lock->raw)) ) + cpu_relax(); + local_irq_disable(); + } + LOCK_PROFILE_GOT; + preempt_disable(); } unsigned long _spin_lock_irqsave(spinlock_t *lock) { unsigned long flags; + LOCK_PROFILE_VAR; local_irq_save(flags); - _spin_lock(lock); + check_lock(&lock->debug); + while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + { + LOCK_PROFILE_BLOCK; + local_irq_restore(flags); + while ( likely(_raw_spin_is_locked(&lock->raw)) ) + cpu_relax(); + local_irq_disable(); + } + LOCK_PROFILE_GOT; + preempt_disable(); return flags; } void _spin_unlock(spinlock_t *lock) { - arch_lock_release_barrier(); preempt_enable(); LOCK_PROFILE_REL; - add_sized(&lock->tickets.head, 1); + _raw_spin_unlock(&lock->raw); } void _spin_unlock_irq(spinlock_t *lock) { - _spin_unlock(lock); + preempt_enable(); + LOCK_PROFILE_REL; + _raw_spin_unlock(&lock->raw); local_irq_enable(); } void _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) { - _spin_unlock(lock); + preempt_enable(); + LOCK_PROFILE_REL; + _raw_spin_unlock(&lock->raw); local_irq_restore(flags); } int _spin_is_locked(spinlock_t *lock) { check_lock(&lock->debug); - return lock->tickets.head != lock->tickets.tail; + return _raw_spin_is_locked(&lock->raw); } int _spin_trylock(spinlock_t *lock) { - spinlock_tickets_t old, new; - check_lock(&lock->debug); - old = observe_lock(&lock->tickets); - if ( old.head != old.tail ) - return 0; - new = old; - new.tail++; - if ( cmpxchg(&lock->tickets.head_tail, - old.head_tail, new.head_tail) != old.head_tail ) + if ( !_raw_spin_trylock(&lock->raw) ) return 0; #ifdef LOCK_PROFILE if (lock->profile) lock->profile->time_locked = NOW(); #endif preempt_disable(); - /* - * cmpxchg() is a full barrier so no need for an - * arch_lock_acquire_barrier(). - */ return 1; } void _spin_barrier(spinlock_t *lock) { - spinlock_tickets_t sample; #ifdef LOCK_PROFILE s_time_t block = NOW(); -#endif + u64 loop = 0; check_barrier(&lock->debug); - smp_mb(); - sample = observe_lock(&lock->tickets); - if ( sample.head != sample.tail ) + do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); + if ((loop > 1) && lock->profile) { - while ( observe_head(&lock->tickets) == sample.head ) - cpu_relax(); -#ifdef LOCK_PROFILE - if ( lock->profile ) - { - lock->profile->time_block += NOW() - block; - lock->profile->block_cnt++; - } -#endif + lock->profile->time_block += NOW() - block; + lock->profile->block_cnt++; } +#else + check_barrier(&lock->debug); + do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); +#endif smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) { - unsigned int cpu = smp_processor_id(); + int cpu = smp_processor_id(); /* Don't allow overflow of recurse_cpu field. */ BUILD_BUG_ON(NR_CPUS > 0xfffu); @@ -265,17 +256,8 @@ int _spin_trylock_recursive(spinlock_t *lock) void _spin_lock_recursive(spinlock_t *lock) { - unsigned int cpu = smp_processor_id(); - - if ( likely(lock->recurse_cpu != cpu) ) - { - _spin_lock(lock); - lock->recurse_cpu = cpu; - } - - /* We support only fairly shallow recursion, else the counter overflows. */ - ASSERT(lock->recurse_cnt < 0xfu); - lock->recurse_cnt++; + while ( !spin_trylock_recursive(lock) ) + cpu_relax(); } void _spin_unlock_recursive(spinlock_t *lock) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index f0e222f..2eb96e8 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,9 +53,6 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) -#define arch_lock_acquire_barrier() smp_mb() -#define arch_lock_release_barrier() smp_mb() - extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 25a6a2a..9fb70f5 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,17 +185,6 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) -/* - * On x86 the only reordering is of reads with older writes. In the - * lock case, the read in observe_head() can only be reordered with - * writes that precede it, and moving a write _into_ a locked section - * is OK. In the release case, the write in add_sized() can only be - * reordered with reads that follow it, and hoisting a read _into_ a - * locked region is OK. - */ -#define arch_lock_acquire_barrier() barrier() -#define arch_lock_release_barrier() barrier() - #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index bafbc74..eda9b2e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -80,7 +80,8 @@ struct lock_profile_qhead { static struct lock_profile *__lock_profile_##name \ __used_section(".lockprofile.data") = \ &__lock_profile_data_##name -#define _SPIN_LOCK_UNLOCKED(x) { { 0 }, 0xfffu, 0, _LOCK_DEBUG, x } +#define _SPIN_LOCK_UNLOCKED(x) { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, \ + _LOCK_DEBUG, x } #define SPIN_LOCK_UNLOCKED _SPIN_LOCK_UNLOCKED(NULL) #define DEFINE_SPINLOCK(l) \ spinlock_t l = _SPIN_LOCK_UNLOCKED(NULL); \ @@ -116,7 +117,8 @@ extern void spinlock_profile_reset(unsigned char key); struct lock_profile_qhead { }; -#define SPIN_LOCK_UNLOCKED { { 0 }, 0xfffu, 0, _LOCK_DEBUG } +#define SPIN_LOCK_UNLOCKED \ + { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, _LOCK_DEBUG } #define DEFINE_SPINLOCK(l) spinlock_t l = SPIN_LOCK_UNLOCKED #define spin_lock_init_prof(s, l) spin_lock_init(&((s)->l)) @@ -125,16 +127,8 @@ struct lock_profile_qhead { }; #endif -typedef union { - u32 head_tail; - struct { - u16 head; - u16 tail; - }; -} spinlock_tickets_t; - typedef struct spinlock { - spinlock_tickets_t tickets; + raw_spinlock_t raw; u16 recurse_cpu:12; u16 recurse_cnt:4; struct lock_debug debug; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gV-0004cl-5A; Sat, 06 Jun 2015 06:34:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gT-0004cQ-IG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:21 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id FA/FB-16813-C6492755; Sat, 06 Jun 2015 06:34:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1433572459!20777203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20757 invoked from network); 6 Jun 2015 06:34:19 -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; 6 Jun 2015 06:34:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gQ-0006XS-Sm for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gQ-00076N-R6 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:18 +0000 Date: Sat, 06 Jun 2015 06:34:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "use ticket locks for spin locks" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 818e376d3b17845d39735517650224c64c9e0078 Author: Jan Beulich AuthorDate: Thu May 28 12:07:33 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:07:33 2015 +0200 Revert "use ticket locks for spin locks" This reverts commit 45fcc4568c5162b00fb3907fb158af82dd484a3d as it introduces yet to be explained issues on ARM. --- xen/common/spinlock.c | 116 ++++++++++++++++++------------------------ xen/include/asm-arm/system.h | 3 - xen/include/asm-x86/system.h | 11 ---- xen/include/xen/spinlock.h | 16 ++---- 4 files changed, 54 insertions(+), 92 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index c8dc8ba..5fd8b1c 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -115,134 +115,125 @@ void spin_debug_disable(void) #endif -static always_inline spinlock_tickets_t observe_lock(spinlock_tickets_t *t) -{ - spinlock_tickets_t v; - - smp_rmb(); - v.head_tail = read_atomic(&t->head_tail); - return v; -} - -static always_inline u16 observe_head(spinlock_tickets_t *t) -{ - smp_rmb(); - return read_atomic(&t->head); -} - void _spin_lock(spinlock_t *lock) { - spinlock_tickets_t tickets = { .tail = 1, }; LOCK_PROFILE_VAR; check_lock(&lock->debug); - tickets.head_tail = arch_fetch_and_add(&lock->tickets.head_tail, - tickets.head_tail); - while ( tickets.tail != observe_head(&lock->tickets) ) + while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) { LOCK_PROFILE_BLOCK; - cpu_relax(); + while ( likely(_raw_spin_is_locked(&lock->raw)) ) + cpu_relax(); } LOCK_PROFILE_GOT; preempt_disable(); - arch_lock_acquire_barrier(); } void _spin_lock_irq(spinlock_t *lock) { + LOCK_PROFILE_VAR; + ASSERT(local_irq_is_enabled()); local_irq_disable(); - _spin_lock(lock); + check_lock(&lock->debug); + while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + { + LOCK_PROFILE_BLOCK; + local_irq_enable(); + while ( likely(_raw_spin_is_locked(&lock->raw)) ) + cpu_relax(); + local_irq_disable(); + } + LOCK_PROFILE_GOT; + preempt_disable(); } unsigned long _spin_lock_irqsave(spinlock_t *lock) { unsigned long flags; + LOCK_PROFILE_VAR; local_irq_save(flags); - _spin_lock(lock); + check_lock(&lock->debug); + while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + { + LOCK_PROFILE_BLOCK; + local_irq_restore(flags); + while ( likely(_raw_spin_is_locked(&lock->raw)) ) + cpu_relax(); + local_irq_disable(); + } + LOCK_PROFILE_GOT; + preempt_disable(); return flags; } void _spin_unlock(spinlock_t *lock) { - arch_lock_release_barrier(); preempt_enable(); LOCK_PROFILE_REL; - add_sized(&lock->tickets.head, 1); + _raw_spin_unlock(&lock->raw); } void _spin_unlock_irq(spinlock_t *lock) { - _spin_unlock(lock); + preempt_enable(); + LOCK_PROFILE_REL; + _raw_spin_unlock(&lock->raw); local_irq_enable(); } void _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) { - _spin_unlock(lock); + preempt_enable(); + LOCK_PROFILE_REL; + _raw_spin_unlock(&lock->raw); local_irq_restore(flags); } int _spin_is_locked(spinlock_t *lock) { check_lock(&lock->debug); - return lock->tickets.head != lock->tickets.tail; + return _raw_spin_is_locked(&lock->raw); } int _spin_trylock(spinlock_t *lock) { - spinlock_tickets_t old, new; - check_lock(&lock->debug); - old = observe_lock(&lock->tickets); - if ( old.head != old.tail ) - return 0; - new = old; - new.tail++; - if ( cmpxchg(&lock->tickets.head_tail, - old.head_tail, new.head_tail) != old.head_tail ) + if ( !_raw_spin_trylock(&lock->raw) ) return 0; #ifdef LOCK_PROFILE if (lock->profile) lock->profile->time_locked = NOW(); #endif preempt_disable(); - /* - * cmpxchg() is a full barrier so no need for an - * arch_lock_acquire_barrier(). - */ return 1; } void _spin_barrier(spinlock_t *lock) { - spinlock_tickets_t sample; #ifdef LOCK_PROFILE s_time_t block = NOW(); -#endif + u64 loop = 0; check_barrier(&lock->debug); - smp_mb(); - sample = observe_lock(&lock->tickets); - if ( sample.head != sample.tail ) + do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); + if ((loop > 1) && lock->profile) { - while ( observe_head(&lock->tickets) == sample.head ) - cpu_relax(); -#ifdef LOCK_PROFILE - if ( lock->profile ) - { - lock->profile->time_block += NOW() - block; - lock->profile->block_cnt++; - } -#endif + lock->profile->time_block += NOW() - block; + lock->profile->block_cnt++; } +#else + check_barrier(&lock->debug); + do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); +#endif smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) { - unsigned int cpu = smp_processor_id(); + int cpu = smp_processor_id(); /* Don't allow overflow of recurse_cpu field. */ BUILD_BUG_ON(NR_CPUS > 0xfffu); @@ -265,17 +256,8 @@ int _spin_trylock_recursive(spinlock_t *lock) void _spin_lock_recursive(spinlock_t *lock) { - unsigned int cpu = smp_processor_id(); - - if ( likely(lock->recurse_cpu != cpu) ) - { - _spin_lock(lock); - lock->recurse_cpu = cpu; - } - - /* We support only fairly shallow recursion, else the counter overflows. */ - ASSERT(lock->recurse_cnt < 0xfu); - lock->recurse_cnt++; + while ( !spin_trylock_recursive(lock) ) + cpu_relax(); } void _spin_unlock_recursive(spinlock_t *lock) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index f0e222f..2eb96e8 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,9 +53,6 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) -#define arch_lock_acquire_barrier() smp_mb() -#define arch_lock_release_barrier() smp_mb() - extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 25a6a2a..9fb70f5 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,17 +185,6 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) -/* - * On x86 the only reordering is of reads with older writes. In the - * lock case, the read in observe_head() can only be reordered with - * writes that precede it, and moving a write _into_ a locked section - * is OK. In the release case, the write in add_sized() can only be - * reordered with reads that follow it, and hoisting a read _into_ a - * locked region is OK. - */ -#define arch_lock_acquire_barrier() barrier() -#define arch_lock_release_barrier() barrier() - #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index bafbc74..eda9b2e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -80,7 +80,8 @@ struct lock_profile_qhead { static struct lock_profile *__lock_profile_##name \ __used_section(".lockprofile.data") = \ &__lock_profile_data_##name -#define _SPIN_LOCK_UNLOCKED(x) { { 0 }, 0xfffu, 0, _LOCK_DEBUG, x } +#define _SPIN_LOCK_UNLOCKED(x) { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, \ + _LOCK_DEBUG, x } #define SPIN_LOCK_UNLOCKED _SPIN_LOCK_UNLOCKED(NULL) #define DEFINE_SPINLOCK(l) \ spinlock_t l = _SPIN_LOCK_UNLOCKED(NULL); \ @@ -116,7 +117,8 @@ extern void spinlock_profile_reset(unsigned char key); struct lock_profile_qhead { }; -#define SPIN_LOCK_UNLOCKED { { 0 }, 0xfffu, 0, _LOCK_DEBUG } +#define SPIN_LOCK_UNLOCKED \ + { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, _LOCK_DEBUG } #define DEFINE_SPINLOCK(l) spinlock_t l = SPIN_LOCK_UNLOCKED #define spin_lock_init_prof(s, l) spin_lock_init(&((s)->l)) @@ -125,16 +127,8 @@ struct lock_profile_qhead { }; #endif -typedef union { - u32 head_tail; - struct { - u16 head; - u16 tail; - }; -} spinlock_tickets_t; - typedef struct spinlock { - spinlock_tickets_t tickets; + raw_spinlock_t raw; u16 recurse_cpu:12; u16 recurse_cnt:4; struct lock_debug debug; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gf-0004eF-7m; Sat, 06 Jun 2015 06:34:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gd-0004dw-Kt for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:31 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 77/FA-30151-67492755; Sat, 06 Jun 2015 06:34:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433572469!20842879!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19956 invoked from network); 6 Jun 2015 06:34:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:34:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gb-0006Xa-2Y for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17ga-00077U-W3 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:29 +0000 Date: Sat, 06 Jun 2015 06:34:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47ec25a3c8cdd7a057af0a05e8e00257ef950437 Merge: 088e9b2796bd1f9ebe4fda800275cc689677b699 818e376d3b17845d39735517650224c64c9e0078 Author: Ian Campbell AuthorDate: Fri May 29 13:22:31 2015 +0100 Commit: Ian Campbell CommitDate: Fri May 29 13:22:31 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging Config.mk | 6 +- xen/arch/arm/README.LinuxPrimitives | 28 ++++++++ xen/arch/x86/hvm/vmx/vmcs.c | 4 + xen/common/spinlock.c | 116 ++++++++++++++------------------- xen/include/asm-arm/arm32/spinlock.h | 66 +++++++++++++++++++ xen/include/asm-arm/arm64/spinlock.h | 63 ++++++++++++++++++ xen/include/asm-arm/spinlock.h | 23 +++++++ xen/include/asm-arm/system.h | 3 - xen/include/asm-x86/spinlock.h | 37 +++++++++++ xen/include/asm-x86/system.h | 11 --- xen/include/public/domctl.h | 2 +- xen/include/xen/spinlock.h | 19 ++---- 12 files changed, 280 insertions(+), 98 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gf-0004eF-7m; Sat, 06 Jun 2015 06:34:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gd-0004dw-Kt for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:31 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 77/FA-30151-67492755; Sat, 06 Jun 2015 06:34:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433572469!20842879!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19956 invoked from network); 6 Jun 2015 06:34:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:34:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gb-0006Xa-2Y for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17ga-00077U-W3 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:29 +0000 Date: Sat, 06 Jun 2015 06:34:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47ec25a3c8cdd7a057af0a05e8e00257ef950437 Merge: 088e9b2796bd1f9ebe4fda800275cc689677b699 818e376d3b17845d39735517650224c64c9e0078 Author: Ian Campbell AuthorDate: Fri May 29 13:22:31 2015 +0100 Commit: Ian Campbell CommitDate: Fri May 29 13:22:31 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging Config.mk | 6 +- xen/arch/arm/README.LinuxPrimitives | 28 ++++++++ xen/arch/x86/hvm/vmx/vmcs.c | 4 + xen/common/spinlock.c | 116 ++++++++++++++------------------- xen/include/asm-arm/arm32/spinlock.h | 66 +++++++++++++++++++ xen/include/asm-arm/arm64/spinlock.h | 63 ++++++++++++++++++ xen/include/asm-arm/spinlock.h | 23 +++++++ xen/include/asm-arm/system.h | 3 - xen/include/asm-x86/spinlock.h | 37 +++++++++++ xen/include/asm-x86/system.h | 11 --- xen/include/public/domctl.h | 2 +- xen/include/xen/spinlock.h | 19 ++---- 12 files changed, 280 insertions(+), 98 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gp-0004g2-CY; Sat, 06 Jun 2015 06:34:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gn-0004fr-TW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:42 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id C6/8A-29123-18492755; Sat, 06 Jun 2015 06:34:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1433572479!20875657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21958 invoked from network); 6 Jun 2015 06:34:40 -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; 6 Jun 2015 06:34:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gl-0006Xg-7i for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gl-00078C-6m for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:39 +0000 Date: Sat, 06 Jun 2015 06:34:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't crash when mapping a page using EFI runtime 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 591e1e357c29589e9d6121d8faadc4f4d3b9013e Author: Ross Lagerwall AuthorDate: Mon Jun 1 11:59:14 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 1 11:59:14 2015 +0200 x86: don't crash when mapping a page using EFI runtime page tables When an interrupt is received during an EFI runtime service call, Xen may call map_domain_page() while using the EFI runtime page tables. This fails because, although the EFI runtime page tables are a copy of the idle domain's page tables, current points at a different domain's vCPU. To fix this, return NULL from mapcache_current_vcpu() when using the EFI runtime page tables which is treated equivalently to running in an idle vCPU. This issue can be reproduced by repeatedly calling GetVariable() from dom0 while using VT-d, since VT-d frequently maps a page from interrupt context. Example call trace: [] __find_next_zero_bit+0x28/0x60 [] map_domain_page+0x4c6/0x4eb [] map_vtd_domain_page+0xd/0xf [] msi_msg_read_remap_rte+0xe3/0x1d8 [] iommu_read_msi_from_ire+0x31/0x34 [] set_msi_affinity+0x134/0x17a [] move_masked_irq+0x5c/0x98 [] move_native_irq+0x25/0x36 [] ack_nonmaskable_msi_irq+0x19/0x20 [] ack_maskable_msi_irq+0x9/0x37 [] do_IRQ+0x251/0x635 [] common_interrupt+0x62/0x70 [<00000000df7ed2be>] 00000000df7ed2be Signed-off-by: Ross Lagerwall --- xen/arch/x86/domain_page.c | 13 +++++++++---- xen/arch/x86/efi/stub.c | 2 +- xen/common/efi/runtime.c | 10 ++++++++-- xen/include/xen/efi.h | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 5f6f397..7954998 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -32,20 +32,25 @@ static inline struct vcpu *mapcache_current_vcpu(void) return NULL; /* + * When using efi runtime page tables, we have the equivalent of the idle + * domain's page tables but current may point at another domain's VCPU. + * Return NULL as though current is not properly set up yet. + */ + if ( efi_enabled && efi_rs_using_pgtables() ) + return NULL; + + /* * If guest_table is NULL, and we are running a paravirtualised guest, * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { - unsigned long cr3; - /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || - (efi_enabled && cr3 == efi_rs_page_table())); + ASSERT(read_cr3() == __pa(idle_pg_table)); } return v; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 627009f..07c2bd0 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -12,7 +12,7 @@ void __init efi_init_memory(void) { } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { BUG(); return 0; diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 5ed8b01..ae87557 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -30,6 +30,7 @@ const CHAR16 *__read_mostly efi_fw_vendor; const EFI_RUNTIME_SERVICES *__read_mostly efi_rs; #ifndef CONFIG_ARM /* TODO - disabled until implemented on ARM */ static DEFINE_SPINLOCK(efi_rs_lock); +static unsigned int efi_rs_on_cpu = NR_CPUS; #endif UINTN __read_mostly efi_memmap_size; @@ -66,6 +67,8 @@ unsigned long efi_rs_enter(void) spin_lock(&efi_rs_lock); + efi_rs_on_cpu = smp_processor_id(); + /* prevent fixup_page_fault() from doing anything */ irq_enter(); @@ -100,13 +103,16 @@ void efi_rs_leave(unsigned long cr3) asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } irq_exit(); + efi_rs_on_cpu = NR_CPUS; spin_unlock(&efi_rs_lock); stts(); } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { - return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; + return efi_l4_pgtable && + (smp_processor_id() == efi_rs_on_cpu) && + (read_cr3() == virt_to_maddr(efi_l4_pgtable)); } unsigned long efi_get_time(void) diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 48de8e0..e74dad1 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -29,7 +29,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); -paddr_t efi_rs_page_table(void); +bool_t efi_rs_using_pgtables(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gp-0004g2-CY; Sat, 06 Jun 2015 06:34:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gn-0004fr-TW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:42 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id C6/8A-29123-18492755; Sat, 06 Jun 2015 06:34:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1433572479!20875657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21958 invoked from network); 6 Jun 2015 06:34:40 -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; 6 Jun 2015 06:34:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gl-0006Xg-7i for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gl-00078C-6m for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:39 +0000 Date: Sat, 06 Jun 2015 06:34:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't crash when mapping a page using EFI runtime 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 591e1e357c29589e9d6121d8faadc4f4d3b9013e Author: Ross Lagerwall AuthorDate: Mon Jun 1 11:59:14 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 1 11:59:14 2015 +0200 x86: don't crash when mapping a page using EFI runtime page tables When an interrupt is received during an EFI runtime service call, Xen may call map_domain_page() while using the EFI runtime page tables. This fails because, although the EFI runtime page tables are a copy of the idle domain's page tables, current points at a different domain's vCPU. To fix this, return NULL from mapcache_current_vcpu() when using the EFI runtime page tables which is treated equivalently to running in an idle vCPU. This issue can be reproduced by repeatedly calling GetVariable() from dom0 while using VT-d, since VT-d frequently maps a page from interrupt context. Example call trace: [] __find_next_zero_bit+0x28/0x60 [] map_domain_page+0x4c6/0x4eb [] map_vtd_domain_page+0xd/0xf [] msi_msg_read_remap_rte+0xe3/0x1d8 [] iommu_read_msi_from_ire+0x31/0x34 [] set_msi_affinity+0x134/0x17a [] move_masked_irq+0x5c/0x98 [] move_native_irq+0x25/0x36 [] ack_nonmaskable_msi_irq+0x19/0x20 [] ack_maskable_msi_irq+0x9/0x37 [] do_IRQ+0x251/0x635 [] common_interrupt+0x62/0x70 [<00000000df7ed2be>] 00000000df7ed2be Signed-off-by: Ross Lagerwall --- xen/arch/x86/domain_page.c | 13 +++++++++---- xen/arch/x86/efi/stub.c | 2 +- xen/common/efi/runtime.c | 10 ++++++++-- xen/include/xen/efi.h | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 5f6f397..7954998 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -32,20 +32,25 @@ static inline struct vcpu *mapcache_current_vcpu(void) return NULL; /* + * When using efi runtime page tables, we have the equivalent of the idle + * domain's page tables but current may point at another domain's VCPU. + * Return NULL as though current is not properly set up yet. + */ + if ( efi_enabled && efi_rs_using_pgtables() ) + return NULL; + + /* * If guest_table is NULL, and we are running a paravirtualised guest, * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { - unsigned long cr3; - /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || - (efi_enabled && cr3 == efi_rs_page_table())); + ASSERT(read_cr3() == __pa(idle_pg_table)); } return v; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 627009f..07c2bd0 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -12,7 +12,7 @@ void __init efi_init_memory(void) { } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { BUG(); return 0; diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 5ed8b01..ae87557 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -30,6 +30,7 @@ const CHAR16 *__read_mostly efi_fw_vendor; const EFI_RUNTIME_SERVICES *__read_mostly efi_rs; #ifndef CONFIG_ARM /* TODO - disabled until implemented on ARM */ static DEFINE_SPINLOCK(efi_rs_lock); +static unsigned int efi_rs_on_cpu = NR_CPUS; #endif UINTN __read_mostly efi_memmap_size; @@ -66,6 +67,8 @@ unsigned long efi_rs_enter(void) spin_lock(&efi_rs_lock); + efi_rs_on_cpu = smp_processor_id(); + /* prevent fixup_page_fault() from doing anything */ irq_enter(); @@ -100,13 +103,16 @@ void efi_rs_leave(unsigned long cr3) asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } irq_exit(); + efi_rs_on_cpu = NR_CPUS; spin_unlock(&efi_rs_lock); stts(); } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { - return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; + return efi_l4_pgtable && + (smp_processor_id() == efi_rs_on_cpu) && + (read_cr3() == virt_to_maddr(efi_l4_pgtable)); } unsigned long efi_get_time(void) diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 48de8e0..e74dad1 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -29,7 +29,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); -paddr_t efi_rs_page_table(void); +bool_t efi_rs_using_pgtables(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:34:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gz-0004hW-F2; Sat, 06 Jun 2015 06:34:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gx-0004hF-Ok for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:51 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 84/41-01068-B8492755; Sat, 06 Jun 2015 06:34:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1433572489!13694727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22364 invoked from network); 6 Jun 2015 06:34:50 -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; 6 Jun 2015 06:34:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gv-0006Xm-CW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gv-00078v-An for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:49 +0000 Date: Sat, 06 Jun 2015 06:34:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: clarification to terms used in hypervisor memory management X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e758ed14f390342513405dd766e874934573e6cb Author: Andrew Cooper AuthorDate: Mon Jun 1 12:00:18 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 1 12:00:18 2015 +0200 docs: clarification to terms used in hypervisor memory management Memory management is hard[citation needed]. Furthermore, it isn't helped by the inconsistent use of terms through the code, or that some terms have changed meaning over time. Describe the currently-used terms in a more practical fashon, so new code has a concrete reference. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/include/xen/mm.h | 59 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 21 deletions(-) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index a066363..a7563cd 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -1,28 +1,45 @@ /****************************************************************************** * include/xen/mm.h - * + * * Definitions for memory pages, frame numbers, addresses, allocations, etc. - * - * Note that Xen must handle several different physical 'address spaces' and - * there is a consistent terminology for these: - * - * 1. gpfn/gpaddr: A guest-specific pseudo-physical frame number or address. - * 2. gmfn/gmaddr: A machine address from the p.o.v. of a particular guest. - * 3. mfn/maddr: A real machine frame number or address. - * 4. pfn/paddr: Used in 'polymorphic' functions that work across all - * address spaces, depending on context. See the pagetable - * conversion macros in asm-x86/page.h for examples. - * Also 'paddr_t' is big enough to store any physical address. - * - * This scheme provides consistent function and variable names even when - * different guests are running in different memory-management modes. - * 1. A guest running in auto-translated mode (e.g., shadow_mode_translate()) - * will have gpfn == gmfn and gmfn != mfn. - * 2. A paravirtualised x86 guest will have gpfn != gmfn and gmfn == mfn. - * 3. A paravirtualised guest with no pseudophysical overlay will have - * gpfn == gpmfn == mfn. - * + * * Copyright (c) 2002-2006, K A Fraser + * + * +---------------------+ + * Xen Memory Management + * +---------------------+ + * + * Xen has to handle many different address spaces. It is important not to + * get these spaces mixed up. The following is a consistent terminology which + * should be adhered to. + * + * mfn: Machine Frame Number + * The values Xen puts into its own pagetables. This is the host physical + * memory address space with RAM, MMIO etc. + * + * gfn: Guest Frame Number + * The values a guest puts in its own pagetables. For an auto-translated + * guest (hardware assisted with 2nd stage translation, or shadowed), gfn != + * mfn. For a non-translated guest which is aware of Xen, gfn == mfn. + * + * pfn: Pseudophysical Frame Number + * A linear idea of a guest physical address space. For an auto-translated + * guest, pfn == gfn while for a non-translated guest, pfn != gfn. + * + * WARNING: Some of these terms have changed over time while others have been + * used inconsistently, meaning that a lot of existing code does not match the + * definitions above. New code should use these terms as described here, and + * over time older code should be corrected to be consistent. + * + * An incomplete list of larger work area: + * - Phase out the use of 'pfn' from the x86 pagetable code. Callers should + * know explicitly whether they are talking about mfns or gfns. + * - Phase out the use of 'pfn' from the ARM mm code. A cursory glance + * suggests that 'mfn' and 'pfn' are currently used interchangeably, where + * 'mfn' is the appropriate term to use. + * - Phase out the use of gpfn/gmfn where pfn/mfn are meant. This excludes + * the x86 shadow code, which uses gmfn/smfn pairs with different, + * documented, meanings. */ #ifndef __XEN_MM_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 Jun 06 06:34:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:34: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 1Z17gz-0004hW-F2; Sat, 06 Jun 2015 06:34:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gx-0004hF-Ok for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:51 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 84/41-01068-B8492755; Sat, 06 Jun 2015 06:34:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1433572489!13694727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22364 invoked from network); 6 Jun 2015 06:34:50 -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; 6 Jun 2015 06:34:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17gv-0006Xm-CW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17gv-00078v-An for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:49 +0000 Date: Sat, 06 Jun 2015 06:34:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: clarification to terms used in hypervisor memory management X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e758ed14f390342513405dd766e874934573e6cb Author: Andrew Cooper AuthorDate: Mon Jun 1 12:00:18 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 1 12:00:18 2015 +0200 docs: clarification to terms used in hypervisor memory management Memory management is hard[citation needed]. Furthermore, it isn't helped by the inconsistent use of terms through the code, or that some terms have changed meaning over time. Describe the currently-used terms in a more practical fashon, so new code has a concrete reference. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/include/xen/mm.h | 59 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 21 deletions(-) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index a066363..a7563cd 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -1,28 +1,45 @@ /****************************************************************************** * include/xen/mm.h - * + * * Definitions for memory pages, frame numbers, addresses, allocations, etc. - * - * Note that Xen must handle several different physical 'address spaces' and - * there is a consistent terminology for these: - * - * 1. gpfn/gpaddr: A guest-specific pseudo-physical frame number or address. - * 2. gmfn/gmaddr: A machine address from the p.o.v. of a particular guest. - * 3. mfn/maddr: A real machine frame number or address. - * 4. pfn/paddr: Used in 'polymorphic' functions that work across all - * address spaces, depending on context. See the pagetable - * conversion macros in asm-x86/page.h for examples. - * Also 'paddr_t' is big enough to store any physical address. - * - * This scheme provides consistent function and variable names even when - * different guests are running in different memory-management modes. - * 1. A guest running in auto-translated mode (e.g., shadow_mode_translate()) - * will have gpfn == gmfn and gmfn != mfn. - * 2. A paravirtualised x86 guest will have gpfn != gmfn and gmfn == mfn. - * 3. A paravirtualised guest with no pseudophysical overlay will have - * gpfn == gpmfn == mfn. - * + * * Copyright (c) 2002-2006, K A Fraser + * + * +---------------------+ + * Xen Memory Management + * +---------------------+ + * + * Xen has to handle many different address spaces. It is important not to + * get these spaces mixed up. The following is a consistent terminology which + * should be adhered to. + * + * mfn: Machine Frame Number + * The values Xen puts into its own pagetables. This is the host physical + * memory address space with RAM, MMIO etc. + * + * gfn: Guest Frame Number + * The values a guest puts in its own pagetables. For an auto-translated + * guest (hardware assisted with 2nd stage translation, or shadowed), gfn != + * mfn. For a non-translated guest which is aware of Xen, gfn == mfn. + * + * pfn: Pseudophysical Frame Number + * A linear idea of a guest physical address space. For an auto-translated + * guest, pfn == gfn while for a non-translated guest, pfn != gfn. + * + * WARNING: Some of these terms have changed over time while others have been + * used inconsistently, meaning that a lot of existing code does not match the + * definitions above. New code should use these terms as described here, and + * over time older code should be corrected to be consistent. + * + * An incomplete list of larger work area: + * - Phase out the use of 'pfn' from the x86 pagetable code. Callers should + * know explicitly whether they are talking about mfns or gfns. + * - Phase out the use of 'pfn' from the ARM mm code. A cursory glance + * suggests that 'mfn' and 'pfn' are currently used interchangeably, where + * 'mfn' is the appropriate term to use. + * - Phase out the use of gpfn/gmfn where pfn/mfn are meant. This excludes + * the x86 shadow code, which uses gmfn/smfn pairs with different, + * documented, meanings. */ #ifndef __XEN_MM_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 Jun 06 06:35:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17h9-0004in-Hb; Sat, 06 Jun 2015 06:35:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17h8-0004iY-B1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:02 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 88/14-08244-59492755; Sat, 06 Jun 2015 06:35:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1433572499!6829844!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18636 invoked from network); 6 Jun 2015 06:35:00 -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; 6 Jun 2015 06:35:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17h5-0006Xv-HU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17h5-00079R-Fs for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:59 +0000 Date: Sat, 06 Jun 2015 06:34:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: print useful affinity info when dumping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 376bbbabbda607d2039b8f839f15ff02721597d2 Author: Dario Faggioli AuthorDate: Tue Jun 2 13:43:15 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 2 13:43:15 2015 +0200 sched_rt: print useful affinity info when dumping In fact, printing the cpupool's CPU online mask for each vCPU is just redundant, as that is the same for all the vCPUs of all the domains in the same cpupool, while hard affinity is already part of the output of dumping domains info. Instead, print the intersection between hard affinity and online CPUs, which is --in case of this scheduler-- the effective affinity always used for the vCPUs. This change also takes the chance to add a scratch cpumask area, to avoid having to either put one (more) cpumask_t on the stack, or dynamically allocate it within the dumping routine. (The former being bad because hypervisor stack size is limited, the latter because dynamic allocations can fail, if the hypervisor was built for a large enough number of CPUs.) We allocate such scratch area, for all pCPUs, when the first instance of the RTDS scheduler is activated and, in order not to loose track/leak it if other instances are activated in new cpupools, and when the last instance is deactivated, we (sort of) refcount it. Such scratch area can be used to kill most of the cpumasks{_var}_t local variables in other functions in the file, but that is *NOT* done in this chage. Finally, convert the file to use keyhandler scratch, instead of open coded string buffers. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Acked-by: George Dunlap --- xen/common/sched_rt.c | 66 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 9 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 7c39a9e..59ead57 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -124,6 +124,24 @@ #define TRC_RTDS_BUDGET_REPLENISH TRC_SCHED_CLASS_EVT(RTDS, 4) #define TRC_RTDS_SCHED_TASKLET TRC_SCHED_CLASS_EVT(RTDS, 5) + /* + * Useful to avoid too many cpumask_var_t on the stack. + */ +static cpumask_t **_cpumask_scratch; +#define cpumask_scratch _cpumask_scratch[smp_processor_id()] + +/* + * We want to only allocate the _cpumask_scratch array the first time an + * instance of this scheduler is used, and avoid reallocating and leaking + * the old one when more instance are activated inside new cpupools. We + * also want to get rid of it when the last instance is de-inited. + * + * So we (sort of) reference count the number of initialized instances. This + * does not need to happen via atomic_t refcounters, as it only happens either + * during boot, or under the protection of the cpupool_lock spinlock. + */ +static unsigned int nr_rt_ops; + /* * Systme-wide private data, include global RunQueue/DepletedQ * Global lock is referenced by schedule_data.schedule_lock from all @@ -218,8 +236,7 @@ __q_elem(struct list_head *elem) static void rt_dump_vcpu(const struct scheduler *ops, const struct rt_vcpu *svc) { - char cpustr[1024]; - cpumask_t *cpupool_mask; + cpumask_t *cpupool_mask, *mask; ASSERT(svc != NULL); /* idle vcpu */ @@ -229,10 +246,22 @@ rt_dump_vcpu(const struct scheduler *ops, const struct rt_vcpu *svc) return; } - cpumask_scnprintf(cpustr, sizeof(cpustr), svc->vcpu->cpu_hard_affinity); + /* + * We can't just use 'cpumask_scratch' because the dumping can + * happen from a pCPU outside of this scheduler's cpupool, and + * hence it's not right to use the pCPU's scratch mask (which + * may even not exist!). On the other hand, it is safe to use + * svc->vcpu->processor's own scratch space, since we hold the + * runqueue lock. + */ + mask = _cpumask_scratch[svc->vcpu->processor]; + + cpupool_mask = cpupool_scheduler_cpumask(svc->vcpu->domain->cpupool); + cpumask_and(mask, cpupool_mask, svc->vcpu->cpu_hard_affinity); + cpulist_scnprintf(keyhandler_scratch, sizeof(keyhandler_scratch), mask); printk("[%5d.%-2u] cpu %u, (%"PRI_stime", %"PRI_stime")," " cur_b=%"PRI_stime" cur_d=%"PRI_stime" last_start=%"PRI_stime"\n" - " \t\t onQ=%d runnable=%d cpu_hard_affinity=%s ", + " \t\t onQ=%d runnable=%d flags=%x effective hard_affinity=%s\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id, svc->vcpu->processor, @@ -243,11 +272,8 @@ rt_dump_vcpu(const struct scheduler *ops, const struct rt_vcpu *svc) svc->last_start, __vcpu_on_q(svc), vcpu_runnable(svc->vcpu), - cpustr); - memset(cpustr, 0, sizeof(cpustr)); - cpupool_mask = cpupool_scheduler_cpumask(svc->vcpu->domain->cpupool); - cpumask_scnprintf(cpustr, sizeof(cpustr), cpupool_mask); - printk("cpupool=%s\n", cpustr); + svc->flags, + keyhandler_scratch); } static void @@ -409,6 +435,16 @@ rt_init(struct scheduler *ops) if ( prv == NULL ) return -ENOMEM; + ASSERT( _cpumask_scratch == NULL || nr_rt_ops > 0 ); + + if ( !_cpumask_scratch ) + { + _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids); + if ( !_cpumask_scratch ) + return -ENOMEM; + } + nr_rt_ops++; + spin_lock_init(&prv->lock); INIT_LIST_HEAD(&prv->sdom); INIT_LIST_HEAD(&prv->runq); @@ -426,6 +462,13 @@ rt_deinit(const struct scheduler *ops) { struct rt_private *prv = rt_priv(ops); + ASSERT( _cpumask_scratch && nr_rt_ops > 0 ); + + if ( (--nr_rt_ops) == 0 ) + { + xfree(_cpumask_scratch); + _cpumask_scratch = NULL; + } xfree(prv); } @@ -443,6 +486,9 @@ rt_alloc_pdata(const struct scheduler *ops, int cpu) per_cpu(schedule_data, cpu).schedule_lock = &prv->lock; spin_unlock_irqrestore(&prv->lock, flags); + if ( !alloc_cpumask_var(&_cpumask_scratch[cpu]) ) + return NULL; + /* 1 indicates alloc. succeed in schedule.c */ return (void *)1; } @@ -462,6 +508,8 @@ rt_free_pdata(const struct scheduler *ops, void *pcpu, int cpu) sd->schedule_lock = &sd->_lock; spin_unlock_irqrestore(&prv->lock, flags); + + free_cpumask_var(_cpumask_scratch[cpu]); } 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 Sat Jun 06 06:35:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17h9-0004in-Hb; Sat, 06 Jun 2015 06:35:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17h8-0004iY-B1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:02 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 88/14-08244-59492755; Sat, 06 Jun 2015 06:35:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1433572499!6829844!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18636 invoked from network); 6 Jun 2015 06:35:00 -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; 6 Jun 2015 06:35:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17h5-0006Xv-HU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17h5-00079R-Fs for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:34:59 +0000 Date: Sat, 06 Jun 2015 06:34:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: print useful affinity info when dumping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 376bbbabbda607d2039b8f839f15ff02721597d2 Author: Dario Faggioli AuthorDate: Tue Jun 2 13:43:15 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 2 13:43:15 2015 +0200 sched_rt: print useful affinity info when dumping In fact, printing the cpupool's CPU online mask for each vCPU is just redundant, as that is the same for all the vCPUs of all the domains in the same cpupool, while hard affinity is already part of the output of dumping domains info. Instead, print the intersection between hard affinity and online CPUs, which is --in case of this scheduler-- the effective affinity always used for the vCPUs. This change also takes the chance to add a scratch cpumask area, to avoid having to either put one (more) cpumask_t on the stack, or dynamically allocate it within the dumping routine. (The former being bad because hypervisor stack size is limited, the latter because dynamic allocations can fail, if the hypervisor was built for a large enough number of CPUs.) We allocate such scratch area, for all pCPUs, when the first instance of the RTDS scheduler is activated and, in order not to loose track/leak it if other instances are activated in new cpupools, and when the last instance is deactivated, we (sort of) refcount it. Such scratch area can be used to kill most of the cpumasks{_var}_t local variables in other functions in the file, but that is *NOT* done in this chage. Finally, convert the file to use keyhandler scratch, instead of open coded string buffers. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Acked-by: George Dunlap --- xen/common/sched_rt.c | 66 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 9 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 7c39a9e..59ead57 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -124,6 +124,24 @@ #define TRC_RTDS_BUDGET_REPLENISH TRC_SCHED_CLASS_EVT(RTDS, 4) #define TRC_RTDS_SCHED_TASKLET TRC_SCHED_CLASS_EVT(RTDS, 5) + /* + * Useful to avoid too many cpumask_var_t on the stack. + */ +static cpumask_t **_cpumask_scratch; +#define cpumask_scratch _cpumask_scratch[smp_processor_id()] + +/* + * We want to only allocate the _cpumask_scratch array the first time an + * instance of this scheduler is used, and avoid reallocating and leaking + * the old one when more instance are activated inside new cpupools. We + * also want to get rid of it when the last instance is de-inited. + * + * So we (sort of) reference count the number of initialized instances. This + * does not need to happen via atomic_t refcounters, as it only happens either + * during boot, or under the protection of the cpupool_lock spinlock. + */ +static unsigned int nr_rt_ops; + /* * Systme-wide private data, include global RunQueue/DepletedQ * Global lock is referenced by schedule_data.schedule_lock from all @@ -218,8 +236,7 @@ __q_elem(struct list_head *elem) static void rt_dump_vcpu(const struct scheduler *ops, const struct rt_vcpu *svc) { - char cpustr[1024]; - cpumask_t *cpupool_mask; + cpumask_t *cpupool_mask, *mask; ASSERT(svc != NULL); /* idle vcpu */ @@ -229,10 +246,22 @@ rt_dump_vcpu(const struct scheduler *ops, const struct rt_vcpu *svc) return; } - cpumask_scnprintf(cpustr, sizeof(cpustr), svc->vcpu->cpu_hard_affinity); + /* + * We can't just use 'cpumask_scratch' because the dumping can + * happen from a pCPU outside of this scheduler's cpupool, and + * hence it's not right to use the pCPU's scratch mask (which + * may even not exist!). On the other hand, it is safe to use + * svc->vcpu->processor's own scratch space, since we hold the + * runqueue lock. + */ + mask = _cpumask_scratch[svc->vcpu->processor]; + + cpupool_mask = cpupool_scheduler_cpumask(svc->vcpu->domain->cpupool); + cpumask_and(mask, cpupool_mask, svc->vcpu->cpu_hard_affinity); + cpulist_scnprintf(keyhandler_scratch, sizeof(keyhandler_scratch), mask); printk("[%5d.%-2u] cpu %u, (%"PRI_stime", %"PRI_stime")," " cur_b=%"PRI_stime" cur_d=%"PRI_stime" last_start=%"PRI_stime"\n" - " \t\t onQ=%d runnable=%d cpu_hard_affinity=%s ", + " \t\t onQ=%d runnable=%d flags=%x effective hard_affinity=%s\n", svc->vcpu->domain->domain_id, svc->vcpu->vcpu_id, svc->vcpu->processor, @@ -243,11 +272,8 @@ rt_dump_vcpu(const struct scheduler *ops, const struct rt_vcpu *svc) svc->last_start, __vcpu_on_q(svc), vcpu_runnable(svc->vcpu), - cpustr); - memset(cpustr, 0, sizeof(cpustr)); - cpupool_mask = cpupool_scheduler_cpumask(svc->vcpu->domain->cpupool); - cpumask_scnprintf(cpustr, sizeof(cpustr), cpupool_mask); - printk("cpupool=%s\n", cpustr); + svc->flags, + keyhandler_scratch); } static void @@ -409,6 +435,16 @@ rt_init(struct scheduler *ops) if ( prv == NULL ) return -ENOMEM; + ASSERT( _cpumask_scratch == NULL || nr_rt_ops > 0 ); + + if ( !_cpumask_scratch ) + { + _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids); + if ( !_cpumask_scratch ) + return -ENOMEM; + } + nr_rt_ops++; + spin_lock_init(&prv->lock); INIT_LIST_HEAD(&prv->sdom); INIT_LIST_HEAD(&prv->runq); @@ -426,6 +462,13 @@ rt_deinit(const struct scheduler *ops) { struct rt_private *prv = rt_priv(ops); + ASSERT( _cpumask_scratch && nr_rt_ops > 0 ); + + if ( (--nr_rt_ops) == 0 ) + { + xfree(_cpumask_scratch); + _cpumask_scratch = NULL; + } xfree(prv); } @@ -443,6 +486,9 @@ rt_alloc_pdata(const struct scheduler *ops, int cpu) per_cpu(schedule_data, cpu).schedule_lock = &prv->lock; spin_unlock_irqrestore(&prv->lock, flags); + if ( !alloc_cpumask_var(&_cpumask_scratch[cpu]) ) + return NULL; + /* 1 indicates alloc. succeed in schedule.c */ return (void *)1; } @@ -462,6 +508,8 @@ rt_free_pdata(const struct scheduler *ops, void *pcpu, int cpu) sd->schedule_lock = &sd->_lock; spin_unlock_irqrestore(&prv->lock, flags); + + free_cpumask_var(_cpumask_scratch[cpu]); } 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 Sat Jun 06 06:35:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hL-0004kK-KR; Sat, 06 Jun 2015 06:35:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hI-0004jx-90 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:14 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 6F/BA-10437-F9492755; Sat, 06 Jun 2015 06:35:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1433572509!13696607!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23855 invoked from network); 6 Jun 2015 06:35:10 -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; 6 Jun 2015 06:35:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hF-0006YS-Nl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hF-0007AC-MT for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:09 +0000 Date: Sat, 06 Jun 2015 06:35:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] efi: fix allocation problems if ExitBootServices() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a753b3f1cf5e4714974196df9517849bf174324 Author: Ross Lagerwall AuthorDate: Tue Jun 2 13:44:24 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 2 13:44:24 2015 +0200 efi: fix allocation problems if ExitBootServices() fails If calling ExitBootServices() fails, the required memory map size may have increased. When initially allocating the memory map, allocate a slightly larger buffer (by an arbitrary 8 entries) to fix this. The ARM code path was already allocating a larger buffer than required, so this moves the code to be common for all architectures. This was seen on the following machine when using the iscsidxe UEFI driver. The machine would consistently fail the first call to ExitBootServices(). System Information Manufacturer: Supermicro Product Name: X10SLE-F/HF BIOS Information Vendor: American Megatrends Inc. Version: 2.00 Release Date: 04/24/2014 Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich Reviewed-by: Roy Franz Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 6 ++---- xen/arch/x86/efi/efi-boot.h | 4 ++-- xen/common/efi/boot.c | 8 +++++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index b02cc02..3297f27 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -370,16 +370,14 @@ static void __init efi_arch_cfg_file_late(EFI_FILE_HANDLE dir_handle, char *sect { } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { void *ptr; EFI_STATUS status; - UINTN map_size_alloc = *map_size + EFI_PAGE_SIZE; - status = efi_bs->AllocatePool(EfiLoaderData, map_size_alloc, &ptr); + status = efi_bs->AllocatePool(EfiLoaderData, map_size, &ptr); if ( status != EFI_SUCCESS ) return NULL; - *map_size = map_size_alloc; return ptr; } diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 3a3b4fe..cd14c19 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -190,10 +190,10 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { place_string(&mbi.mem_upper, NULL); - mbi.mem_upper -= *map_size; + mbi.mem_upper -= map_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) return NULL; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index ef8476c..60c1b8d 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -700,7 +700,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_STATUS status; unsigned int i, argc; CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; - UINTN map_key, info_size, gop_mode = ~0; + UINTN map_alloc_size, map_key, info_size, gop_mode = ~0; EFI_HANDLE *handles = NULL; EFI_SHIM_LOCK_PROTOCOL *shim_lock; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; @@ -1053,14 +1053,16 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_video_init(gop, info_size, mode_info); } - efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key, + efi_bs->GetMemoryMap(&map_alloc_size, NULL, &map_key, &efi_mdesc_size, &mdesc_ver); - efi_memmap = efi_arch_allocate_mmap_buffer(&efi_memmap_size); + map_alloc_size += 8 * efi_mdesc_size; + efi_memmap = efi_arch_allocate_mmap_buffer(map_alloc_size); if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); for ( retry = 0; ; retry = 1 ) { + efi_memmap_size = map_alloc_size; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(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 Jun 06 06:35:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hL-0004kK-KR; Sat, 06 Jun 2015 06:35:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hI-0004jx-90 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:14 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 6F/BA-10437-F9492755; Sat, 06 Jun 2015 06:35:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1433572509!13696607!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23855 invoked from network); 6 Jun 2015 06:35:10 -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; 6 Jun 2015 06:35:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hF-0006YS-Nl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hF-0007AC-MT for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:09 +0000 Date: Sat, 06 Jun 2015 06:35:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] efi: fix allocation problems if ExitBootServices() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a753b3f1cf5e4714974196df9517849bf174324 Author: Ross Lagerwall AuthorDate: Tue Jun 2 13:44:24 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 2 13:44:24 2015 +0200 efi: fix allocation problems if ExitBootServices() fails If calling ExitBootServices() fails, the required memory map size may have increased. When initially allocating the memory map, allocate a slightly larger buffer (by an arbitrary 8 entries) to fix this. The ARM code path was already allocating a larger buffer than required, so this moves the code to be common for all architectures. This was seen on the following machine when using the iscsidxe UEFI driver. The machine would consistently fail the first call to ExitBootServices(). System Information Manufacturer: Supermicro Product Name: X10SLE-F/HF BIOS Information Vendor: American Megatrends Inc. Version: 2.00 Release Date: 04/24/2014 Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich Reviewed-by: Roy Franz Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 6 ++---- xen/arch/x86/efi/efi-boot.h | 4 ++-- xen/common/efi/boot.c | 8 +++++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index b02cc02..3297f27 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -370,16 +370,14 @@ static void __init efi_arch_cfg_file_late(EFI_FILE_HANDLE dir_handle, char *sect { } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { void *ptr; EFI_STATUS status; - UINTN map_size_alloc = *map_size + EFI_PAGE_SIZE; - status = efi_bs->AllocatePool(EfiLoaderData, map_size_alloc, &ptr); + status = efi_bs->AllocatePool(EfiLoaderData, map_size, &ptr); if ( status != EFI_SUCCESS ) return NULL; - *map_size = map_size_alloc; return ptr; } diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 3a3b4fe..cd14c19 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -190,10 +190,10 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { place_string(&mbi.mem_upper, NULL); - mbi.mem_upper -= *map_size; + mbi.mem_upper -= map_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) return NULL; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index ef8476c..60c1b8d 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -700,7 +700,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_STATUS status; unsigned int i, argc; CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; - UINTN map_key, info_size, gop_mode = ~0; + UINTN map_alloc_size, map_key, info_size, gop_mode = ~0; EFI_HANDLE *handles = NULL; EFI_SHIM_LOCK_PROTOCOL *shim_lock; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; @@ -1053,14 +1053,16 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_video_init(gop, info_size, mode_info); } - efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key, + efi_bs->GetMemoryMap(&map_alloc_size, NULL, &map_key, &efi_mdesc_size, &mdesc_ver); - efi_memmap = efi_arch_allocate_mmap_buffer(&efi_memmap_size); + map_alloc_size += 8 * efi_mdesc_size; + efi_memmap = efi_arch_allocate_mmap_buffer(map_alloc_size); if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); for ( retry = 0; ; retry = 1 ) { + efi_memmap_size = map_alloc_size; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(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 Jun 06 06:35:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hT-0004lf-Mn; Sat, 06 Jun 2015 06:35:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hS-0004lR-E4 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:22 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id AF/CA-10437-9A492755; Sat, 06 Jun 2015 06:35:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433572520!11237809!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12612 invoked from network); 6 Jun 2015 06:35:20 -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; 6 Jun 2015 06:35:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hP-0006Yd-Ra for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hP-0007An-Qf for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:19 +0000 Date: Sat, 06 Jun 2015 06:35:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unmodified-drivers: tolerate IRQF_DISABLED being undefined X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fed56ba0e69b251d0222ef0785cd1c1838f9e51d Author: Jan Beulich AuthorDate: Tue Jun 2 13:45:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 2 13:45:03 2015 +0200 unmodified-drivers: tolerate IRQF_DISABLED being undefined It's being removed in Linux 4.1. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c index 35a2819..b72e37a 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c +++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c @@ -350,11 +350,13 @@ int xen_irq_init(struct pci_dev *pdev) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) SA_SHIRQ | SA_SAMPLE_RANDOM | SA_INTERRUPT, #else - IRQF_SHARED | #ifdef IRQF_SAMPLE_RANDOM IRQF_SAMPLE_RANDOM | #endif - IRQF_DISABLED, +#ifdef IRQF_DISABLED + IRQF_DISABLED | +#endif + IRQF_SHARED, #endif "xen-platform-pci", pdev); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:35:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hT-0004lf-Mn; Sat, 06 Jun 2015 06:35:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hS-0004lR-E4 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:22 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id AF/CA-10437-9A492755; Sat, 06 Jun 2015 06:35:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433572520!11237809!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12612 invoked from network); 6 Jun 2015 06:35:20 -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; 6 Jun 2015 06:35:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hP-0006Yd-Ra for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hP-0007An-Qf for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:19 +0000 Date: Sat, 06 Jun 2015 06:35:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unmodified-drivers: tolerate IRQF_DISABLED being undefined X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fed56ba0e69b251d0222ef0785cd1c1838f9e51d Author: Jan Beulich AuthorDate: Tue Jun 2 13:45:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 2 13:45:03 2015 +0200 unmodified-drivers: tolerate IRQF_DISABLED being undefined It's being removed in Linux 4.1. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c index 35a2819..b72e37a 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c +++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c @@ -350,11 +350,13 @@ int xen_irq_init(struct pci_dev *pdev) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) SA_SHIRQ | SA_SAMPLE_RANDOM | SA_INTERRUPT, #else - IRQF_SHARED | #ifdef IRQF_SAMPLE_RANDOM IRQF_SAMPLE_RANDOM | #endif - IRQF_DISABLED, +#ifdef IRQF_DISABLED + IRQF_DISABLED | +#endif + IRQF_SHARED, #endif "xen-platform-pci", pdev); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:35:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hd-0004nT-SW; Sat, 06 Jun 2015 06:35:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hc-0004nD-M7 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:32 +0000 Content-Length: 2163 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 2C/6D-31258-4B492755; Sat, 06 Jun 2015 06:35:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1433572530!20877535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20166 invoked from network); 6 Jun 2015 06:35:31 -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; 6 Jun 2015 06:35:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ha-0006Yl-71 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hZ-0007CF-Uk for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:30 +0000 Date: Sat, 06 Jun 2015 06:35:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: use the correct type for _cpumask_scratch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6433744178479693964==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6433744178479693964== Content-Length: 1754 Content-Transfer-Encoding: quoted-printable commit 1dca74c331194fff91d899ea857e348626d853de Author: Julien Grall AuthorDate: Wed Jun 3 09:24:50 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:24:50 2015 +0200 sched_rt: use the correct type for _cpumask_scratch The commit 376bbbabbda607d2039b8f839f15ff02721597d2 "sched_rt: print useful affinity info when dumping" breaks build on ARM64: sched_rt.c: In function =E2=80=98rt_init=E2=80=99: sched_rt.c:442:26: error: assignment from incompatible pointer type [-Werror] _cpumask_scratch =3D xmalloc_array(cpumask_var_t, nr_cpu_ids); ^ sched_rt.c: In function =E2=80=98rt_alloc_pdata=E2=80=99: sched_rt.c:489:29: error: passing argument 1 of =E2=80=98alloc_cpumask_var=E2=80=99 from incompatible pointer type [-Werror] if ( !alloc_cpumask_var(&_cpumask_scratch[cpu]) ) This is because cpumask_var_t is not a type alias to cpumask_t** when the number of CPU > 2 * BITS_PER_LONG. The correct type for _cpumask_scratch should be cpumask_var_t*. Signed-off-by: Julien Grall --- xen/common/sched_rt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 59ead57..5836d27 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -127,7 +127,7 @@ /* * Useful to avoid too many cpumask_var_t on the stack. */ -static cpumask_t **_cpumask_scratch; +static cpumask_var_t *_cpumask_scratch; #define cpumask_scratch _cpumask_scratch[smp_processor_id()] /* -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6433744178479693964== 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 --===============6433744178479693964==-- From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:35:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hd-0004nT-SW; Sat, 06 Jun 2015 06:35:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hc-0004nD-M7 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:32 +0000 Content-Length: 2163 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 2C/6D-31258-4B492755; Sat, 06 Jun 2015 06:35:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1433572530!20877535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20166 invoked from network); 6 Jun 2015 06:35:31 -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; 6 Jun 2015 06:35:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ha-0006Yl-71 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hZ-0007CF-Uk for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:30 +0000 Date: Sat, 06 Jun 2015 06:35:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: use the correct type for _cpumask_scratch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6433744178479693964==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6433744178479693964== Content-Length: 1754 Content-Transfer-Encoding: quoted-printable commit 1dca74c331194fff91d899ea857e348626d853de Author: Julien Grall AuthorDate: Wed Jun 3 09:24:50 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:24:50 2015 +0200 sched_rt: use the correct type for _cpumask_scratch The commit 376bbbabbda607d2039b8f839f15ff02721597d2 "sched_rt: print useful affinity info when dumping" breaks build on ARM64: sched_rt.c: In function =E2=80=98rt_init=E2=80=99: sched_rt.c:442:26: error: assignment from incompatible pointer type [-Werror] _cpumask_scratch =3D xmalloc_array(cpumask_var_t, nr_cpu_ids); ^ sched_rt.c: In function =E2=80=98rt_alloc_pdata=E2=80=99: sched_rt.c:489:29: error: passing argument 1 of =E2=80=98alloc_cpumask_var=E2=80=99 from incompatible pointer type [-Werror] if ( !alloc_cpumask_var(&_cpumask_scratch[cpu]) ) This is because cpumask_var_t is not a type alias to cpumask_t** when the number of CPU > 2 * BITS_PER_LONG. The correct type for _cpumask_scratch should be cpumask_var_t*. Signed-off-by: Julien Grall --- xen/common/sched_rt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 59ead57..5836d27 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -127,7 +127,7 @@ /* * Useful to avoid too many cpumask_var_t on the stack. */ -static cpumask_t **_cpumask_scratch; +static cpumask_var_t *_cpumask_scratch; #define cpumask_scratch _cpumask_scratch[smp_processor_id()] /* -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6433744178479693964== 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 --===============6433744178479693964==-- From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:35:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hn-0004p5-W9; Sat, 06 Jun 2015 06:35:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hn-0004oq-1D for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:43 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 4C/98-18676-EB492755; Sat, 06 Jun 2015 06:35:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433572540!20876347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21866 invoked from network); 6 Jun 2015 06:35:41 -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; 6 Jun 2015 06:35:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hk-0006Yr-Bl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hk-0007Cl-AB for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:40 +0000 Date: Sat, 06 Jun 2015 06:35:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: Disable the LAPIC later in smp_send_stop() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d639bdd9bbed8d003ad9be0b13535aca636b9d18 Author: Andrew Cooper AuthorDate: Wed Jun 3 09:25:43 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:25:43 2015 +0200 x86/apic: Disable the LAPIC later in smp_send_stop() __stop_this_cpu() may reset the LAPIC mode back from x2apic to xapic, but will leave x2apic_enabled alone. This may cause disconnect_bsp_APIC() in disable_IO_APIC() to suffer a #GP fault. Disabling the LAPIC can safely be deferred to being the last action. Signed-off-by: Andrew Cooper --- xen/arch/x86/smp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 06a833e..8caa0bc 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -311,9 +311,9 @@ void smp_send_stop(void) mdelay(1); local_irq_disable(); - __stop_this_cpu(); disable_IO_APIC(); hpet_disable(); + __stop_this_cpu(); local_irq_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 Jun 06 06:35:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hn-0004p5-W9; Sat, 06 Jun 2015 06:35:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hn-0004oq-1D for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:43 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 4C/98-18676-EB492755; Sat, 06 Jun 2015 06:35:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433572540!20876347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21866 invoked from network); 6 Jun 2015 06:35:41 -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; 6 Jun 2015 06:35:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hk-0006Yr-Bl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hk-0007Cl-AB for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:40 +0000 Date: Sat, 06 Jun 2015 06:35:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: Disable the LAPIC later in smp_send_stop() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d639bdd9bbed8d003ad9be0b13535aca636b9d18 Author: Andrew Cooper AuthorDate: Wed Jun 3 09:25:43 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:25:43 2015 +0200 x86/apic: Disable the LAPIC later in smp_send_stop() __stop_this_cpu() may reset the LAPIC mode back from x2apic to xapic, but will leave x2apic_enabled alone. This may cause disconnect_bsp_APIC() in disable_IO_APIC() to suffer a #GP fault. Disabling the LAPIC can safely be deferred to being the last action. Signed-off-by: Andrew Cooper --- xen/arch/x86/smp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 06a833e..8caa0bc 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -311,9 +311,9 @@ void smp_send_stop(void) mdelay(1); local_irq_disable(); - __stop_this_cpu(); disable_IO_APIC(); hpet_disable(); + __stop_this_cpu(); local_irq_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 Jun 06 06:35:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hy-0004qJ-2L; Sat, 06 Jun 2015 06:35:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hw-0004qC-UA for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:53 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id F0/2D-08467-8C492755; Sat, 06 Jun 2015 06:35:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433572550!12279942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20251 invoked from network); 6 Jun 2015 06:35:51 -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; 6 Jun 2015 06:35:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hu-0006Yx-GW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hu-0007DB-Ez for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:50 +0000 Date: Sat, 06 Jun 2015 06:35:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: don't use set_fixmap() in the crash path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8228055568ef195df5e0c205972a4a4c278e186b Author: Andrew Cooper AuthorDate: Wed Jun 3 09:26:13 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:26:13 2015 +0200 x86/crash: don't use set_fixmap() in the crash path Experimentally, this can result in memory allocation, and in particular a failed assertion that interrupts are enabled when performing a TLB flush. (XEN) Assertion 'local_irq_is_enabled()' failed at smp.c:223 (XEN) [] flush_area_mask+0x7/0x134 (XEN) [] alloc_domheap_pages+0xa9/0x12a (XEN) [] alloc_xenheap_pages+0x64/0xdb (XEN) [] alloc_xen_pagetable+0x1c/0xa0 (XEN) [] virt_to_xen_l1e+0x38/0x1be (XEN) [] map_pages_to_xen+0x80e/0xfd9 (XEN) [] __set_fixmap+0x2c/0x2e (XEN) [] machine_crash_shutdown+0x186/0x2b2 (XEN) [] kexec_crash+0x3f/0x5b (XEN) [] panic+0x100/0x118 (XEN) [] set_guest_machinecheck_trapbounce+0/0x6d (XEN) [] do_page_fault+0x40b/0x541 (XEN) [] handle_exception_saved+0x2e/0x6c Instead, use the directmap mapping which are writable and involve far less complexity than set_fixmap() Signed-off-by: Andrew Cooper --- xen/arch/x86/crash.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index eb7be9c..888a214 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -140,13 +140,10 @@ static void nmi_shootdown_cpus(void) * Ideally would be: * exception_table[TRAP_nmi] = &do_nmi_crash; * - * but the exception_table is read only. Borrow an unused fixmap entry - * to construct a writable mapping. + * but the exception_table is read only. Access it via its directmap + * mappings. */ - set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); - write_atomic((unsigned long *) - (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + - ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + write_atomic((unsigned long *)__va(__pa(&exception_table[TRAP_nmi])), (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:35:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:35: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 1Z17hy-0004qJ-2L; Sat, 06 Jun 2015 06:35:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hw-0004qC-UA for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:53 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id F0/2D-08467-8C492755; Sat, 06 Jun 2015 06:35:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433572550!12279942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20251 invoked from network); 6 Jun 2015 06:35:51 -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; 6 Jun 2015 06:35:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17hu-0006Yx-GW for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17hu-0007DB-Ez for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:35:50 +0000 Date: Sat, 06 Jun 2015 06:35:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: don't use set_fixmap() in the crash path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8228055568ef195df5e0c205972a4a4c278e186b Author: Andrew Cooper AuthorDate: Wed Jun 3 09:26:13 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:26:13 2015 +0200 x86/crash: don't use set_fixmap() in the crash path Experimentally, this can result in memory allocation, and in particular a failed assertion that interrupts are enabled when performing a TLB flush. (XEN) Assertion 'local_irq_is_enabled()' failed at smp.c:223 (XEN) [] flush_area_mask+0x7/0x134 (XEN) [] alloc_domheap_pages+0xa9/0x12a (XEN) [] alloc_xenheap_pages+0x64/0xdb (XEN) [] alloc_xen_pagetable+0x1c/0xa0 (XEN) [] virt_to_xen_l1e+0x38/0x1be (XEN) [] map_pages_to_xen+0x80e/0xfd9 (XEN) [] __set_fixmap+0x2c/0x2e (XEN) [] machine_crash_shutdown+0x186/0x2b2 (XEN) [] kexec_crash+0x3f/0x5b (XEN) [] panic+0x100/0x118 (XEN) [] set_guest_machinecheck_trapbounce+0/0x6d (XEN) [] do_page_fault+0x40b/0x541 (XEN) [] handle_exception_saved+0x2e/0x6c Instead, use the directmap mapping which are writable and involve far less complexity than set_fixmap() Signed-off-by: Andrew Cooper --- xen/arch/x86/crash.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index eb7be9c..888a214 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -140,13 +140,10 @@ static void nmi_shootdown_cpus(void) * Ideally would be: * exception_table[TRAP_nmi] = &do_nmi_crash; * - * but the exception_table is read only. Borrow an unused fixmap entry - * to construct a writable mapping. + * but the exception_table is read only. Access it via its directmap + * mappings. */ - set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); - write_atomic((unsigned long *) - (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + - ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + write_atomic((unsigned long *)__va(__pa(&exception_table[TRAP_nmi])), (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17i8-0004ri-4p; Sat, 06 Jun 2015 06:36:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17i7-0004rZ-Jb for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:03 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id C2/55-05081-2D492755; Sat, 06 Jun 2015 06:36:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1433572560!4652825!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1328 invoked from network); 6 Jun 2015 06:36:01 -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; 6 Jun 2015 06:36:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17i4-0006Z6-MA for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17i4-0007Dj-Kg for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:00 +0000 Date: Sat, 06 Jun 2015 06:36:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/debugger: use copy_to/from_guest() in dbg_rw_guest_mem() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 229492e210ae86e35f4af0cfb3f2b98e8e946e04 Author: Andrew Cooper AuthorDate: Wed Jun 3 09:27:09 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:27:09 2015 +0200 x86/debugger: use copy_to/from_guest() in dbg_rw_guest_mem() Using gdbsx on Broadwell systems suffers a SMAP violation because dbg_rw_guest_mem() uses memcpy() with a userspace pointer. The functions dbg_rw_mem() and dbg_rw_guest_mem() have been updated to pass 'void * __user' pointers which indicates their nature clearly. Signed-off-by: Andrew Cooper --- xen/arch/x86/debug.c | 45 +++++++++++++++++++++++---------------- xen/arch/x86/domctl.c | 14 ++++++------ xen/include/asm-x86/debugger.h | 7 ++--- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 435bd40..801dcf2 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -41,6 +41,9 @@ #define DBGP2(...) ((void)0) #endif +typedef unsigned long dbgva_t; +typedef unsigned char dbgbyte_t; + /* Returns: mfn for the given (hvm guest) vaddr */ static unsigned long dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr, @@ -154,13 +157,14 @@ dbg_pv_va2mfn(dbgva_t vaddr, struct domain *dp, uint64_t pgd3val) } /* Returns: number of bytes remaining to be copied */ -static int -dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, - int toaddr, uint64_t pgd3) +unsigned int dbg_rw_guest_mem(struct domain *dp, void * __user gaddr, + void * __user buf, unsigned int len, + bool_t toaddr, uint64_t pgd3) { while ( len > 0 ) { char *va; + unsigned long addr = (unsigned long)gaddr; unsigned long mfn, gfn = INVALID_GFN, pagecnt; pagecnt = min_t(long, PAGE_SIZE - (addr & ~PAGE_MASK), len); @@ -176,12 +180,12 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, if ( toaddr ) { - memcpy(va, buf, pagecnt); /* va = buf */ + copy_from_user(va, buf, pagecnt); /* va = buf */ paging_mark_dirty(dp, mfn); } else { - memcpy(buf, va, pagecnt); /* buf = va */ + copy_to_user(buf, va, pagecnt); /* buf = va */ } unmap_domain_page(va); @@ -203,27 +207,30 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, * pgd3: value of init_mm.pgd[3] in guest. see above. * Returns: number of bytes remaining to be copied. */ -int -dbg_rw_mem(dbgva_t addr, dbgbyte_t *buf, int len, domid_t domid, int toaddr, - uint64_t pgd3) +unsigned int dbg_rw_mem(void * __user addr, void * __user buf, + unsigned int len, domid_t domid, bool_t toaddr, + uint64_t pgd3) { - struct domain *dp = get_domain_by_id(domid); - int hyp = (domid == DOMID_IDLE); + DBGP2("gmem:addr:%lx buf:%p len:$%u domid:%d toaddr:%x\n", + addr, buf, len, domid, toaddr); - DBGP2("gmem:addr:%lx buf:%p len:$%d domid:%x toaddr:%x dp:%p\n", - addr, buf, len, domid, toaddr, dp); - if ( hyp ) + if ( domid == DOMID_IDLE ) { if ( toaddr ) - len = __copy_to_user((void *)addr, buf, len); + len = __copy_to_user(addr, buf, len); else - len = __copy_from_user(buf, (void *)addr, len); + len = __copy_from_user(buf, addr, len); } - else if ( dp ) + else { - if ( !dp->is_dying ) /* make sure guest is still there */ - len= dbg_rw_guest_mem(addr, buf, len, dp, toaddr, pgd3); - put_domain(dp); + struct domain *d = get_domain_by_id(domid); + + if ( d ) + { + if ( !d->is_dying ) + len = dbg_rw_guest_mem(d, addr, buf, len, toaddr, pgd3); + put_domain(d); + } } DBGP2("gmem:exit:len:$%d\n", len); diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e9f76d0..1d3854f 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -37,14 +37,14 @@ #include #include -static int gdbsx_guest_mem_io( - domid_t domid, struct xen_domctl_gdbsx_memio *iop) +static int gdbsx_guest_mem_io(domid_t domid, struct xen_domctl_gdbsx_memio *iop) { - ulong l_uva = (ulong)iop->uva; - iop->remain = dbg_rw_mem( - (dbgva_t)iop->gva, (dbgbyte_t *)l_uva, iop->len, domid, - iop->gwr, iop->pgd3val); - return (iop->remain ? -EFAULT : 0); + void * __user gva = (void *)iop->gva, * __user uva = (void *)iop->uva; + + iop->remain = dbg_rw_mem(gva, uva, iop->len, domid, + !!iop->gwr, iop->pgd3val); + + return iop->remain ? -EFAULT : 0; } #define MAX_IOPORTS 0x10000 diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h index 0408bec..33f4700 100644 --- a/xen/include/asm-x86/debugger.h +++ b/xen/include/asm-x86/debugger.h @@ -82,9 +82,8 @@ static inline int debugger_trap_entry( return 0; } -typedef unsigned long dbgva_t; -typedef unsigned char dbgbyte_t; -extern int dbg_rw_mem(dbgva_t addr, dbgbyte_t *buf, int len, - domid_t domid, int toaddr, uint64_t pgd3); +unsigned int dbg_rw_mem(void * __user addr, void * __user buf, + unsigned int len, domid_t domid, bool_t toaddr, + uint64_t pgd3); #endif /* __X86_DEBUGGER_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 Jun 06 06:36:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17i8-0004ri-4p; Sat, 06 Jun 2015 06:36:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17i7-0004rZ-Jb for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:03 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id C2/55-05081-2D492755; Sat, 06 Jun 2015 06:36:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1433572560!4652825!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1328 invoked from network); 6 Jun 2015 06:36:01 -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; 6 Jun 2015 06:36:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17i4-0006Z6-MA for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17i4-0007Dj-Kg for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:00 +0000 Date: Sat, 06 Jun 2015 06:36:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/debugger: use copy_to/from_guest() in dbg_rw_guest_mem() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 229492e210ae86e35f4af0cfb3f2b98e8e946e04 Author: Andrew Cooper AuthorDate: Wed Jun 3 09:27:09 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:27:09 2015 +0200 x86/debugger: use copy_to/from_guest() in dbg_rw_guest_mem() Using gdbsx on Broadwell systems suffers a SMAP violation because dbg_rw_guest_mem() uses memcpy() with a userspace pointer. The functions dbg_rw_mem() and dbg_rw_guest_mem() have been updated to pass 'void * __user' pointers which indicates their nature clearly. Signed-off-by: Andrew Cooper --- xen/arch/x86/debug.c | 45 +++++++++++++++++++++++---------------- xen/arch/x86/domctl.c | 14 ++++++------ xen/include/asm-x86/debugger.h | 7 ++--- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 435bd40..801dcf2 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -41,6 +41,9 @@ #define DBGP2(...) ((void)0) #endif +typedef unsigned long dbgva_t; +typedef unsigned char dbgbyte_t; + /* Returns: mfn for the given (hvm guest) vaddr */ static unsigned long dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr, @@ -154,13 +157,14 @@ dbg_pv_va2mfn(dbgva_t vaddr, struct domain *dp, uint64_t pgd3val) } /* Returns: number of bytes remaining to be copied */ -static int -dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, - int toaddr, uint64_t pgd3) +unsigned int dbg_rw_guest_mem(struct domain *dp, void * __user gaddr, + void * __user buf, unsigned int len, + bool_t toaddr, uint64_t pgd3) { while ( len > 0 ) { char *va; + unsigned long addr = (unsigned long)gaddr; unsigned long mfn, gfn = INVALID_GFN, pagecnt; pagecnt = min_t(long, PAGE_SIZE - (addr & ~PAGE_MASK), len); @@ -176,12 +180,12 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, if ( toaddr ) { - memcpy(va, buf, pagecnt); /* va = buf */ + copy_from_user(va, buf, pagecnt); /* va = buf */ paging_mark_dirty(dp, mfn); } else { - memcpy(buf, va, pagecnt); /* buf = va */ + copy_to_user(buf, va, pagecnt); /* buf = va */ } unmap_domain_page(va); @@ -203,27 +207,30 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, * pgd3: value of init_mm.pgd[3] in guest. see above. * Returns: number of bytes remaining to be copied. */ -int -dbg_rw_mem(dbgva_t addr, dbgbyte_t *buf, int len, domid_t domid, int toaddr, - uint64_t pgd3) +unsigned int dbg_rw_mem(void * __user addr, void * __user buf, + unsigned int len, domid_t domid, bool_t toaddr, + uint64_t pgd3) { - struct domain *dp = get_domain_by_id(domid); - int hyp = (domid == DOMID_IDLE); + DBGP2("gmem:addr:%lx buf:%p len:$%u domid:%d toaddr:%x\n", + addr, buf, len, domid, toaddr); - DBGP2("gmem:addr:%lx buf:%p len:$%d domid:%x toaddr:%x dp:%p\n", - addr, buf, len, domid, toaddr, dp); - if ( hyp ) + if ( domid == DOMID_IDLE ) { if ( toaddr ) - len = __copy_to_user((void *)addr, buf, len); + len = __copy_to_user(addr, buf, len); else - len = __copy_from_user(buf, (void *)addr, len); + len = __copy_from_user(buf, addr, len); } - else if ( dp ) + else { - if ( !dp->is_dying ) /* make sure guest is still there */ - len= dbg_rw_guest_mem(addr, buf, len, dp, toaddr, pgd3); - put_domain(dp); + struct domain *d = get_domain_by_id(domid); + + if ( d ) + { + if ( !d->is_dying ) + len = dbg_rw_guest_mem(d, addr, buf, len, toaddr, pgd3); + put_domain(d); + } } DBGP2("gmem:exit:len:$%d\n", len); diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e9f76d0..1d3854f 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -37,14 +37,14 @@ #include #include -static int gdbsx_guest_mem_io( - domid_t domid, struct xen_domctl_gdbsx_memio *iop) +static int gdbsx_guest_mem_io(domid_t domid, struct xen_domctl_gdbsx_memio *iop) { - ulong l_uva = (ulong)iop->uva; - iop->remain = dbg_rw_mem( - (dbgva_t)iop->gva, (dbgbyte_t *)l_uva, iop->len, domid, - iop->gwr, iop->pgd3val); - return (iop->remain ? -EFAULT : 0); + void * __user gva = (void *)iop->gva, * __user uva = (void *)iop->uva; + + iop->remain = dbg_rw_mem(gva, uva, iop->len, domid, + !!iop->gwr, iop->pgd3val); + + return iop->remain ? -EFAULT : 0; } #define MAX_IOPORTS 0x10000 diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h index 0408bec..33f4700 100644 --- a/xen/include/asm-x86/debugger.h +++ b/xen/include/asm-x86/debugger.h @@ -82,9 +82,8 @@ static inline int debugger_trap_entry( return 0; } -typedef unsigned long dbgva_t; -typedef unsigned char dbgbyte_t; -extern int dbg_rw_mem(dbgva_t addr, dbgbyte_t *buf, int len, - domid_t domid, int toaddr, uint64_t pgd3); +unsigned int dbg_rw_mem(void * __user addr, void * __user buf, + unsigned int len, domid_t domid, bool_t toaddr, + uint64_t pgd3); #endif /* __X86_DEBUGGER_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 Jun 06 06:36:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17iI-0004tF-7O; Sat, 06 Jun 2015 06:36:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iH-0004t2-8q for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:13 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 83/BD-31258-CD492755; Sat, 06 Jun 2015 06:36:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433572571!20843112!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25569 invoked from network); 6 Jun 2015 06:36:11 -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; 6 Jun 2015 06:36:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iE-0006Zf-RG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17iE-0007Ed-PU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:10 +0000 Date: Sat, 06 Jun 2015 06:36:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/memcpy: reduce code 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 5e4a6f5473f86423f35425ee0e063398422f7af2 Author: Andrew Cooper AuthorDate: Wed Jun 3 09:28:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:28:05 2015 +0200 x86/memcpy: reduce code size 'n % BYTES_PER_LONG' is at most 7, and doesn't need a 64bit register mov. Signed-off-by: Andrew Cooper --- xen/arch/x86/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/string.c b/xen/arch/x86/string.c index 3af0ea8..043ae66 100644 --- a/xen/arch/x86/string.c +++ b/xen/arch/x86/string.c @@ -15,7 +15,7 @@ void *memcpy(void *dest, const void *src, size_t n) asm volatile ( " rep ; movs"__OS" ; " - " mov %4,%3 ; " + " mov %k4,%k3 ; " " rep ; movsb " : "=&c" (d0), "=&D" (d1), "=&S" (d2) : "0" (n/BYTES_PER_LONG), "r" (n%BYTES_PER_LONG), "1" (dest), "2" (src) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17iI-0004tF-7O; Sat, 06 Jun 2015 06:36:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iH-0004t2-8q for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:13 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 83/BD-31258-CD492755; Sat, 06 Jun 2015 06:36:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433572571!20843112!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25569 invoked from network); 6 Jun 2015 06:36:11 -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; 6 Jun 2015 06:36:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iE-0006Zf-RG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17iE-0007Ed-PU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:10 +0000 Date: Sat, 06 Jun 2015 06:36:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/memcpy: reduce code 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 5e4a6f5473f86423f35425ee0e063398422f7af2 Author: Andrew Cooper AuthorDate: Wed Jun 3 09:28:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 3 09:28:05 2015 +0200 x86/memcpy: reduce code size 'n % BYTES_PER_LONG' is at most 7, and doesn't need a 64bit register mov. Signed-off-by: Andrew Cooper --- xen/arch/x86/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/string.c b/xen/arch/x86/string.c index 3af0ea8..043ae66 100644 --- a/xen/arch/x86/string.c +++ b/xen/arch/x86/string.c @@ -15,7 +15,7 @@ void *memcpy(void *dest, const void *src, size_t n) asm volatile ( " rep ; movs"__OS" ; " - " mov %4,%3 ; " + " mov %k4,%k3 ; " " rep ; movsb " : "=&c" (d0), "=&D" (d1), "=&S" (d2) : "0" (n/BYTES_PER_LONG), "r" (n%BYTES_PER_LONG), "1" (dest), "2" (src) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17iS-0004uu-9q; Sat, 06 Jun 2015 06:36:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iR-0004ui-A9 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:23 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 4F/C3-01139-6E492755; Sat, 06 Jun 2015 06:36:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1433572581!12258625!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5819 invoked from network); 6 Jun 2015 06:36:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:36:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iP-0006Zl-0m for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17iO-0007FK-V1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:20 +0000 Date: Sat, 06 Jun 2015 06:36:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: install into sbin X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4ab16365e0c57aaf74e61b4a829162d19b5e87d Author: Olaf Hering AuthorDate: Sat May 23 08:24:10 2015 +0000 Commit: Ian Campbell CommitDate: Wed Jun 3 10:42:39 2015 +0100 xentrace: install into sbin Collecting the trace buffer requires root permissions. Adjust Makefile to install xentrace and xentrace_setsize into sbindir. Leave the existing support for BIN in place for upcoming changes. Signed-off-by: Olaf Hering Cc: George Dunlap Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu Acked-by: George Dunlap --- tools/xentrace/Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 8b80541..5360960 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -6,7 +6,8 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) -BIN = xentrace xentrace_setsize +BIN = +SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format MAN1 = $(wildcard *.1) @@ -16,15 +17,16 @@ MAN8 = $(wildcard *.8) all: build .PHONY: build -build: $(BIN) $(LIBBIN) +build: $(BIN) $(SBIN) $(LIBBIN) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) + $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) @@ -32,7 +34,7 @@ install: build .PHONY: clean clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) $(DEPS) + $(RM) *.a *.so *.o *.rpm $(BIN) $(SBIN) $(LIBBIN) $(DEPS) .PHONY: distclean distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17iS-0004uu-9q; Sat, 06 Jun 2015 06:36:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iR-0004ui-A9 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:23 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 4F/C3-01139-6E492755; Sat, 06 Jun 2015 06:36:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1433572581!12258625!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5819 invoked from network); 6 Jun 2015 06:36:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:36:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iP-0006Zl-0m for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17iO-0007FK-V1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:20 +0000 Date: Sat, 06 Jun 2015 06:36:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: install into sbin X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4ab16365e0c57aaf74e61b4a829162d19b5e87d Author: Olaf Hering AuthorDate: Sat May 23 08:24:10 2015 +0000 Commit: Ian Campbell CommitDate: Wed Jun 3 10:42:39 2015 +0100 xentrace: install into sbin Collecting the trace buffer requires root permissions. Adjust Makefile to install xentrace and xentrace_setsize into sbindir. Leave the existing support for BIN in place for upcoming changes. Signed-off-by: Olaf Hering Cc: George Dunlap Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu Acked-by: George Dunlap --- tools/xentrace/Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 8b80541..5360960 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -6,7 +6,8 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) -BIN = xentrace xentrace_setsize +BIN = +SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format MAN1 = $(wildcard *.1) @@ -16,15 +17,16 @@ MAN8 = $(wildcard *.8) all: build .PHONY: build -build: $(BIN) $(LIBBIN) +build: $(BIN) $(SBIN) $(LIBBIN) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) + $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) @@ -32,7 +34,7 @@ install: build .PHONY: clean clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) $(DEPS) + $(RM) *.a *.so *.o *.rpm $(BIN) $(SBIN) $(LIBBIN) $(DEPS) .PHONY: distclean distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17ic-00057L-CL; Sat, 06 Jun 2015 06:36:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ib-00055q-Lr for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:33 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 2D/FF-31880-1F492755; Sat, 06 Jun 2015 06:36:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433572591!12218821!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28779 invoked from network); 6 Jun 2015 06:36:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:36:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iZ-0006Zt-9Q for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17iZ-0007GX-5M for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:31 +0000 Date: Sat, 06 Jun 2015 06:36:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask/policy: updates from osstest runs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f835b64cf7425d7f1527ef2b4a9d8c171115137 Author: Daniel De Graaf AuthorDate: Tue May 26 14:13:27 2015 -0400 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:01 2015 +0100 flask/policy: updates from osstest runs Migration and HVM domain creation both trigger AVC denials that should be allowed in the default policy; add these rules. Guest console writes need to be either allowed or denied without audit depending on the decision of the local administrator; introduce a policy boolean to switch between these possibilities. Reported-by: Wei Liu Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- tools/flask/policy/policy/modules/xen/xen.if | 2 ++ tools/flask/policy/policy/modules/xen/xen.te | 10 ++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index 620d151..f4cde11 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -9,6 +9,7 @@ define(`declare_domain_common', ` allow $1 $2:grant { query setup }; allow $1 $2:mmu { adjust physmap map_read map_write stat pinpage updatemp mmuext_op }; allow $1 $2:hvm { getparam setparam }; + allow $1 $2:domain2 get_vnumainfo; ') # declare_domain(type, attrs...) @@ -95,6 +96,7 @@ define(`migrate_domain_out', ` allow $1 $2:mmu { stat pageinfo map_read }; allow $1 $2:domain { getaddrsize getvcpucontext getextvcpucontext getvcpuextstate pause destroy }; allow $1 $2:domain2 gettsc; + allow $1 $2:shadow { enable disable logdirty }; ') ################################################################################ diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index ce70639..51f59c5 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -117,6 +117,16 @@ domain_comms(dom0_t, dom0_t) # Allow all domains to use (unprivileged parts of) the tmem hypercall allow domain_type xen_t:xen tmem_op; +# Allow guest console output to the serial console. This is used by PV Linux +# and stub domains for early boot output, so don't audit even when we deny it. +# Without XSM, this is enabled only if the Xen was compiled in debug mode. +gen_bool(guest_writeconsole, true) +if (guest_writeconsole) { + allow domain_type xen_t : xen writeconsole; +} else { + dontaudit domain_type xen_t : xen writeconsole; +} + ############################################################################### # # Domain creation -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17ic-00057L-CL; Sat, 06 Jun 2015 06:36:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ib-00055q-Lr for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:33 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 2D/FF-31880-1F492755; Sat, 06 Jun 2015 06:36:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433572591!12218821!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28779 invoked from network); 6 Jun 2015 06:36:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2015 06:36:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iZ-0006Zt-9Q for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17iZ-0007GX-5M for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:31 +0000 Date: Sat, 06 Jun 2015 06:36:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask/policy: updates from osstest runs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f835b64cf7425d7f1527ef2b4a9d8c171115137 Author: Daniel De Graaf AuthorDate: Tue May 26 14:13:27 2015 -0400 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:01 2015 +0100 flask/policy: updates from osstest runs Migration and HVM domain creation both trigger AVC denials that should be allowed in the default policy; add these rules. Guest console writes need to be either allowed or denied without audit depending on the decision of the local administrator; introduce a policy boolean to switch between these possibilities. Reported-by: Wei Liu Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- tools/flask/policy/policy/modules/xen/xen.if | 2 ++ tools/flask/policy/policy/modules/xen/xen.te | 10 ++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index 620d151..f4cde11 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -9,6 +9,7 @@ define(`declare_domain_common', ` allow $1 $2:grant { query setup }; allow $1 $2:mmu { adjust physmap map_read map_write stat pinpage updatemp mmuext_op }; allow $1 $2:hvm { getparam setparam }; + allow $1 $2:domain2 get_vnumainfo; ') # declare_domain(type, attrs...) @@ -95,6 +96,7 @@ define(`migrate_domain_out', ` allow $1 $2:mmu { stat pageinfo map_read }; allow $1 $2:domain { getaddrsize getvcpucontext getextvcpucontext getvcpuextstate pause destroy }; allow $1 $2:domain2 gettsc; + allow $1 $2:shadow { enable disable logdirty }; ') ################################################################################ diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index ce70639..51f59c5 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -117,6 +117,16 @@ domain_comms(dom0_t, dom0_t) # Allow all domains to use (unprivileged parts of) the tmem hypercall allow domain_type xen_t:xen tmem_op; +# Allow guest console output to the serial console. This is used by PV Linux +# and stub domains for early boot output, so don't audit even when we deny it. +# Without XSM, this is enabled only if the Xen was compiled in debug mode. +gen_bool(guest_writeconsole, true) +if (guest_writeconsole) { + allow domain_type xen_t : xen writeconsole; +} else { + dontaudit domain_type xen_t : xen writeconsole; +} + ############################################################################### # # Domain creation -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17in-0005PS-Hq; Sat, 06 Jun 2015 06:36:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17im-0005Jm-1p for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:44 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id BA/38-23832-BF492755; Sat, 06 Jun 2015 06:36:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1433572601!13615907!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31101 invoked from network); 6 Jun 2015 06:36:42 -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; 6 Jun 2015 06:36:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ij-0006Zz-HI for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17ij-0007HG-GF for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:41 +0000 Date: Sat, 06 Jun 2015 06:36:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/flask: change bool_maxstr to PAGE_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 50daa79c58af69cc0ce8a92f46f829003f11727d Author: Daniel De Graaf AuthorDate: Tue May 26 14:13:28 2015 -0400 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:01 2015 +0100 xen/flask: change bool_maxstr to PAGE_SIZE When FLASK_{GET,SET}BOOL is called with a named boolean, the call to flask_security_resolve_bool is made prior to bool_maxstr being populated by flask_security_make_bools. This results in the maximum string length being specified as zero, which is not useful. While it would be possible to initialize bool_maxstr correctly prior to its use, it is simpler to use a fixed maximum of PAGE_SIZE as is done for the other calls to safe_copy_string_from_guest. Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 8dee021..f4f5dd1 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -55,7 +55,6 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; -static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -318,7 +317,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - name = safe_copy_string_from_guest(arg->name, arg->size, bool_maxstr); + name = safe_copy_string_from_guest(arg->name, arg->size, PAGE_SIZE); if ( IS_ERR(name) ) return PTR_ERR(name); @@ -459,7 +458,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values, &bool_maxstr); + ret = security_get_bools(&num, NULL, &values, NULL); if ( ret != 0 ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17in-0005PS-Hq; Sat, 06 Jun 2015 06:36:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17im-0005Jm-1p for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:44 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id BA/38-23832-BF492755; Sat, 06 Jun 2015 06:36:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1433572601!13615907!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31101 invoked from network); 6 Jun 2015 06:36:42 -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; 6 Jun 2015 06:36:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ij-0006Zz-HI for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17ij-0007HG-GF for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:41 +0000 Date: Sat, 06 Jun 2015 06:36:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/flask: change bool_maxstr to PAGE_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 50daa79c58af69cc0ce8a92f46f829003f11727d Author: Daniel De Graaf AuthorDate: Tue May 26 14:13:28 2015 -0400 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:01 2015 +0100 xen/flask: change bool_maxstr to PAGE_SIZE When FLASK_{GET,SET}BOOL is called with a named boolean, the call to flask_security_resolve_bool is made prior to bool_maxstr being populated by flask_security_make_bools. This results in the maximum string length being specified as zero, which is not useful. While it would be possible to initialize bool_maxstr correctly prior to its use, it is simpler to use a fixed maximum of PAGE_SIZE as is done for the other calls to safe_copy_string_from_guest. Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 8dee021..f4f5dd1 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -55,7 +55,6 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; -static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -318,7 +317,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - name = safe_copy_string_from_guest(arg->name, arg->size, bool_maxstr); + name = safe_copy_string_from_guest(arg->name, arg->size, PAGE_SIZE); if ( IS_ERR(name) ) return PTR_ERR(name); @@ -459,7 +458,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values, &bool_maxstr); + ret = security_get_bools(&num, NULL, &values, NULL); if ( ret != 0 ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17ix-0005Uz-KR; Sat, 06 Jun 2015 06:36:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iw-0005Uo-87 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:54 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 53/41-03895-50592755; Sat, 06 Jun 2015 06:36:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433572611!12414841!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29113 invoked from network); 6 Jun 2015 06:36:52 -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; 6 Jun 2015 06:36:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17it-0006a5-Kt for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17it-0007Hx-K1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:51 +0000 Date: Sat, 06 Jun 2015 06:36:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add missing xc_hypercall_bounce_pre calls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e43e19fb3ca68b1a2a320d339a53c2007909f9b Author: Daniel De Graaf AuthorDate: Tue May 26 14:13:29 2015 -0400 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:01 2015 +0100 libxc: add missing xc_hypercall_bounce_pre calls Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- tools/libxc/xc_flask.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_flask.c b/tools/libxc/xc_flask.c index bb117f7..e24a2e7 100644 --- a/tools/libxc/xc_flask.c +++ b/tools/libxc/xc_flask.c @@ -191,6 +191,12 @@ int xc_flask_getbool_byname(xc_interface *xch, char *name, int *curr, int *pend) DECLARE_FLASK_OP; DECLARE_HYPERCALL_BOUNCE(name, strlen(name), XC_HYPERCALL_BUFFER_BOUNCE_IN); + if ( xc_hypercall_bounce_pre(xch, name) ) + { + PERROR("Could not bounce memory for flask op hypercall"); + return -1; + } + op.cmd = FLASK_GETBOOL; op.u.boolean.bool_id = -1; op.u.boolean.size = strlen(name); @@ -217,6 +223,12 @@ int xc_flask_setbool(xc_interface *xch, char *name, int value, int commit) DECLARE_FLASK_OP; DECLARE_HYPERCALL_BOUNCE(name, strlen(name), XC_HYPERCALL_BUFFER_BOUNCE_IN); + if ( xc_hypercall_bounce_pre(xch, name) ) + { + PERROR("Could not bounce memory for flask op hypercall"); + return -1; + } + op.cmd = FLASK_SETBOOL; op.u.boolean.bool_id = -1; op.u.boolean.new_value = value; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:36:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:36: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 1Z17ix-0005Uz-KR; Sat, 06 Jun 2015 06:36:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17iw-0005Uo-87 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:54 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 53/41-03895-50592755; Sat, 06 Jun 2015 06:36:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433572611!12414841!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29113 invoked from network); 6 Jun 2015 06:36:52 -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; 6 Jun 2015 06:36:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17it-0006a5-Kt for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17it-0007Hx-K1 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:36:51 +0000 Date: Sat, 06 Jun 2015 06:36:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add missing xc_hypercall_bounce_pre calls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e43e19fb3ca68b1a2a320d339a53c2007909f9b Author: Daniel De Graaf AuthorDate: Tue May 26 14:13:29 2015 -0400 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:01 2015 +0100 libxc: add missing xc_hypercall_bounce_pre calls Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- tools/libxc/xc_flask.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_flask.c b/tools/libxc/xc_flask.c index bb117f7..e24a2e7 100644 --- a/tools/libxc/xc_flask.c +++ b/tools/libxc/xc_flask.c @@ -191,6 +191,12 @@ int xc_flask_getbool_byname(xc_interface *xch, char *name, int *curr, int *pend) DECLARE_FLASK_OP; DECLARE_HYPERCALL_BOUNCE(name, strlen(name), XC_HYPERCALL_BUFFER_BOUNCE_IN); + if ( xc_hypercall_bounce_pre(xch, name) ) + { + PERROR("Could not bounce memory for flask op hypercall"); + return -1; + } + op.cmd = FLASK_GETBOOL; op.u.boolean.bool_id = -1; op.u.boolean.size = strlen(name); @@ -217,6 +223,12 @@ int xc_flask_setbool(xc_interface *xch, char *name, int value, int commit) DECLARE_FLASK_OP; DECLARE_HYPERCALL_BOUNCE(name, strlen(name), XC_HYPERCALL_BUFFER_BOUNCE_IN); + if ( xc_hypercall_bounce_pre(xch, name) ) + { + PERROR("Could not bounce memory for flask op hypercall"); + return -1; + } + op.cmd = FLASK_SETBOOL; op.u.boolean.bool_id = -1; op.u.boolean.new_value = value; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:37:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17j7-0005WE-Nz; Sat, 06 Jun 2015 06:37:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17j6-0005W5-A7 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:04 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 1C/58-23832-F0592755; Sat, 06 Jun 2015 06:37:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433572622!13725024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14397 invoked from network); 6 Jun 2015 06:37:03 -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; 6 Jun 2015 06:37:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17j3-0006ak-Vj for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17j3-0007Ia-O5 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:01 +0000 Date: Sat, 06 Jun 2015 06:37:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: traps: Print a message in debug build when a guest dabt is not handled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f91fab5eeab9d97123e29876b1d61dc80b31c6de Author: Julien Grall AuthorDate: Thu May 28 10:10:47 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 xen/arm: traps: Print a message in debug build when a guest dabt is not handled This is useful for debugging low level kernel before the guest as setup the vector table. Note that the value of the IPA is only here for reference and may not always be valid if the error came from a stage 1 table translation walk. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- dropped spurious w/s change ] --- xen/arch/arm/traps.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 47d6cef..258d4c5 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2413,6 +2413,8 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, } bad_data_abort: + gdprintk(XENLOG_DEBUG, "HSR=0x%x pc=%#"PRIregister" gva=%#"PRIvaddr + " gpa=%#"PRIpaddr"\n", hsr.bits, regs->pc, info.gva, info.gpa); inject_dabt_exception(regs, info.gva, hsr.len); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:37:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17j7-0005WE-Nz; Sat, 06 Jun 2015 06:37:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17j6-0005W5-A7 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:04 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 1C/58-23832-F0592755; Sat, 06 Jun 2015 06:37:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433572622!13725024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14397 invoked from network); 6 Jun 2015 06:37:03 -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; 6 Jun 2015 06:37:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17j3-0006ak-Vj for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17j3-0007Ia-O5 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:01 +0000 Date: Sat, 06 Jun 2015 06:37:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: traps: Print a message in debug build when a guest dabt is not handled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f91fab5eeab9d97123e29876b1d61dc80b31c6de Author: Julien Grall AuthorDate: Thu May 28 10:10:47 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 xen/arm: traps: Print a message in debug build when a guest dabt is not handled This is useful for debugging low level kernel before the guest as setup the vector table. Note that the value of the IPA is only here for reference and may not always be valid if the error came from a stage 1 table translation walk. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- dropped spurious w/s change ] --- xen/arch/arm/traps.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 47d6cef..258d4c5 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2413,6 +2413,8 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, } bad_data_abort: + gdprintk(XENLOG_DEBUG, "HSR=0x%x pc=%#"PRIregister" gva=%#"PRIvaddr + " gpa=%#"PRIpaddr"\n", hsr.bits, regs->pc, info.gva, info.gpa); inject_dabt_exception(regs, info.gva, hsr.len); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:37:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jI-0005Xh-QY; Sat, 06 Jun 2015 06:37:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jH-0005XV-29 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:15 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id E9/5B-06457-A1592755; Sat, 06 Jun 2015 06:37:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433572632!11238020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17491 invoked from network); 6 Jun 2015 06:37:13 -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; 6 Jun 2015 06:37:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jE-0006aq-8m for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17jE-0007JT-7P for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:12 +0000 Date: Sat, 06 Jun 2015 06:37:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/libxl: fill xc_hvm_build_args in 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 5dff8e9eedc79da02eba29aa9aacb4103622690e Author: Wei Liu AuthorDate: Mon Jun 1 11:19:11 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxc/libxl: fill xc_hvm_build_args in libxl When building HVM guests, originally some fields of xc_hvm_build_args are filled in xc_hvm_build (and buried in the wrong function), some are set in libxl__build_hvm before passing xc_hvm_build_args to xc_hvm_build. This is fragile. After examining the code in xc_hvm_build that sets those fields, we can in fact move setting of mmio_start etc in libxl. This way we consolidate memory layout setting in libxl. The setting of firmware data related fields is left in xc_hvm_build because it depends on parsing ELF image. Those fields only point to scratch data that doesn't affect memory layout. There should be no change in the generated guest memory layout. But the semantic is changed for xc_hvm_build. Toolstack that built directly on top of libxc need to adjust to this change. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: "Chen, Tiejun" Cc: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 37 +++++++------------------------------ tools/libxl/libxl_dom.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index e45ae4a..92422bf 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -88,22 +88,14 @@ static int modules_init(struct xc_hvm_build_args *args, return 0; } -static void build_hvm_info(void *hvm_info_page, uint64_t mem_size, - uint64_t mmio_start, uint64_t mmio_size, +static void build_hvm_info(void *hvm_info_page, struct xc_hvm_build_args *args) { struct hvm_info_table *hvm_info = (struct hvm_info_table *) (((unsigned char *)hvm_info_page) + HVM_INFO_OFFSET); - uint64_t lowmem_end = mem_size, highmem_end = 0; uint8_t sum; int i; - if ( lowmem_end > mmio_start ) - { - highmem_end = (1ull<<32) + (lowmem_end - mmio_start); - lowmem_end = mmio_start; - } - memset(hvm_info_page, 0, PAGE_SIZE); /* Fill in the header. */ @@ -116,14 +108,10 @@ static void build_hvm_info(void *hvm_info_page, uint64_t mem_size, memset(hvm_info->vcpu_online, 0xff, sizeof(hvm_info->vcpu_online)); /* Memory parameters. */ - hvm_info->low_mem_pgend = lowmem_end >> PAGE_SHIFT; - hvm_info->high_mem_pgend = highmem_end >> PAGE_SHIFT; + hvm_info->low_mem_pgend = args->lowmem_end >> PAGE_SHIFT; + hvm_info->high_mem_pgend = args->highmem_end >> PAGE_SHIFT; hvm_info->reserved_mem_pgstart = ioreq_server_pfn(0); - args->lowmem_end = lowmem_end; - args->highmem_end = highmem_end; - args->mmio_start = mmio_start; - /* Finish with the checksum. */ for ( i = 0, sum = 0; i < hvm_info->length; i++ ) sum += ((uint8_t *)hvm_info)[i]; @@ -251,8 +239,6 @@ static int setup_guest(xc_interface *xch, xen_pfn_t *page_array = NULL; unsigned long i, vmemid, nr_pages = args->mem_size >> PAGE_SHIFT; unsigned long target_pages = args->mem_target >> PAGE_SHIFT; - uint64_t mmio_start = (1ull << 32) - args->mmio_size; - uint64_t mmio_size = args->mmio_size; unsigned long entry_eip, cur_pages, cur_pfn; void *hvm_info_page; uint32_t *ident_pt; @@ -344,8 +330,8 @@ static int setup_guest(xc_interface *xch, for ( i = 0; i < nr_pages; i++ ) page_array[i] = i; - for ( i = mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) - page_array[i] += mmio_size >> PAGE_SHIFT; + for ( i = args->mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) + page_array[i] += args->mmio_size >> PAGE_SHIFT; /* * Try to claim pages for early warning of insufficient memory available. @@ -446,7 +432,7 @@ static int setup_guest(xc_interface *xch, * range */ !check_mmio_hole(cur_pfn << PAGE_SHIFT, SUPERPAGE_1GB_NR_PFNS << PAGE_SHIFT, - mmio_start, mmio_size) ) + args->mmio_start, args->mmio_size) ) { long done; unsigned long nr_extents = count >> SUPERPAGE_1GB_SHIFT; @@ -545,7 +531,7 @@ static int setup_guest(xc_interface *xch, xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, HVM_INFO_PFN)) == NULL ) goto error_out; - build_hvm_info(hvm_info_page, v_end, mmio_start, mmio_size, args); + build_hvm_info(hvm_info_page, args); munmap(hvm_info_page, PAGE_SIZE); /* Allocate and clear special pages. */ @@ -661,12 +647,6 @@ int xc_hvm_build(xc_interface *xch, uint32_t domid, if ( args.image_file_name == NULL ) return -1; - if ( args.mem_target == 0 ) - args.mem_target = args.mem_size; - - if ( args.mmio_size == 0 ) - args.mmio_size = HVM_BELOW_4G_MMIO_LENGTH; - /* An HVM guest must be initialised with at least 2MB memory. */ if ( args.mem_size < (2ull << 20) || args.mem_target < (2ull << 20) ) return -1; @@ -684,9 +664,6 @@ int xc_hvm_build(xc_interface *xch, uint32_t domid, args.acpi_module.guest_addr_out; hvm_args->smbios_module.guest_addr_out = args.smbios_module.guest_addr_out; - hvm_args->lowmem_end = args.lowmem_end; - hvm_args->highmem_end = args.highmem_end; - hvm_args->mmio_start = args.mmio_start; } free(image); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a0c9850..dccc9ac 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -920,6 +920,7 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_ctx *ctx = libxl__gc_owner(gc); struct xc_hvm_build_args args = {}; int ret, rc = ERROR_FAIL; + uint64_t mmio_start, lowmem_end, highmem_end; memset(&args, 0, sizeof(struct xc_hvm_build_args)); /* The params from the configuration file are in Mb, which are then @@ -941,6 +942,21 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, LOG(ERROR, "initializing domain firmware failed"); goto out; } + if (args.mem_target == 0) + args.mem_target = args.mem_size; + if (args.mmio_size == 0) + args.mmio_size = HVM_BELOW_4G_MMIO_LENGTH; + lowmem_end = args.mem_size; + highmem_end = 0; + mmio_start = (1ull << 32) - args.mmio_size; + if (lowmem_end > mmio_start) + { + highmem_end = (1ull << 32) + (lowmem_end - mmio_start); + lowmem_end = mmio_start; + } + args.lowmem_end = lowmem_end; + args.highmem_end = highmem_end; + args.mmio_start = mmio_start; if (info->num_vnuma_nodes != 0) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:37:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jI-0005Xh-QY; Sat, 06 Jun 2015 06:37:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jH-0005XV-29 for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:15 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id E9/5B-06457-A1592755; Sat, 06 Jun 2015 06:37:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433572632!11238020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17491 invoked from network); 6 Jun 2015 06:37:13 -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; 6 Jun 2015 06:37:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jE-0006aq-8m for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17jE-0007JT-7P for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:12 +0000 Date: Sat, 06 Jun 2015 06:37:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/libxl: fill xc_hvm_build_args in 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 5dff8e9eedc79da02eba29aa9aacb4103622690e Author: Wei Liu AuthorDate: Mon Jun 1 11:19:11 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxc/libxl: fill xc_hvm_build_args in libxl When building HVM guests, originally some fields of xc_hvm_build_args are filled in xc_hvm_build (and buried in the wrong function), some are set in libxl__build_hvm before passing xc_hvm_build_args to xc_hvm_build. This is fragile. After examining the code in xc_hvm_build that sets those fields, we can in fact move setting of mmio_start etc in libxl. This way we consolidate memory layout setting in libxl. The setting of firmware data related fields is left in xc_hvm_build because it depends on parsing ELF image. Those fields only point to scratch data that doesn't affect memory layout. There should be no change in the generated guest memory layout. But the semantic is changed for xc_hvm_build. Toolstack that built directly on top of libxc need to adjust to this change. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: "Chen, Tiejun" Cc: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 37 +++++++------------------------------ tools/libxl/libxl_dom.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index e45ae4a..92422bf 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -88,22 +88,14 @@ static int modules_init(struct xc_hvm_build_args *args, return 0; } -static void build_hvm_info(void *hvm_info_page, uint64_t mem_size, - uint64_t mmio_start, uint64_t mmio_size, +static void build_hvm_info(void *hvm_info_page, struct xc_hvm_build_args *args) { struct hvm_info_table *hvm_info = (struct hvm_info_table *) (((unsigned char *)hvm_info_page) + HVM_INFO_OFFSET); - uint64_t lowmem_end = mem_size, highmem_end = 0; uint8_t sum; int i; - if ( lowmem_end > mmio_start ) - { - highmem_end = (1ull<<32) + (lowmem_end - mmio_start); - lowmem_end = mmio_start; - } - memset(hvm_info_page, 0, PAGE_SIZE); /* Fill in the header. */ @@ -116,14 +108,10 @@ static void build_hvm_info(void *hvm_info_page, uint64_t mem_size, memset(hvm_info->vcpu_online, 0xff, sizeof(hvm_info->vcpu_online)); /* Memory parameters. */ - hvm_info->low_mem_pgend = lowmem_end >> PAGE_SHIFT; - hvm_info->high_mem_pgend = highmem_end >> PAGE_SHIFT; + hvm_info->low_mem_pgend = args->lowmem_end >> PAGE_SHIFT; + hvm_info->high_mem_pgend = args->highmem_end >> PAGE_SHIFT; hvm_info->reserved_mem_pgstart = ioreq_server_pfn(0); - args->lowmem_end = lowmem_end; - args->highmem_end = highmem_end; - args->mmio_start = mmio_start; - /* Finish with the checksum. */ for ( i = 0, sum = 0; i < hvm_info->length; i++ ) sum += ((uint8_t *)hvm_info)[i]; @@ -251,8 +239,6 @@ static int setup_guest(xc_interface *xch, xen_pfn_t *page_array = NULL; unsigned long i, vmemid, nr_pages = args->mem_size >> PAGE_SHIFT; unsigned long target_pages = args->mem_target >> PAGE_SHIFT; - uint64_t mmio_start = (1ull << 32) - args->mmio_size; - uint64_t mmio_size = args->mmio_size; unsigned long entry_eip, cur_pages, cur_pfn; void *hvm_info_page; uint32_t *ident_pt; @@ -344,8 +330,8 @@ static int setup_guest(xc_interface *xch, for ( i = 0; i < nr_pages; i++ ) page_array[i] = i; - for ( i = mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) - page_array[i] += mmio_size >> PAGE_SHIFT; + for ( i = args->mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) + page_array[i] += args->mmio_size >> PAGE_SHIFT; /* * Try to claim pages for early warning of insufficient memory available. @@ -446,7 +432,7 @@ static int setup_guest(xc_interface *xch, * range */ !check_mmio_hole(cur_pfn << PAGE_SHIFT, SUPERPAGE_1GB_NR_PFNS << PAGE_SHIFT, - mmio_start, mmio_size) ) + args->mmio_start, args->mmio_size) ) { long done; unsigned long nr_extents = count >> SUPERPAGE_1GB_SHIFT; @@ -545,7 +531,7 @@ static int setup_guest(xc_interface *xch, xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, HVM_INFO_PFN)) == NULL ) goto error_out; - build_hvm_info(hvm_info_page, v_end, mmio_start, mmio_size, args); + build_hvm_info(hvm_info_page, args); munmap(hvm_info_page, PAGE_SIZE); /* Allocate and clear special pages. */ @@ -661,12 +647,6 @@ int xc_hvm_build(xc_interface *xch, uint32_t domid, if ( args.image_file_name == NULL ) return -1; - if ( args.mem_target == 0 ) - args.mem_target = args.mem_size; - - if ( args.mmio_size == 0 ) - args.mmio_size = HVM_BELOW_4G_MMIO_LENGTH; - /* An HVM guest must be initialised with at least 2MB memory. */ if ( args.mem_size < (2ull << 20) || args.mem_target < (2ull << 20) ) return -1; @@ -684,9 +664,6 @@ int xc_hvm_build(xc_interface *xch, uint32_t domid, args.acpi_module.guest_addr_out; hvm_args->smbios_module.guest_addr_out = args.smbios_module.guest_addr_out; - hvm_args->lowmem_end = args.lowmem_end; - hvm_args->highmem_end = args.highmem_end; - hvm_args->mmio_start = args.mmio_start; } free(image); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a0c9850..dccc9ac 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -920,6 +920,7 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_ctx *ctx = libxl__gc_owner(gc); struct xc_hvm_build_args args = {}; int ret, rc = ERROR_FAIL; + uint64_t mmio_start, lowmem_end, highmem_end; memset(&args, 0, sizeof(struct xc_hvm_build_args)); /* The params from the configuration file are in Mb, which are then @@ -941,6 +942,21 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, LOG(ERROR, "initializing domain firmware failed"); goto out; } + if (args.mem_target == 0) + args.mem_target = args.mem_size; + if (args.mmio_size == 0) + args.mmio_size = HVM_BELOW_4G_MMIO_LENGTH; + lowmem_end = args.mem_size; + highmem_end = 0; + mmio_start = (1ull << 32) - args.mmio_size; + if (lowmem_end > mmio_start) + { + highmem_end = (1ull << 32) + (lowmem_end - mmio_start); + lowmem_end = mmio_start; + } + args.lowmem_end = lowmem_end; + args.highmem_end = highmem_end; + args.mmio_start = mmio_start; if (info->num_vnuma_nodes != 0) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:37:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jS-0005ZD-T6; Sat, 06 Jun 2015 06:37:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jR-0005Z2-Lx for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:25 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 26/E7-18947-52592755; Sat, 06 Jun 2015 06:37:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1433572642!20849055!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5468 invoked from network); 6 Jun 2015 06:37:23 -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; 6 Jun 2015 06:37:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jO-0006aw-CU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17jO-0007KE-Ba for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:22 +0000 Date: Sat, 06 Jun 2015 06:37:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: print more error messages when 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 c5e976dfe58403d26f9d9cd3d50cee3705a53f4d Author: Wei Liu AuthorDate: Mon Jun 1 11:19:12 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxc: print more error messages when failed No functional changes introduced. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index 92422bf..df4b7ed 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -259,7 +259,10 @@ static int setup_guest(xc_interface *xch, memset(&elf, 0, sizeof(elf)); if ( elf_init(&elf, image, image_size) != 0 ) + { + PERROR("Could not initialise ELF image"); goto error_out; + } xc_elf_set_logfile(xch, &elf, 1); @@ -522,15 +525,24 @@ static int setup_guest(xc_interface *xch, DPRINTF(" 1GB PAGES: 0x%016lx\n", stat_1gb_pages); if ( loadelfimage(xch, &elf, dom, page_array) != 0 ) + { + PERROR("Could not load ELF image"); goto error_out; + } if ( loadmodules(xch, args, m_start, m_end, dom, page_array) != 0 ) - goto error_out; + { + PERROR("Could not load ACPI modules"); + goto error_out; + } if ( (hvm_info_page = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, HVM_INFO_PFN)) == NULL ) + { + PERROR("Could not map hvm info page"); goto error_out; + } build_hvm_info(hvm_info_page, args); munmap(hvm_info_page, PAGE_SIZE); @@ -547,7 +559,10 @@ static int setup_guest(xc_interface *xch, } if ( xc_clear_domain_pages(xch, dom, special_pfn(0), NR_SPECIAL_PAGES) ) - goto error_out; + { + PERROR("Could not clear special pages"); + goto error_out; + } xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_PFN, special_pfn(SPECIALPAGE_XENSTORE)); @@ -580,7 +595,10 @@ static int setup_guest(xc_interface *xch, } if ( xc_clear_domain_pages(xch, dom, ioreq_server_pfn(0), NR_IOREQ_SERVER_PAGES) ) - goto error_out; + { + PERROR("Could not clear ioreq page"); + goto error_out; + } /* Tell the domain where the pages are and how many there are */ xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, @@ -595,7 +613,10 @@ static int setup_guest(xc_interface *xch, if ( (ident_pt = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, special_pfn(SPECIALPAGE_IDENT_PT))) == NULL ) + { + PERROR("Could not map special page ident_pt"); goto error_out; + } for ( i = 0; i < PAGE_SIZE / sizeof(*ident_pt); i++ ) ident_pt[i] = ((i << 22) | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_PSE); @@ -610,7 +631,10 @@ static int setup_guest(xc_interface *xch, char *page0 = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, 0); if ( page0 == NULL ) + { + PERROR("Could not map page0"); goto error_out; + } page0[0] = 0xe9; *(uint32_t *)&page0[1] = entry_eip - 5; munmap(page0, 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 Sat Jun 06 06:37:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jS-0005ZD-T6; Sat, 06 Jun 2015 06:37:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jR-0005Z2-Lx for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:25 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 26/E7-18947-52592755; Sat, 06 Jun 2015 06:37:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1433572642!20849055!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5468 invoked from network); 6 Jun 2015 06:37:23 -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; 6 Jun 2015 06:37:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jO-0006aw-CU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17jO-0007KE-Ba for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:22 +0000 Date: Sat, 06 Jun 2015 06:37:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: print more error messages when 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 c5e976dfe58403d26f9d9cd3d50cee3705a53f4d Author: Wei Liu AuthorDate: Mon Jun 1 11:19:12 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxc: print more error messages when failed No functional changes introduced. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index 92422bf..df4b7ed 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -259,7 +259,10 @@ static int setup_guest(xc_interface *xch, memset(&elf, 0, sizeof(elf)); if ( elf_init(&elf, image, image_size) != 0 ) + { + PERROR("Could not initialise ELF image"); goto error_out; + } xc_elf_set_logfile(xch, &elf, 1); @@ -522,15 +525,24 @@ static int setup_guest(xc_interface *xch, DPRINTF(" 1GB PAGES: 0x%016lx\n", stat_1gb_pages); if ( loadelfimage(xch, &elf, dom, page_array) != 0 ) + { + PERROR("Could not load ELF image"); goto error_out; + } if ( loadmodules(xch, args, m_start, m_end, dom, page_array) != 0 ) - goto error_out; + { + PERROR("Could not load ACPI modules"); + goto error_out; + } if ( (hvm_info_page = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, HVM_INFO_PFN)) == NULL ) + { + PERROR("Could not map hvm info page"); goto error_out; + } build_hvm_info(hvm_info_page, args); munmap(hvm_info_page, PAGE_SIZE); @@ -547,7 +559,10 @@ static int setup_guest(xc_interface *xch, } if ( xc_clear_domain_pages(xch, dom, special_pfn(0), NR_SPECIAL_PAGES) ) - goto error_out; + { + PERROR("Could not clear special pages"); + goto error_out; + } xc_hvm_param_set(xch, dom, HVM_PARAM_STORE_PFN, special_pfn(SPECIALPAGE_XENSTORE)); @@ -580,7 +595,10 @@ static int setup_guest(xc_interface *xch, } if ( xc_clear_domain_pages(xch, dom, ioreq_server_pfn(0), NR_IOREQ_SERVER_PAGES) ) - goto error_out; + { + PERROR("Could not clear ioreq page"); + goto error_out; + } /* Tell the domain where the pages are and how many there are */ xc_hvm_param_set(xch, dom, HVM_PARAM_IOREQ_SERVER_PFN, @@ -595,7 +613,10 @@ static int setup_guest(xc_interface *xch, if ( (ident_pt = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, special_pfn(SPECIALPAGE_IDENT_PT))) == NULL ) + { + PERROR("Could not map special page ident_pt"); goto error_out; + } for ( i = 0; i < PAGE_SIZE / sizeof(*ident_pt); i++ ) ident_pt[i] = ((i << 22) | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_PSE); @@ -610,7 +631,10 @@ static int setup_guest(xc_interface *xch, char *page0 = xc_map_foreign_range( xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, 0); if ( page0 == NULL ) + { + PERROR("Could not map page0"); goto error_out; + } page0[0] = 0xe9; *(uint32_t *)&page0[1] = entry_eip - 5; munmap(page0, 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 Sat Jun 06 06:37:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jc-0005aa-Vd; Sat, 06 Jun 2015 06:37:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jb-0005aL-Fa for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:35 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 52/49-18676-E2592755; Sat, 06 Jun 2015 06:37:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433572652!20831028!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9409 invoked from network); 6 Jun 2015 06:37:33 -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; 6 Jun 2015 06:37:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jY-0006b4-LI for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17jY-0007LX-FK for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:32 +0000 Date: Sat, 06 Jun 2015 06:37:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: rework vnuma bits in setup_guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10b719dc88300d0a573a1be0954f35e5198703c3 Author: Wei Liu AuthorDate: Mon Jun 1 11:19:13 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxc: rework vnuma bits in setup_guest Make the setup process similar to PV counterpart. That is, to allocate a P2M array that covers the whole memory range and start from there. This is clearer than using an array with no holes in it. Also the dummy layout should take MMIO hole into consideration. We might end up having two vmemranges in the dummy layout. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Reviewed-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 70 +++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index df4b7ed..0e98c84 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -238,6 +238,7 @@ static int setup_guest(xc_interface *xch, { xen_pfn_t *page_array = NULL; unsigned long i, vmemid, nr_pages = args->mem_size >> PAGE_SHIFT; + unsigned long p2m_size; unsigned long target_pages = args->mem_target >> PAGE_SHIFT; unsigned long entry_eip, cur_pages, cur_pfn; void *hvm_info_page; @@ -254,8 +255,9 @@ static int setup_guest(xc_interface *xch, xen_pfn_t special_array[NR_SPECIAL_PAGES]; xen_pfn_t ioreq_server_array[NR_IOREQ_SERVER_PAGES]; uint64_t total_pages; - xen_vmemrange_t dummy_vmemrange; - unsigned int dummy_vnode_to_pnode; + xen_vmemrange_t dummy_vmemrange[2]; + unsigned int dummy_vnode_to_pnode[1]; + bool use_dummy = false; memset(&elf, 0, sizeof(elf)); if ( elf_init(&elf, image, image_size) != 0 ) @@ -275,17 +277,36 @@ static int setup_guest(xc_interface *xch, if ( args->nr_vmemranges == 0 ) { - /* Build dummy vnode information */ - dummy_vmemrange.start = 0; - dummy_vmemrange.end = args->mem_size; - dummy_vmemrange.flags = 0; - dummy_vmemrange.nid = 0; + /* Build dummy vnode information + * + * Guest physical address space layout: + * [0, hole_start) [hole_start, 4G) [4G, highmem_end) + * + * Of course if there is no high memory, the second vmemrange + * has no effect on the actual result. + */ + + dummy_vmemrange[0].start = 0; + dummy_vmemrange[0].end = args->lowmem_end; + dummy_vmemrange[0].flags = 0; + dummy_vmemrange[0].nid = 0; args->nr_vmemranges = 1; - args->vmemranges = &dummy_vmemrange; - dummy_vnode_to_pnode = XC_NUMA_NO_NODE; + if ( args->highmem_end > (1ULL << 32) ) + { + dummy_vmemrange[1].start = 1ULL << 32; + dummy_vmemrange[1].end = args->highmem_end; + dummy_vmemrange[1].flags = 0; + dummy_vmemrange[1].nid = 0; + + args->nr_vmemranges++; + } + + dummy_vnode_to_pnode[0] = XC_NUMA_NO_NODE; args->nr_vnodes = 1; - args->vnode_to_pnode = &dummy_vnode_to_pnode; + args->vmemranges = dummy_vmemrange; + args->vnode_to_pnode = dummy_vnode_to_pnode; + use_dummy = true; } else { @@ -297,9 +318,15 @@ static int setup_guest(xc_interface *xch, } total_pages = 0; + p2m_size = 0; for ( i = 0; i < args->nr_vmemranges; i++ ) + { total_pages += ((args->vmemranges[i].end - args->vmemranges[i].start) >> PAGE_SHIFT); + p2m_size = p2m_size > (args->vmemranges[i].end >> PAGE_SHIFT) ? + p2m_size : (args->vmemranges[i].end >> PAGE_SHIFT); + } + if ( total_pages != (args->mem_size >> PAGE_SHIFT) ) { PERROR("vNUMA memory pages mismatch (0x%"PRIx64" != 0x%"PRIx64")", @@ -325,16 +352,23 @@ static int setup_guest(xc_interface *xch, DPRINTF(" TOTAL: %016"PRIx64"->%016"PRIx64"\n", v_start, v_end); DPRINTF(" ENTRY: %016"PRIx64"\n", elf_uval(&elf, elf.ehdr, e_entry)); - if ( (page_array = malloc(nr_pages * sizeof(xen_pfn_t))) == NULL ) + if ( (page_array = malloc(p2m_size * sizeof(xen_pfn_t))) == NULL ) { PERROR("Could not allocate memory."); goto error_out; } - for ( i = 0; i < nr_pages; i++ ) - page_array[i] = i; - for ( i = args->mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) - page_array[i] += args->mmio_size >> PAGE_SHIFT; + for ( i = 0; i < p2m_size; i++ ) + page_array[i] = ((xen_pfn_t)-1); + for ( vmemid = 0; vmemid < args->nr_vmemranges; vmemid++ ) + { + uint64_t pfn; + + for ( pfn = args->vmemranges[vmemid].start >> PAGE_SHIFT; + pfn < args->vmemranges[vmemid].end >> PAGE_SHIFT; + pfn++ ) + page_array[pfn] = pfn; + } /* * Try to claim pages for early warning of insufficient memory available. @@ -645,6 +679,12 @@ static int setup_guest(xc_interface *xch, error_out: rc = -1; out: + if ( use_dummy ) + { + args->nr_vnodes = 0; + args->vmemranges = NULL; + args->vnode_to_pnode = NULL; + } if ( elf_check_broken(&elf) ) ERROR("HVM ELF broken: %s", elf_check_broken(&elf)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:37:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jc-0005aa-Vd; Sat, 06 Jun 2015 06:37:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jb-0005aL-Fa for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:35 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 52/49-18676-E2592755; Sat, 06 Jun 2015 06:37:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433572652!20831028!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9409 invoked from network); 6 Jun 2015 06:37:33 -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; 6 Jun 2015 06:37:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jY-0006b4-LI for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17jY-0007LX-FK for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:32 +0000 Date: Sat, 06 Jun 2015 06:37:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: rework vnuma bits in setup_guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10b719dc88300d0a573a1be0954f35e5198703c3 Author: Wei Liu AuthorDate: Mon Jun 1 11:19:13 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxc: rework vnuma bits in setup_guest Make the setup process similar to PV counterpart. That is, to allocate a P2M array that covers the whole memory range and start from there. This is clearer than using an array with no holes in it. Also the dummy layout should take MMIO hole into consideration. We might end up having two vmemranges in the dummy layout. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Reviewed-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 70 +++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index df4b7ed..0e98c84 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -238,6 +238,7 @@ static int setup_guest(xc_interface *xch, { xen_pfn_t *page_array = NULL; unsigned long i, vmemid, nr_pages = args->mem_size >> PAGE_SHIFT; + unsigned long p2m_size; unsigned long target_pages = args->mem_target >> PAGE_SHIFT; unsigned long entry_eip, cur_pages, cur_pfn; void *hvm_info_page; @@ -254,8 +255,9 @@ static int setup_guest(xc_interface *xch, xen_pfn_t special_array[NR_SPECIAL_PAGES]; xen_pfn_t ioreq_server_array[NR_IOREQ_SERVER_PAGES]; uint64_t total_pages; - xen_vmemrange_t dummy_vmemrange; - unsigned int dummy_vnode_to_pnode; + xen_vmemrange_t dummy_vmemrange[2]; + unsigned int dummy_vnode_to_pnode[1]; + bool use_dummy = false; memset(&elf, 0, sizeof(elf)); if ( elf_init(&elf, image, image_size) != 0 ) @@ -275,17 +277,36 @@ static int setup_guest(xc_interface *xch, if ( args->nr_vmemranges == 0 ) { - /* Build dummy vnode information */ - dummy_vmemrange.start = 0; - dummy_vmemrange.end = args->mem_size; - dummy_vmemrange.flags = 0; - dummy_vmemrange.nid = 0; + /* Build dummy vnode information + * + * Guest physical address space layout: + * [0, hole_start) [hole_start, 4G) [4G, highmem_end) + * + * Of course if there is no high memory, the second vmemrange + * has no effect on the actual result. + */ + + dummy_vmemrange[0].start = 0; + dummy_vmemrange[0].end = args->lowmem_end; + dummy_vmemrange[0].flags = 0; + dummy_vmemrange[0].nid = 0; args->nr_vmemranges = 1; - args->vmemranges = &dummy_vmemrange; - dummy_vnode_to_pnode = XC_NUMA_NO_NODE; + if ( args->highmem_end > (1ULL << 32) ) + { + dummy_vmemrange[1].start = 1ULL << 32; + dummy_vmemrange[1].end = args->highmem_end; + dummy_vmemrange[1].flags = 0; + dummy_vmemrange[1].nid = 0; + + args->nr_vmemranges++; + } + + dummy_vnode_to_pnode[0] = XC_NUMA_NO_NODE; args->nr_vnodes = 1; - args->vnode_to_pnode = &dummy_vnode_to_pnode; + args->vmemranges = dummy_vmemrange; + args->vnode_to_pnode = dummy_vnode_to_pnode; + use_dummy = true; } else { @@ -297,9 +318,15 @@ static int setup_guest(xc_interface *xch, } total_pages = 0; + p2m_size = 0; for ( i = 0; i < args->nr_vmemranges; i++ ) + { total_pages += ((args->vmemranges[i].end - args->vmemranges[i].start) >> PAGE_SHIFT); + p2m_size = p2m_size > (args->vmemranges[i].end >> PAGE_SHIFT) ? + p2m_size : (args->vmemranges[i].end >> PAGE_SHIFT); + } + if ( total_pages != (args->mem_size >> PAGE_SHIFT) ) { PERROR("vNUMA memory pages mismatch (0x%"PRIx64" != 0x%"PRIx64")", @@ -325,16 +352,23 @@ static int setup_guest(xc_interface *xch, DPRINTF(" TOTAL: %016"PRIx64"->%016"PRIx64"\n", v_start, v_end); DPRINTF(" ENTRY: %016"PRIx64"\n", elf_uval(&elf, elf.ehdr, e_entry)); - if ( (page_array = malloc(nr_pages * sizeof(xen_pfn_t))) == NULL ) + if ( (page_array = malloc(p2m_size * sizeof(xen_pfn_t))) == NULL ) { PERROR("Could not allocate memory."); goto error_out; } - for ( i = 0; i < nr_pages; i++ ) - page_array[i] = i; - for ( i = args->mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) - page_array[i] += args->mmio_size >> PAGE_SHIFT; + for ( i = 0; i < p2m_size; i++ ) + page_array[i] = ((xen_pfn_t)-1); + for ( vmemid = 0; vmemid < args->nr_vmemranges; vmemid++ ) + { + uint64_t pfn; + + for ( pfn = args->vmemranges[vmemid].start >> PAGE_SHIFT; + pfn < args->vmemranges[vmemid].end >> PAGE_SHIFT; + pfn++ ) + page_array[pfn] = pfn; + } /* * Try to claim pages for early warning of insufficient memory available. @@ -645,6 +679,12 @@ static int setup_guest(xc_interface *xch, error_out: rc = -1; out: + if ( use_dummy ) + { + args->nr_vnodes = 0; + args->vmemranges = NULL; + args->vnode_to_pnode = NULL; + } if ( elf_check_broken(&elf) ) ERROR("HVM ELF broken: %s", elf_check_broken(&elf)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:37:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jn-0005cU-3t; Sat, 06 Jun 2015 06:37:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jl-0005cA-Cb for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:45 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 9F/F3-23096-83592755; Sat, 06 Jun 2015 06:37:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433572663!12226644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9764 invoked from network); 6 Jun 2015 06:37:43 -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; 6 Jun 2015 06:37:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ji-0006bB-QO for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17ji-0007ME-PG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:42 +0000 Date: Sat, 06 Jun 2015 06:37:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix HVM vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d90cbb135bd1407788df4deb721edc2a124c6ac Author: Wei Liu AuthorDate: Mon Jun 1 11:19:14 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxl: fix HVM vNUMA This patch does two thing: The original code erroneously fills in xc_hvm_build_args before generating vmemranges. The effect is that guest memory is populated without vNUMA information. Move the hunk to right place to fix this. Move the subtraction of video ram to libxl__vnuma_build_vmemrange_hvm because it's the central place for generating vmemranges. Reported-by: Boris Ostrovsky Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Dario Faggioli Reviewed-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 32 ++++++++++---------------------- tools/libxl/libxl_vnuma.c | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index dccc9ac..867172a 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -961,6 +961,16 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (info->num_vnuma_nodes != 0) { int i; + ret = libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); + if (ret) { + LOGEV(ERROR, ret, "hvm build vmemranges failed"); + goto out; + } + ret = libxl__vnuma_config_check(gc, info, state); + if (ret) goto out; + ret = set_vnuma_info(gc, domid, info, state); + if (ret) goto out; + args.nr_vmemranges = state->num_vmemranges; args.vmemranges = libxl__malloc(gc, sizeof(*args.vmemranges) * args.nr_vmemranges); @@ -972,17 +982,6 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, args.vmemranges[i].nid = state->vmemranges[i].nid; } - /* Consider video ram belongs to vmemrange 0 -- just shrink it - * by the size of video ram. - */ - if (((args.vmemranges[0].end - args.vmemranges[0].start) >> 10) - < info->video_memkb) { - LOG(ERROR, "vmemrange 0 too small to contain video ram"); - goto out; - } - - args.vmemranges[0].end -= (info->video_memkb << 10); - args.nr_vnodes = info->num_vnuma_nodes; args.vnode_to_pnode = libxl__malloc(gc, sizeof(*args.vnode_to_pnode) * args.nr_vnodes); @@ -996,17 +995,6 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, goto out; } - if (info->num_vnuma_nodes != 0) { - ret = libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); - if (ret) { - LOGEV(ERROR, ret, "hvm build vmemranges failed"); - goto out; - } - ret = libxl__vnuma_config_check(gc, info, state); - if (ret) goto out; - ret = set_vnuma_info(gc, domid, info, state); - if (ret) goto out; - } ret = hvm_build_set_params(ctx->xch, domid, info, state->store_port, &state->store_mfn, state->console_port, &state->console_mfn, state->store_domid, diff --git a/tools/libxl/libxl_vnuma.c b/tools/libxl/libxl_vnuma.c index cac78d7..56856d2 100644 --- a/tools/libxl/libxl_vnuma.c +++ b/tools/libxl/libxl_vnuma.c @@ -257,6 +257,7 @@ int libxl__vnuma_build_vmemrange_hvm(libxl__gc *gc, uint64_t hole_start, hole_end, next; int nid, nr_vmemrange; xen_vmemrange_t *vmemranges; + int rc; /* Derive vmemranges from vnode size and memory hole. * @@ -277,6 +278,16 @@ int libxl__vnuma_build_vmemrange_hvm(libxl__gc *gc, libxl_vnode_info *p = &b_info->vnuma_nodes[nid]; uint64_t remaining_bytes = p->memkb << 10; + /* Consider video ram belongs to vnode 0 */ + if (nid == 0) { + if (p->memkb < b_info->video_memkb) { + LOG(ERROR, "vnode 0 too small to contain video ram"); + rc = ERROR_INVAL; + goto out; + } + remaining_bytes -= (b_info->video_memkb << 10); + } + while (remaining_bytes > 0) { uint64_t count = remaining_bytes; @@ -300,7 +311,9 @@ int libxl__vnuma_build_vmemrange_hvm(libxl__gc *gc, state->vmemranges = vmemranges; state->num_vmemranges = nr_vmemrange; - return 0; + rc = 0; +out: + 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 Jun 06 06:37:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jn-0005cU-3t; Sat, 06 Jun 2015 06:37:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jl-0005cA-Cb for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:45 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 9F/F3-23096-83592755; Sat, 06 Jun 2015 06:37:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433572663!12226644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9764 invoked from network); 6 Jun 2015 06:37:43 -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; 6 Jun 2015 06:37:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17ji-0006bB-QO for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17ji-0007ME-PG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:42 +0000 Date: Sat, 06 Jun 2015 06:37:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix HVM vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d90cbb135bd1407788df4deb721edc2a124c6ac Author: Wei Liu AuthorDate: Mon Jun 1 11:19:14 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:02 2015 +0100 libxl: fix HVM vNUMA This patch does two thing: The original code erroneously fills in xc_hvm_build_args before generating vmemranges. The effect is that guest memory is populated without vNUMA information. Move the hunk to right place to fix this. Move the subtraction of video ram to libxl__vnuma_build_vmemrange_hvm because it's the central place for generating vmemranges. Reported-by: Boris Ostrovsky Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Dario Faggioli Reviewed-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 32 ++++++++++---------------------- tools/libxl/libxl_vnuma.c | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index dccc9ac..867172a 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -961,6 +961,16 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (info->num_vnuma_nodes != 0) { int i; + ret = libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); + if (ret) { + LOGEV(ERROR, ret, "hvm build vmemranges failed"); + goto out; + } + ret = libxl__vnuma_config_check(gc, info, state); + if (ret) goto out; + ret = set_vnuma_info(gc, domid, info, state); + if (ret) goto out; + args.nr_vmemranges = state->num_vmemranges; args.vmemranges = libxl__malloc(gc, sizeof(*args.vmemranges) * args.nr_vmemranges); @@ -972,17 +982,6 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, args.vmemranges[i].nid = state->vmemranges[i].nid; } - /* Consider video ram belongs to vmemrange 0 -- just shrink it - * by the size of video ram. - */ - if (((args.vmemranges[0].end - args.vmemranges[0].start) >> 10) - < info->video_memkb) { - LOG(ERROR, "vmemrange 0 too small to contain video ram"); - goto out; - } - - args.vmemranges[0].end -= (info->video_memkb << 10); - args.nr_vnodes = info->num_vnuma_nodes; args.vnode_to_pnode = libxl__malloc(gc, sizeof(*args.vnode_to_pnode) * args.nr_vnodes); @@ -996,17 +995,6 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, goto out; } - if (info->num_vnuma_nodes != 0) { - ret = libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); - if (ret) { - LOGEV(ERROR, ret, "hvm build vmemranges failed"); - goto out; - } - ret = libxl__vnuma_config_check(gc, info, state); - if (ret) goto out; - ret = set_vnuma_info(gc, domid, info, state); - if (ret) goto out; - } ret = hvm_build_set_params(ctx->xch, domid, info, state->store_port, &state->store_mfn, state->console_port, &state->console_mfn, state->store_domid, diff --git a/tools/libxl/libxl_vnuma.c b/tools/libxl/libxl_vnuma.c index cac78d7..56856d2 100644 --- a/tools/libxl/libxl_vnuma.c +++ b/tools/libxl/libxl_vnuma.c @@ -257,6 +257,7 @@ int libxl__vnuma_build_vmemrange_hvm(libxl__gc *gc, uint64_t hole_start, hole_end, next; int nid, nr_vmemrange; xen_vmemrange_t *vmemranges; + int rc; /* Derive vmemranges from vnode size and memory hole. * @@ -277,6 +278,16 @@ int libxl__vnuma_build_vmemrange_hvm(libxl__gc *gc, libxl_vnode_info *p = &b_info->vnuma_nodes[nid]; uint64_t remaining_bytes = p->memkb << 10; + /* Consider video ram belongs to vnode 0 */ + if (nid == 0) { + if (p->memkb < b_info->video_memkb) { + LOG(ERROR, "vnode 0 too small to contain video ram"); + rc = ERROR_INVAL; + goto out; + } + remaining_bytes -= (b_info->video_memkb << 10); + } + while (remaining_bytes > 0) { uint64_t count = remaining_bytes; @@ -300,7 +311,9 @@ int libxl__vnuma_build_vmemrange_hvm(libxl__gc *gc, state->vmemranges = vmemranges; state->num_vmemranges = nr_vmemrange; - return 0; + rc = 0; +out: + 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 Jun 06 06:37:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jz-0005du-6Q; Sat, 06 Jun 2015 06:37:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jx-0005dg-BS for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:57 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 92/B1-03895-44592755; Sat, 06 Jun 2015 06:37:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433572673!13715640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25637 invoked from network); 6 Jun 2015 06:37:53 -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; 6 Jun 2015 06:37:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17js-0006bK-VU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17js-0007Mn-UG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:52 +0000 Date: Sat, 06 Jun 2015 06:37:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove code in stubdom creation failure path and callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8ebc71c68dabc8e4db3a702d56deda657405653 Author: Wei Liu AuthorDate: Mon Jun 1 18:24:35 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:03 2015 +0100 libxl: remove code in stubdom creation failure path and callback The snippet to destroy stubdom and the callback were added in 1fc3aeb3 ("libxl: use new QEMU xenstore protocol"). The intention was to destroy stubdom when it is not responsive. That approach is problematic because rc is not propagate back to sdss->callback, hence the guest is leaked. The solution is simple. The destruction of stubdom can be done later in sdss->callback. That code path already does the right thing to destroy both the guest and the stubdom that serves the guest. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 3dd7c04..33f9ce6 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1036,9 +1036,6 @@ static void stubdom_pvqemu_cb(libxl__egc *egc, libxl__multidev *aodevs, int rc); -static void spawn_stubdom_pvqemu_destroy_cb(libxl__egc *egc, - libxl__destroy_domid_state *dis, - int rc); static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, int rc, const char *p); @@ -1353,7 +1350,6 @@ static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, { EGC_GC; libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(xswait, *sdss, xswait); - uint32_t dm_domid = sdss->pvqemu.guest_domid; if (rc) { if (rc == ERROR_TIMEDOUT) @@ -1367,29 +1363,6 @@ static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, return; out: libxl__xswait_stop(gc, xswait); - if (rc) { - if (dm_domid) { - sdss->dis.ao = sdss->dm.spawn.ao; - sdss->dis.domid = dm_domid; - sdss->dis.callback = spawn_stubdom_pvqemu_destroy_cb; - libxl__destroy_domid(egc, &sdss->dis); - return; - } - } - sdss->callback(egc, &sdss->dm, rc); -} - -static void spawn_stubdom_pvqemu_destroy_cb(libxl__egc *egc, - libxl__destroy_domid_state *dis, - int rc) -{ - libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(dis, *sdss, dis); - STATE_AO_GC(sdss->dis.ao); - - if (rc) - LOG(ERROR, "destruction of domain %u after failed creation failed", - sdss->pvqemu.guest_domid); - sdss->callback(egc, &sdss->dm, 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 Jun 06 06:37:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:37: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 1Z17jz-0005du-6Q; Sat, 06 Jun 2015 06:37:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17jx-0005dg-BS for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:57 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 92/B1-03895-44592755; Sat, 06 Jun 2015 06:37:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433572673!13715640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25637 invoked from network); 6 Jun 2015 06:37:53 -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; 6 Jun 2015 06:37:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17js-0006bK-VU for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17js-0007Mn-UG for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:37:52 +0000 Date: Sat, 06 Jun 2015 06:37:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove code in stubdom creation failure path and callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8ebc71c68dabc8e4db3a702d56deda657405653 Author: Wei Liu AuthorDate: Mon Jun 1 18:24:35 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:03 2015 +0100 libxl: remove code in stubdom creation failure path and callback The snippet to destroy stubdom and the callback were added in 1fc3aeb3 ("libxl: use new QEMU xenstore protocol"). The intention was to destroy stubdom when it is not responsive. That approach is problematic because rc is not propagate back to sdss->callback, hence the guest is leaked. The solution is simple. The destruction of stubdom can be done later in sdss->callback. That code path already does the right thing to destroy both the guest and the stubdom that serves the guest. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 3dd7c04..33f9ce6 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1036,9 +1036,6 @@ static void stubdom_pvqemu_cb(libxl__egc *egc, libxl__multidev *aodevs, int rc); -static void spawn_stubdom_pvqemu_destroy_cb(libxl__egc *egc, - libxl__destroy_domid_state *dis, - int rc); static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, int rc, const char *p); @@ -1353,7 +1350,6 @@ static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, { EGC_GC; libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(xswait, *sdss, xswait); - uint32_t dm_domid = sdss->pvqemu.guest_domid; if (rc) { if (rc == ERROR_TIMEDOUT) @@ -1367,29 +1363,6 @@ static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, return; out: libxl__xswait_stop(gc, xswait); - if (rc) { - if (dm_domid) { - sdss->dis.ao = sdss->dm.spawn.ao; - sdss->dis.domid = dm_domid; - sdss->dis.callback = spawn_stubdom_pvqemu_destroy_cb; - libxl__destroy_domid(egc, &sdss->dis); - return; - } - } - sdss->callback(egc, &sdss->dm, rc); -} - -static void spawn_stubdom_pvqemu_destroy_cb(libxl__egc *egc, - libxl__destroy_domid_state *dis, - int rc) -{ - libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(dis, *sdss, dis); - STATE_AO_GC(sdss->dis.ao); - - if (rc) - LOG(ERROR, "destruction of domain %u after failed creation failed", - sdss->pvqemu.guest_domid); - sdss->callback(egc, &sdss->dm, 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 Jun 06 06:38:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:38: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 1Z17k7-0005fF-8m; Sat, 06 Jun 2015 06:38:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17k6-0005ez-1W for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:06 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 18/1D-30658-D4592755; Sat, 06 Jun 2015 06:38:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433572683!20843339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31099 invoked from network); 6 Jun 2015 06:38:04 -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; 6 Jun 2015 06:38:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17k3-0006br-5f for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17k3-0007Nj-2p for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:03 +0000 Date: Sat, 06 Jun 2015 06:38:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-hip04: Resync the driver with the GICv2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c81d06f2097fe5e10dff773880c2fb8af8c892ea Author: Julien Grall AuthorDate: Wed May 6 19:52:30 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:03 2015 +0100 xen/arm: gic-hip04: Resync the driver with the GICv2 The GIC hip04 driver was differring from GICv2. I suspect that some of the changes in the common GIC code make boot fail on hip04. Although, I don't have a platform to check so it has been only build tested. List of GICv2 commit ported to the HIP04: commit ce12e6dba4b2d120e35dffd95a745452224e7144 Author: Edgar E. Iglesias Date: Fri Apr 10 16:21:10 2015 +1000 xen/arm: Don't write to GICH_MISR GICH_MISR is read-only in GICv2. Signed-off-by: Edgar E. Iglesias Reviewed-by: Julien Grall Acked-by: Ian Campbell commit 2eb4f996547dc632aa94b2b7b4f783bec8ffe457 Author: Julien Grall Date: Wed Apr 1 17:21:47 2015 +0100 xen/arm: gic: GICv2 & GICv3 only supports 1020 physical interrupts GICD_TYPER.ITLinesNumber can encode up to 1024 interrupts. Although, IRQ 1020-1023 are reserved for special purpose. The result is used by the callers of gic_number_lines in order to check the validity of an IRQ. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: Frediano Ziglio Cc: Zoltan Kiss commit e2d486b385ce58b6db7561417de28ba837dcd4ac Author: Julien Grall Date: Wed Apr 1 17:21:34 2015 +0100 xen/arm: Divide GIC initialization in 2 parts Currently the function to translate IRQ from the device tree is set unconditionally to be able to be able to retrieve serial/timer IRQ before the GIC has been initialized. It assumes that the xlate function won't ever changed. We may also need to have the primary interrupt controller very early. Rework the gic initialization in 2 parts: - gic_preinit: Get the interrupt controller device tree node and set up GIC and xlate callbacks - gic_init: Initialize the interrupt controller and the boot CPU interrupts. The former function will be called just after the IRQ subsystem as been initialized. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell Cc: Frediano Ziglio Cc: Zoltan Kiss Signed-off-by: Julien Grall Cc: Zoltan Kiss Reviewed-by: Zoltan Kiss Tested-by: Shameerali Kolothum Thodi Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 89 +++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 2e4992d..ee693e7 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -267,6 +267,7 @@ static void __init hip04gic_dist_init(void) uint32_t type; uint32_t cpumask; uint32_t gic_cpus; + unsigned int nr_lines; int i; cpumask = readl_gicd(GICD_ITARGETSR) & 0xffff; @@ -276,31 +277,34 @@ static void __init hip04gic_dist_init(void) writel_gicd(0, GICD_CTLR); type = readl_gicd(GICD_TYPER); - gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); gic_cpus = 16; printk("GIC-HIP04: %d lines, %d cpu%s%s (IID %8.8x).\n", - gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", + nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", readl_gicd(GICD_IIDR)); /* Default all global IRQs to level, active low */ - for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) + for ( i = 32; i < nr_lines; i += 16 ) writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ - for ( i = 32; i < gicv2_info.nr_lines; i += 2 ) + for ( i = 32; i < nr_lines; i += 2 ) writel_gicd(cpumask, GICD_ITARGETSR + (i / 2) * 4); /* Default priority for global interrupts */ - for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + for ( i = 32; i < nr_lines; i += 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 ) + for ( i = 32; i < nr_lines; i += 32 ) writel_gicd(~0x0, GICD_ICENABLER + (i / 32) * 4); + /* Only 1020 interrupts are supported */ + gicv2_info.nr_lines = min(1020U, nr_lines); + /* Turn on the distributor */ writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } @@ -351,8 +355,6 @@ static void __cpuinit hip04gic_hyp_init(void) vtr = readl_gich(GICH_VTR); nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; gicv2_info.nr_lrs = nr_lrs; - - writel_gich(GICH_MISR_EOI, GICH_MISR); } static void __cpuinit hip04gic_hyp_disable(void) @@ -670,37 +672,10 @@ static hw_irq_controller hip04gic_guest_irq_type = { .set_affinity = hip04gic_irq_set_affinity, }; -const static struct gic_hw_operations hip04gic_ops = { - .info = &gicv2_info, - .secondary_init = hip04gic_secondary_cpu_init, - .save_state = hip04gic_save_state, - .restore_state = hip04gic_restore_state, - .dump_state = hip04gic_dump_state, - .gicv_setup = hip04gicv_setup, - .gic_host_irq_type = &hip04gic_host_irq_type, - .gic_guest_irq_type = &hip04gic_guest_irq_type, - .eoi_irq = hip04gic_eoi_irq, - .deactivate_irq = hip04gic_dir_irq, - .read_irq = hip04gic_read_irq, - .set_irq_properties = hip04gic_set_irq_properties, - .send_SGI = hip04gic_send_SGI, - .disable_interface = hip04gic_disable_interface, - .update_lr = hip04gic_update_lr, - .update_hcr_status = hip04gic_hcr_status, - .clear_lr = hip04gic_clear_lr, - .read_lr = hip04gic_read_lr, - .write_lr = hip04gic_write_lr, - .read_vmcr_priority = hip04gic_read_vmcr_priority, - .read_apr = hip04gic_read_apr, - .make_dt_node = hip04gic_make_dt_node, -}; - -/* Set up the GIC */ -static int __init hip04gic_init(struct dt_device_node *node, const void *data) +static int __init hip04gic_init(void) { int res; - - dt_device_set_used_by(node, DOMID_XEN); + const struct dt_device_node *node = gicv2_info.node; res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) @@ -723,9 +698,6 @@ static int __init hip04gic_init(struct dt_device_node *node, const void *data) panic("GIC-HIP04: 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("GIC-HIP04 initialization:\n" @@ -770,8 +742,43 @@ static int __init hip04gic_init(struct dt_device_node *node, const void *data) spin_unlock(&gicv2.lock); + return 0; +} + +const static struct gic_hw_operations hip04gic_ops = { + .info = &gicv2_info, + .init = hip04gic_init, + .secondary_init = hip04gic_secondary_cpu_init, + .save_state = hip04gic_save_state, + .restore_state = hip04gic_restore_state, + .dump_state = hip04gic_dump_state, + .gicv_setup = hip04gicv_setup, + .gic_host_irq_type = &hip04gic_host_irq_type, + .gic_guest_irq_type = &hip04gic_guest_irq_type, + .eoi_irq = hip04gic_eoi_irq, + .deactivate_irq = hip04gic_dir_irq, + .read_irq = hip04gic_read_irq, + .set_irq_properties = hip04gic_set_irq_properties, + .send_SGI = hip04gic_send_SGI, + .disable_interface = hip04gic_disable_interface, + .update_lr = hip04gic_update_lr, + .update_hcr_status = hip04gic_hcr_status, + .clear_lr = hip04gic_clear_lr, + .read_lr = hip04gic_read_lr, + .write_lr = hip04gic_write_lr, + .read_vmcr_priority = hip04gic_read_vmcr_priority, + .read_apr = hip04gic_read_apr, + .make_dt_node = hip04gic_make_dt_node, +}; + +/* Set up the GIC */ +static int __init hip04gic_preinit(struct dt_device_node *node, + const void *data) +{ gicv2_info.hw_version = GIC_V2; + gicv2_info.node = node; register_gic_ops(&hip04gic_ops); + dt_irq_xlate = gic_irq_xlate; return 0; } @@ -784,7 +791,7 @@ static const struct dt_device_match hip04gic_dt_match[] __initconst = DT_DEVICE_START(hip04gic, "GIC-HIP04", DEVICE_GIC) .dt_match = hip04gic_dt_match, - .init = hip04gic_init, + .init = hip04gic_preinit, DT_DEVICE_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 Jun 06 06:38:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:38: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 1Z17k7-0005fF-8m; Sat, 06 Jun 2015 06:38:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17k6-0005ez-1W for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:06 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 18/1D-30658-D4592755; Sat, 06 Jun 2015 06:38:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433572683!20843339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31099 invoked from network); 6 Jun 2015 06:38:04 -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; 6 Jun 2015 06:38:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17k3-0006br-5f for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17k3-0007Nj-2p for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:03 +0000 Date: Sat, 06 Jun 2015 06:38:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-hip04: Resync the driver with the GICv2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c81d06f2097fe5e10dff773880c2fb8af8c892ea Author: Julien Grall AuthorDate: Wed May 6 19:52:30 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:03 2015 +0100 xen/arm: gic-hip04: Resync the driver with the GICv2 The GIC hip04 driver was differring from GICv2. I suspect that some of the changes in the common GIC code make boot fail on hip04. Although, I don't have a platform to check so it has been only build tested. List of GICv2 commit ported to the HIP04: commit ce12e6dba4b2d120e35dffd95a745452224e7144 Author: Edgar E. Iglesias Date: Fri Apr 10 16:21:10 2015 +1000 xen/arm: Don't write to GICH_MISR GICH_MISR is read-only in GICv2. Signed-off-by: Edgar E. Iglesias Reviewed-by: Julien Grall Acked-by: Ian Campbell commit 2eb4f996547dc632aa94b2b7b4f783bec8ffe457 Author: Julien Grall Date: Wed Apr 1 17:21:47 2015 +0100 xen/arm: gic: GICv2 & GICv3 only supports 1020 physical interrupts GICD_TYPER.ITLinesNumber can encode up to 1024 interrupts. Although, IRQ 1020-1023 are reserved for special purpose. The result is used by the callers of gic_number_lines in order to check the validity of an IRQ. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: Frediano Ziglio Cc: Zoltan Kiss commit e2d486b385ce58b6db7561417de28ba837dcd4ac Author: Julien Grall Date: Wed Apr 1 17:21:34 2015 +0100 xen/arm: Divide GIC initialization in 2 parts Currently the function to translate IRQ from the device tree is set unconditionally to be able to be able to retrieve serial/timer IRQ before the GIC has been initialized. It assumes that the xlate function won't ever changed. We may also need to have the primary interrupt controller very early. Rework the gic initialization in 2 parts: - gic_preinit: Get the interrupt controller device tree node and set up GIC and xlate callbacks - gic_init: Initialize the interrupt controller and the boot CPU interrupts. The former function will be called just after the IRQ subsystem as been initialized. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell Cc: Frediano Ziglio Cc: Zoltan Kiss Signed-off-by: Julien Grall Cc: Zoltan Kiss Reviewed-by: Zoltan Kiss Tested-by: Shameerali Kolothum Thodi Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 89 +++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 2e4992d..ee693e7 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -267,6 +267,7 @@ static void __init hip04gic_dist_init(void) uint32_t type; uint32_t cpumask; uint32_t gic_cpus; + unsigned int nr_lines; int i; cpumask = readl_gicd(GICD_ITARGETSR) & 0xffff; @@ -276,31 +277,34 @@ static void __init hip04gic_dist_init(void) writel_gicd(0, GICD_CTLR); type = readl_gicd(GICD_TYPER); - gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); gic_cpus = 16; printk("GIC-HIP04: %d lines, %d cpu%s%s (IID %8.8x).\n", - gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", + nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", readl_gicd(GICD_IIDR)); /* Default all global IRQs to level, active low */ - for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) + for ( i = 32; i < nr_lines; i += 16 ) writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ - for ( i = 32; i < gicv2_info.nr_lines; i += 2 ) + for ( i = 32; i < nr_lines; i += 2 ) writel_gicd(cpumask, GICD_ITARGETSR + (i / 2) * 4); /* Default priority for global interrupts */ - for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + for ( i = 32; i < nr_lines; i += 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 ) + for ( i = 32; i < nr_lines; i += 32 ) writel_gicd(~0x0, GICD_ICENABLER + (i / 32) * 4); + /* Only 1020 interrupts are supported */ + gicv2_info.nr_lines = min(1020U, nr_lines); + /* Turn on the distributor */ writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } @@ -351,8 +355,6 @@ static void __cpuinit hip04gic_hyp_init(void) vtr = readl_gich(GICH_VTR); nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; gicv2_info.nr_lrs = nr_lrs; - - writel_gich(GICH_MISR_EOI, GICH_MISR); } static void __cpuinit hip04gic_hyp_disable(void) @@ -670,37 +672,10 @@ static hw_irq_controller hip04gic_guest_irq_type = { .set_affinity = hip04gic_irq_set_affinity, }; -const static struct gic_hw_operations hip04gic_ops = { - .info = &gicv2_info, - .secondary_init = hip04gic_secondary_cpu_init, - .save_state = hip04gic_save_state, - .restore_state = hip04gic_restore_state, - .dump_state = hip04gic_dump_state, - .gicv_setup = hip04gicv_setup, - .gic_host_irq_type = &hip04gic_host_irq_type, - .gic_guest_irq_type = &hip04gic_guest_irq_type, - .eoi_irq = hip04gic_eoi_irq, - .deactivate_irq = hip04gic_dir_irq, - .read_irq = hip04gic_read_irq, - .set_irq_properties = hip04gic_set_irq_properties, - .send_SGI = hip04gic_send_SGI, - .disable_interface = hip04gic_disable_interface, - .update_lr = hip04gic_update_lr, - .update_hcr_status = hip04gic_hcr_status, - .clear_lr = hip04gic_clear_lr, - .read_lr = hip04gic_read_lr, - .write_lr = hip04gic_write_lr, - .read_vmcr_priority = hip04gic_read_vmcr_priority, - .read_apr = hip04gic_read_apr, - .make_dt_node = hip04gic_make_dt_node, -}; - -/* Set up the GIC */ -static int __init hip04gic_init(struct dt_device_node *node, const void *data) +static int __init hip04gic_init(void) { int res; - - dt_device_set_used_by(node, DOMID_XEN); + const struct dt_device_node *node = gicv2_info.node; res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) @@ -723,9 +698,6 @@ static int __init hip04gic_init(struct dt_device_node *node, const void *data) panic("GIC-HIP04: 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("GIC-HIP04 initialization:\n" @@ -770,8 +742,43 @@ static int __init hip04gic_init(struct dt_device_node *node, const void *data) spin_unlock(&gicv2.lock); + return 0; +} + +const static struct gic_hw_operations hip04gic_ops = { + .info = &gicv2_info, + .init = hip04gic_init, + .secondary_init = hip04gic_secondary_cpu_init, + .save_state = hip04gic_save_state, + .restore_state = hip04gic_restore_state, + .dump_state = hip04gic_dump_state, + .gicv_setup = hip04gicv_setup, + .gic_host_irq_type = &hip04gic_host_irq_type, + .gic_guest_irq_type = &hip04gic_guest_irq_type, + .eoi_irq = hip04gic_eoi_irq, + .deactivate_irq = hip04gic_dir_irq, + .read_irq = hip04gic_read_irq, + .set_irq_properties = hip04gic_set_irq_properties, + .send_SGI = hip04gic_send_SGI, + .disable_interface = hip04gic_disable_interface, + .update_lr = hip04gic_update_lr, + .update_hcr_status = hip04gic_hcr_status, + .clear_lr = hip04gic_clear_lr, + .read_lr = hip04gic_read_lr, + .write_lr = hip04gic_write_lr, + .read_vmcr_priority = hip04gic_read_vmcr_priority, + .read_apr = hip04gic_read_apr, + .make_dt_node = hip04gic_make_dt_node, +}; + +/* Set up the GIC */ +static int __init hip04gic_preinit(struct dt_device_node *node, + const void *data) +{ gicv2_info.hw_version = GIC_V2; + gicv2_info.node = node; register_gic_ops(&hip04gic_ops); + dt_irq_xlate = gic_irq_xlate; return 0; } @@ -784,7 +791,7 @@ static const struct dt_device_match hip04gic_dt_match[] __initconst = DT_DEVICE_START(hip04gic, "GIC-HIP04", DEVICE_GIC) .dt_match = hip04gic_dt_match, - .init = hip04gic_init, + .init = hip04gic_preinit, DT_DEVICE_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 Jun 06 06:38:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:38: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 1Z17kI-0005gf-BT; Sat, 06 Jun 2015 06:38:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17kG-0005gR-HN for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:16 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id F8/DF-28408-75592755; Sat, 06 Jun 2015 06:38:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433572693!13715688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26938 invoked from network); 6 Jun 2015 06:38:14 -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; 6 Jun 2015 06:38:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17kD-0006bz-Fl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17kD-0007OK-Dl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:13 +0000 Date: Sat, 06 Jun 2015 06:38:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: link executables with libtinfo explicitly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b248d32f4fce6f5ea1d59228cc435b80c3b50351 Author: Daniel Kiper AuthorDate: Tue Jun 2 15:33:26 2015 +0200 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:03 2015 +0100 tools: link executables with libtinfo explicitly binutils 2.22 changed ld default from --copy-dt-needed-entries to -no-copy-dt-needed-entries. This revealed that some objects are linked implicitly with libtinfo and newer ld fails to build relevant executables. Below is short explanation why we should not do that... http://fedoraproject.org/wiki/UnderstandingDSOLinkChange says: The default behaviour for ld (my note: before version 2.22) allows users to 'indirectly' link to required objects/libraries through intermediate objects/libraries. While this is convenient, it can also be dangerous because it makes your program's dependencies tied to the dependencies of other objects. If those objects ever change their linkages, they can break your program without any changes to your own code! Signed-off-by: Daniel Kiper Acked-by: Wei Liu --- config/Tools.mk.in | 1 + tools/configure | 46 +++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 4 +++ tools/misc/Makefile | 2 +- tools/xenstat/xentop/Makefile | 2 +- 5 files changed, 53 insertions(+), 2 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index d67352e..aef9ed6 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -77,5 +77,6 @@ CONFIG_LIBICONV := @libiconv@ CONFIG_GCRYPT := @libgcrypt@ EXTFS_LIBS := @EXTFS_LIBS@ CURSES_LIBS := @CURSES_LIBS@ +TINFO_LIBS := @TINFO_LIBS@ FILE_OFFSET_BITS := @FILE_OFFSET_BITS@ diff --git a/tools/configure b/tools/configure index 4c2928d..896d892 100755 --- a/tools/configure +++ b/tools/configure @@ -651,6 +651,7 @@ glib_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +TINFO_LIBS CURSES_LIBS PY_NOOPT_CFLAGS EGREP @@ -7678,6 +7679,51 @@ $as_echo "#define INCLUDE_CURSES_H " >>confdefs.h fi +if test "$ncurses" = "y"; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for define_key in -ltinfo" >&5 +$as_echo_n "checking for define_key in -ltinfo... " >&6; } +if ${ac_cv_lib_tinfo_define_key+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltinfo $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char define_key (); +int +main () +{ +return define_key (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tinfo_define_key=yes +else + ac_cv_lib_tinfo_define_key=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_define_key" >&5 +$as_echo "$ac_cv_lib_tinfo_define_key" >&6; } +if test "x$ac_cv_lib_tinfo_define_key" = xyes; then : + TINFO_LIBS=-ltinfo +fi + + +fi + diff --git a/tools/configure.ac b/tools/configure.ac index 9bf6450..1a06ddf 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -318,6 +318,10 @@ i[[3456]]86|x86_64) esac AX_CHECK_UUID AX_CHECK_CURSES +AS_IF([test "$ncurses" = "y"], [ +AC_CHECK_LIB([tinfo], [define_key], [TINFO_LIBS=-ltinfo]) +]) +AC_SUBST(TINFO_LIBS) dnl The following are only required when upstream QEMU is built AS_IF([test "x$qemu_xen" = "xy"], [ diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 3817317..82c361f 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -100,7 +100,7 @@ xen-lowmemd: xen-lowmemd.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) gtraceview: gtraceview.o - $(CC) $(LDFLAGS) -o $@ $< $(CURSES_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $< $(CURSES_LIBS) $(TINFO_LIBS) $(APPEND_LDFLAGS) xencov: xencov.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 2652c9d..97950b9 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -19,7 +19,7 @@ all install xentop: else CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) -LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) -lm -lyajl +LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) -lm -lyajl CFLAGS += -DHOST_$(XEN_OS) # Include configure output (config.h) to headers search path -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 06 06:38:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 Jun 2015 06:38: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 1Z17kI-0005gf-BT; Sat, 06 Jun 2015 06:38:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17kG-0005gR-HN for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:16 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id F8/DF-28408-75592755; Sat, 06 Jun 2015 06:38:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433572693!13715688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26938 invoked from network); 6 Jun 2015 06:38:14 -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; 6 Jun 2015 06:38:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z17kD-0006bz-Fl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z17kD-0007OK-Dl for xen-changelog@lists.xensource.com; Sat, 06 Jun 2015 06:38:13 +0000 Date: Sat, 06 Jun 2015 06:38:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: link executables with libtinfo explicitly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b248d32f4fce6f5ea1d59228cc435b80c3b50351 Author: Daniel Kiper AuthorDate: Tue Jun 2 15:33:26 2015 +0200 Commit: Ian Campbell CommitDate: Wed Jun 3 11:12:03 2015 +0100 tools: link executables with libtinfo explicitly binutils 2.22 changed ld default from --copy-dt-needed-entries to -no-copy-dt-needed-entries. This revealed that some objects are linked implicitly with libtinfo and newer ld fails to build relevant executables. Below is short explanation why we should not do that... http://fedoraproject.org/wiki/UnderstandingDSOLinkChange says: The default behaviour for ld (my note: before version 2.22) allows users to 'indirectly' link to required objects/libraries through intermediate objects/libraries. While this is convenient, it can also be dangerous because it makes your program's dependencies tied to the dependencies of other objects. If those objects ever change their linkages, they can break your program without any changes to your own code! Signed-off-by: Daniel Kiper Acked-by: Wei Liu --- config/Tools.mk.in | 1 + tools/configure | 46 +++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 4 +++ tools/misc/Makefile | 2 +- tools/xenstat/xentop/Makefile | 2 +- 5 files changed, 53 insertions(+), 2 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index d67352e..aef9ed6 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -77,5 +77,6 @@ CONFIG_LIBICONV := @libiconv@ CONFIG_GCRYPT := @libgcrypt@ EXTFS_LIBS := @EXTFS_LIBS@ CURSES_LIBS := @CURSES_LIBS@ +TINFO_LIBS := @TINFO_LIBS@ FILE_OFFSET_BITS := @FILE_OFFSET_BITS@ diff --git a/tools/configure b/tools/configure index 4c2928d..896d892 100755 --- a/tools/configure +++ b/tools/configure @@ -651,6 +651,7 @@ glib_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +TINFO_LIBS CURSES_LIBS PY_NOOPT_CFLAGS EGREP @@ -7678,6 +7679,51 @@ $as_echo "#define INCLUDE_CURSES_H " >>confdefs.h fi +if test "$ncurses" = "y"; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for define_key in -ltinfo" >&5 +$as_echo_n "checking for define_key in -ltinfo... " >&6; } +if ${ac_cv_lib_tinfo_define_key+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltinfo $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char define_key (); +int +main () +{ +return define_key (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tinfo_define_key=yes +else + ac_cv_lib_tinfo_define_key=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_define_key" >&5 +$as_echo "$ac_cv_lib_tinfo_define_key" >&6; } +if test "x$ac_cv_lib_tinfo_define_key" = xyes; then : + TINFO_LIBS=-ltinfo +fi + + +fi + diff --git a/tools/configure.ac b/tools/configure.ac index 9bf6450..1a06ddf 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -318,6 +318,10 @@ i[[3456]]86|x86_64) esac AX_CHECK_UUID AX_CHECK_CURSES +AS_IF([test "$ncurses" = "y"], [ +AC_CHECK_LIB([tinfo], [define_key], [TINFO_LIBS=-ltinfo]) +]) +AC_SUBST(TINFO_LIBS) dnl The following are only required when upstream QEMU is built AS_IF([test "x$qemu_xen" = "xy"], [ diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 3817317..82c361f 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -100,7 +100,7 @@ xen-lowmemd: xen-lowmemd.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) gtraceview: gtraceview.o - $(CC) $(LDFLAGS) -o $@ $< $(CURSES_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $< $(CURSES_LIBS) $(TINFO_LIBS) $(APPEND_LDFLAGS) xencov: xencov.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 2652c9d..97950b9 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -19,7 +19,7 @@ all install xentop: else CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) -LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) -lm -lyajl +LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) -lm -lyajl CFLAGS += -DHOST_$(XEN_OS) # Include configure output (config.h) to headers search path -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 07 15:55:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 15: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 1Z1cun-0004aA-6i; Sun, 07 Jun 2015 15:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1cul-0004a5-Hl for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 15:55:11 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id A6/6D-15949-E5964755; Sun, 07 Jun 2015 15:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433692509!8266751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17069 invoked from network); 7 Jun 2015 15:55:10 -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; 7 Jun 2015 15:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1cuh-0002v3-UA for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 15:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1cuh-0006SQ-PM for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 15:55:07 +0000 Date: Sun, 07 Jun 2015 15:55:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] 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 63aeca00c805fa1c47d9f7b1978e83e41ab482d4 Author: Ian Jackson AuthorDate: Wed May 27 16:57:21 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:57:21 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 0aa6368..abf72ad 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= fb44e83c346436ae8dc07d91dfedb108b8a4e673 -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TAG ?= 63a2748f7a97462c9d967daaabaeb5749aee24ea +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # 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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 07 15:55:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 15: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 1Z1cun-0004aA-6i; Sun, 07 Jun 2015 15:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1cul-0004a5-Hl for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 15:55:11 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id A6/6D-15949-E5964755; Sun, 07 Jun 2015 15:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433692509!8266751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17069 invoked from network); 7 Jun 2015 15:55:10 -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; 7 Jun 2015 15:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1cuh-0002v3-UA for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 15:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1cuh-0006SQ-PM for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 15:55:07 +0000 Date: Sun, 07 Jun 2015 15:55:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] 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 63aeca00c805fa1c47d9f7b1978e83e41ab482d4 Author: Ian Jackson AuthorDate: Wed May 27 16:57:21 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:57:21 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 0aa6368..abf72ad 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= fb44e83c346436ae8dc07d91dfedb108b8a4e673 -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TAG ?= 63a2748f7a97462c9d967daaabaeb5749aee24ea +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # 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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 07 19:33:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 19: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 1Z1gJe-0007wJ-M8; Sun, 07 Jun 2015 19:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1gJc-0007w7-RU for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 19:33:04 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id AD/53-15949-07C94755; Sun, 07 Jun 2015 19:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433705582!12394330!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11538 invoked from network); 7 Jun 2015 19:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2015 19:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1gJa-0005cj-Es for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 19:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1gJa-0005zm-2o for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 19:33:02 +0000 Date: Sun, 07 Jun 2015 19:33:02 +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 e580a92dd53dbba62518e17a3f4ebd57b626926c Author: Ian Jackson AuthorDate: Wed May 27 16:56:47 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:56:47 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 2681926..d82cdbc 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 ?= edb43a7abbec40fb601140fecdc29d693358963b -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TAG ?= c545d0dfcc5ab5e69d0eabc14ec101293236055c +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # 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 Sun Jun 07 19:33:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 19: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 1Z1gJe-0007wJ-M8; Sun, 07 Jun 2015 19:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1gJc-0007w7-RU for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 19:33:04 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id AD/53-15949-07C94755; Sun, 07 Jun 2015 19:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1433705582!12394330!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11538 invoked from network); 7 Jun 2015 19:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2015 19:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1gJa-0005cj-Es for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 19:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1gJa-0005zm-2o for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 19:33:02 +0000 Date: Sun, 07 Jun 2015 19:33:02 +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 e580a92dd53dbba62518e17a3f4ebd57b626926c Author: Ian Jackson AuthorDate: Wed May 27 16:56:47 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:56:47 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 2681926..d82cdbc 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 ?= edb43a7abbec40fb601140fecdc29d693358963b -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TAG ?= c545d0dfcc5ab5e69d0eabc14ec101293236055c +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # 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 Sun Jun 07 21:33:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iBn-0005ZM-Th; Sun, 07 Jun 2015 21: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 1Z1iBm-0005ZC-BU for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:06 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 9D/85-21325-198B4755; Sun, 07 Jun 2015 21:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1433712783!7123536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18993 invoked from network); 7 Jun 2015 21:33:04 -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; 7 Jun 2015 21:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iBj-00075x-IF for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iBj-0001rO-2C for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:03 +0000 Date: Sun, 07 Jun 2015 21:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Clean the emulation of IROUTER X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca85da37fbde2f623fff4c269731addf61ccff75 Author: Julien Grall AuthorDate: Mon May 25 21:44:20 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 5 13:02:30 2015 +0100 xen/arm: vgic-v3: Clean the emulation of IROUTER The read emulation of the register IROUTER contains lots of uncessary code as irouter is already valid and doesn't need any processing before setting the value in a register. Also take the opportunity to factorize the code to find a vCPU from the affinity in a single place. It will be easier to change the way to do it later. Signed-off-by: Julien Grall Cc: Chen Baozi Acked-by: Chen Baozi Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 100 +++++++++++++++++------------------------------ 1 files changed, 36 insertions(+), 64 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 45a46c3..4af5a84 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -50,42 +50,36 @@ */ #define VGICD_CTLR_DEFAULT (GICD_CTLR_ARE_NS) -static struct vcpu *vgic_v3_irouter_to_vcpu(struct vcpu *v, uint64_t irouter) +static struct vcpu *vgic_v3_irouter_to_vcpu(struct domain *d, uint64_t irouter) { - irouter &= ~(GICD_IROUTER_SPI_MODE_ANY); - irouter = irouter & MPIDR_AFF0_MASK; - - return v->domain->vcpu[irouter]; -} + unsigned int vcpu_id; -static uint64_t vgic_v3_vcpu_to_irouter(struct vcpu *v, - unsigned int vcpu_id) -{ - uint64_t irq_affinity; - struct vcpu *v_target; + /* + * When the Interrupt Route Mode is set, the IRQ targets any vCPUs. + * For simplicity, the IRQ is always routed to vCPU0. + */ + if ( irouter & GICD_IROUTER_SPI_MODE_ANY ) + return d->vcpu[0]; - v_target = v->domain->vcpu[vcpu_id]; - irq_affinity = (MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 3) << 32 | - MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 2) << 16 | - MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 1) << 8 | - MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 0)); + vcpu_id = irouter & MPIDR_AFF0_MASK; + if ( vcpu_id >= d->max_vcpus ) + return NULL; - return irq_affinity; + return d->vcpu[vcpu_id]; } static struct vcpu *vgic_v3_get_target_vcpu(struct vcpu *v, unsigned int irq) { - uint64_t target; + struct vcpu *v_target; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); ASSERT(spin_is_locked(&rank->lock)); - target = rank->v3.irouter[irq % 32]; - target &= ~(GICD_IROUTER_SPI_MODE_ANY); - target &= MPIDR_AFF0_MASK; - ASSERT(target >= 0 && target < v->domain->max_vcpus); + v_target = vgic_v3_irouter_to_vcpu(v->domain, rank->v3.irouter[irq % 32]); - return v->domain->vcpu[target]; + ASSERT(v_target != NULL); + + return v_target; } static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, @@ -670,8 +664,6 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; unsigned long flags; - uint64_t irouter; - unsigned int vcpu_id; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); perfc_incr(vgicd_reads); @@ -742,17 +734,8 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) DABT_DOUBLE_WORD); if ( rank == NULL ) goto read_as_zero; vgic_lock_rank(v, rank, flags); - irouter = rank->v3.irouter[REG_RANK_INDEX(64, - (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; - /* XXX: bit[31] stores IRQ mode. Just return */ - if ( irouter & GICD_IROUTER_SPI_MODE_ANY ) - { - *r = GICD_IROUTER_SPI_MODE_ANY; - vgic_unlock_rank(v, rank, flags); - return 1; - } - vcpu_id = irouter; - *r = vgic_v3_vcpu_to_irouter(v, vcpu_id); + *r = rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: @@ -838,7 +821,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; unsigned long flags; - uint64_t new_irouter, new_target, old_target; + uint64_t new_irouter, old_irouter; struct vcpu *old_vcpu, *new_vcpu; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); @@ -910,40 +893,29 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) new_irouter = *r; vgic_lock_rank(v, rank, flags); - old_target = rank->v3.irouter[REG_RANK_INDEX(64, - (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; - old_target &= ~(GICD_IROUTER_SPI_MODE_ANY); - if ( new_irouter & GICD_IROUTER_SPI_MODE_ANY ) + old_irouter = rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), + DABT_DOUBLE_WORD)]; + old_vcpu = vgic_v3_irouter_to_vcpu(v->domain, old_irouter); + new_vcpu = vgic_v3_irouter_to_vcpu(v->domain, new_irouter); + + if ( !new_vcpu ) { + printk(XENLOG_G_DEBUG + "%pv: vGICD: wrong irouter at offset %#08x val %#"PRIregister, + v, gicd_reg, *r); + vgic_unlock_rank(v, rank, flags); /* - * IRQ routing mode set. Route any one processor in the entire - * system. We chose vcpu 0 and set IRQ mode bit[31] in irouter. + * TODO: Don't inject a fault to the guest when the MPIDR is + * not valid. From the spec, the interrupt should be + * ignored. */ - new_target = 0; - new_vcpu = v->domain->vcpu[0]; - new_irouter = GICD_IROUTER_SPI_MODE_ANY; - } - else - { - new_target = new_irouter & MPIDR_AFF0_MASK; - if ( new_target >= v->domain->max_vcpus ) - { - printk(XENLOG_G_DEBUG - "%pv: vGICD: wrong irouter at offset %#08x\n val 0x%lx vcpu %x", - v, gicd_reg, new_target, v->domain->max_vcpus); - vgic_unlock_rank(v, rank, flags); - return 0; - } - new_vcpu = vgic_v3_irouter_to_vcpu(v, new_irouter); + return 0; } - rank->v3.irouter[REG_RANK_INDEX(64, (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)] = new_irouter; - if ( old_target != new_target ) - { - old_vcpu = v->domain->vcpu[old_target]; + if ( old_vcpu != new_vcpu ) vgic_migrate_irq(old_vcpu, new_vcpu, (gicd_reg - GICD_IROUTER)/8); - } vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:33:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iBn-0005ZM-Th; Sun, 07 Jun 2015 21: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 1Z1iBm-0005ZC-BU for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:06 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 9D/85-21325-198B4755; Sun, 07 Jun 2015 21:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1433712783!7123536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18993 invoked from network); 7 Jun 2015 21:33:04 -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; 7 Jun 2015 21:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iBj-00075x-IF for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iBj-0001rO-2C for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:03 +0000 Date: Sun, 07 Jun 2015 21:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Clean the emulation of IROUTER X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca85da37fbde2f623fff4c269731addf61ccff75 Author: Julien Grall AuthorDate: Mon May 25 21:44:20 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 5 13:02:30 2015 +0100 xen/arm: vgic-v3: Clean the emulation of IROUTER The read emulation of the register IROUTER contains lots of uncessary code as irouter is already valid and doesn't need any processing before setting the value in a register. Also take the opportunity to factorize the code to find a vCPU from the affinity in a single place. It will be easier to change the way to do it later. Signed-off-by: Julien Grall Cc: Chen Baozi Acked-by: Chen Baozi Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 100 +++++++++++++++++------------------------------ 1 files changed, 36 insertions(+), 64 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 45a46c3..4af5a84 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -50,42 +50,36 @@ */ #define VGICD_CTLR_DEFAULT (GICD_CTLR_ARE_NS) -static struct vcpu *vgic_v3_irouter_to_vcpu(struct vcpu *v, uint64_t irouter) +static struct vcpu *vgic_v3_irouter_to_vcpu(struct domain *d, uint64_t irouter) { - irouter &= ~(GICD_IROUTER_SPI_MODE_ANY); - irouter = irouter & MPIDR_AFF0_MASK; - - return v->domain->vcpu[irouter]; -} + unsigned int vcpu_id; -static uint64_t vgic_v3_vcpu_to_irouter(struct vcpu *v, - unsigned int vcpu_id) -{ - uint64_t irq_affinity; - struct vcpu *v_target; + /* + * When the Interrupt Route Mode is set, the IRQ targets any vCPUs. + * For simplicity, the IRQ is always routed to vCPU0. + */ + if ( irouter & GICD_IROUTER_SPI_MODE_ANY ) + return d->vcpu[0]; - v_target = v->domain->vcpu[vcpu_id]; - irq_affinity = (MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 3) << 32 | - MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 2) << 16 | - MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 1) << 8 | - MPIDR_AFFINITY_LEVEL(v_target->arch.vmpidr, 0)); + vcpu_id = irouter & MPIDR_AFF0_MASK; + if ( vcpu_id >= d->max_vcpus ) + return NULL; - return irq_affinity; + return d->vcpu[vcpu_id]; } static struct vcpu *vgic_v3_get_target_vcpu(struct vcpu *v, unsigned int irq) { - uint64_t target; + struct vcpu *v_target; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); ASSERT(spin_is_locked(&rank->lock)); - target = rank->v3.irouter[irq % 32]; - target &= ~(GICD_IROUTER_SPI_MODE_ANY); - target &= MPIDR_AFF0_MASK; - ASSERT(target >= 0 && target < v->domain->max_vcpus); + v_target = vgic_v3_irouter_to_vcpu(v->domain, rank->v3.irouter[irq % 32]); - return v->domain->vcpu[target]; + ASSERT(v_target != NULL); + + return v_target; } static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, @@ -670,8 +664,6 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; unsigned long flags; - uint64_t irouter; - unsigned int vcpu_id; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); perfc_incr(vgicd_reads); @@ -742,17 +734,8 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) DABT_DOUBLE_WORD); if ( rank == NULL ) goto read_as_zero; vgic_lock_rank(v, rank, flags); - irouter = rank->v3.irouter[REG_RANK_INDEX(64, - (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; - /* XXX: bit[31] stores IRQ mode. Just return */ - if ( irouter & GICD_IROUTER_SPI_MODE_ANY ) - { - *r = GICD_IROUTER_SPI_MODE_ANY; - vgic_unlock_rank(v, rank, flags); - return 1; - } - vcpu_id = irouter; - *r = vgic_v3_vcpu_to_irouter(v, vcpu_id); + *r = rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: @@ -838,7 +821,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; unsigned long flags; - uint64_t new_irouter, new_target, old_target; + uint64_t new_irouter, old_irouter; struct vcpu *old_vcpu, *new_vcpu; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); @@ -910,40 +893,29 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) new_irouter = *r; vgic_lock_rank(v, rank, flags); - old_target = rank->v3.irouter[REG_RANK_INDEX(64, - (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; - old_target &= ~(GICD_IROUTER_SPI_MODE_ANY); - if ( new_irouter & GICD_IROUTER_SPI_MODE_ANY ) + old_irouter = rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), + DABT_DOUBLE_WORD)]; + old_vcpu = vgic_v3_irouter_to_vcpu(v->domain, old_irouter); + new_vcpu = vgic_v3_irouter_to_vcpu(v->domain, new_irouter); + + if ( !new_vcpu ) { + printk(XENLOG_G_DEBUG + "%pv: vGICD: wrong irouter at offset %#08x val %#"PRIregister, + v, gicd_reg, *r); + vgic_unlock_rank(v, rank, flags); /* - * IRQ routing mode set. Route any one processor in the entire - * system. We chose vcpu 0 and set IRQ mode bit[31] in irouter. + * TODO: Don't inject a fault to the guest when the MPIDR is + * not valid. From the spec, the interrupt should be + * ignored. */ - new_target = 0; - new_vcpu = v->domain->vcpu[0]; - new_irouter = GICD_IROUTER_SPI_MODE_ANY; - } - else - { - new_target = new_irouter & MPIDR_AFF0_MASK; - if ( new_target >= v->domain->max_vcpus ) - { - printk(XENLOG_G_DEBUG - "%pv: vGICD: wrong irouter at offset %#08x\n val 0x%lx vcpu %x", - v, gicd_reg, new_target, v->domain->max_vcpus); - vgic_unlock_rank(v, rank, flags); - return 0; - } - new_vcpu = vgic_v3_irouter_to_vcpu(v, new_irouter); + return 0; } - rank->v3.irouter[REG_RANK_INDEX(64, (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)] = new_irouter; - if ( old_target != new_target ) - { - old_vcpu = v->domain->vcpu[old_target]; + if ( old_vcpu != new_vcpu ) vgic_migrate_irq(old_vcpu, new_vcpu, (gicd_reg - GICD_IROUTER)/8); - } vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21: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 1Z1iBx-0005a7-WA; Sun, 07 Jun 2015 21: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 1Z1iBw-0005Zx-G3 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:16 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 80/78-03895-B98B4755; Sun, 07 Jun 2015 21:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1433712794!13954836!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28735 invoked from network); 7 Jun 2015 21:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2015 21:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iBu-000760-39 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iBt-0001rq-LW for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:13 +0000 Date: Sun, 07 Jun 2015 21:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add missing newline to 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 6a7f7c988b8c159ffad50cfee7f81c6ab3d7b037 Author: Ian Campbell AuthorDate: Thu Jun 4 16:31:41 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 5 13:02:57 2015 +0100 xen: arm: add missing newline to error message. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 376c9f2..2dd43ee 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -417,7 +417,7 @@ int route_irq_to_guest(struct domain *d, unsigned int virq, /* Only routing to virtual SPIs is supported */ if ( virq < NR_LOCAL_IRQS ) { - printk(XENLOG_G_ERR "IRQ can only be routed to an SPI"); + printk(XENLOG_G_ERR "IRQ can only be routed to an SPI\n"); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21: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 1Z1iBx-0005a7-WA; Sun, 07 Jun 2015 21: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 1Z1iBw-0005Zx-G3 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:16 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 80/78-03895-B98B4755; Sun, 07 Jun 2015 21:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1433712794!13954836!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28735 invoked from network); 7 Jun 2015 21:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2015 21:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iBu-000760-39 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iBt-0001rq-LW for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:13 +0000 Date: Sun, 07 Jun 2015 21:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add missing newline to 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 6a7f7c988b8c159ffad50cfee7f81c6ab3d7b037 Author: Ian Campbell AuthorDate: Thu Jun 4 16:31:41 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 5 13:02:57 2015 +0100 xen: arm: add missing newline to error message. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 376c9f2..2dd43ee 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -417,7 +417,7 @@ int route_irq_to_guest(struct domain *d, unsigned int virq, /* Only routing to virtual SPIs is supported */ if ( virq < NR_LOCAL_IRQS ) { - printk(XENLOG_G_ERR "IRQ can only be routed to an SPI"); + printk(XENLOG_G_ERR "IRQ can only be routed to an SPI\n"); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:33:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iC9-0005bL-2P; Sun, 07 Jun 2015 21:33:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iC7-0005bD-Rc for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:27 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 6E/FE-00727-7A8B4755; Sun, 07 Jun 2015 21:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1433712805!13956676!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2641 invoked from network); 7 Jun 2015 21:33:26 -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; 7 Jun 2015 21:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iC5-000769-EY for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iC5-0001tJ-28 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:25 +0000 Date: Sun, 07 Jun 2015 21:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/paging: remove pointless current domain checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f17f08672f21fa65c25250c19f76c021f7aa0523 Author: Jan Beulich AuthorDate: Fri Jun 5 12:09:18 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:09:18 2015 +0200 x86/paging: remove pointless current domain checks Checking that the subject domain is not the current one is pointless when already having paused that domain: domain_pause() already ASSERT()s this to be the case. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 7 ------- xen/arch/x86/mm/shadow/common.c | 3 +-- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index cea7990..d0d3f1e 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -464,13 +464,6 @@ int hap_enable(struct domain *d, u32 mode) domain_pause(d); - /* error check */ - if ( (d == current->domain) ) - { - rv = -EINVAL; - goto out; - } - old_pages = d->arch.paging.hap.total_pages; if ( old_pages == 0 ) { diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 654bacc..919b15b 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2972,8 +2972,7 @@ int shadow_enable(struct domain *d, u32 mode) domain_pause(d); /* Sanity check the arguments */ - if ( (d == current->domain) || - shadow_mode_enabled(d) || + if ( shadow_mode_enabled(d) || ((mode & PG_translate) && !(mode & PG_refcounts)) || ((mode & PG_external) && !(mode & PG_translate)) ) { -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:33:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iC9-0005bL-2P; Sun, 07 Jun 2015 21:33:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iC7-0005bD-Rc for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:27 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 6E/FE-00727-7A8B4755; Sun, 07 Jun 2015 21:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1433712805!13956676!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2641 invoked from network); 7 Jun 2015 21:33:26 -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; 7 Jun 2015 21:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iC5-000769-EY for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iC5-0001tJ-28 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:25 +0000 Date: Sun, 07 Jun 2015 21:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/paging: remove pointless current domain checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f17f08672f21fa65c25250c19f76c021f7aa0523 Author: Jan Beulich AuthorDate: Fri Jun 5 12:09:18 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:09:18 2015 +0200 x86/paging: remove pointless current domain checks Checking that the subject domain is not the current one is pointless when already having paused that domain: domain_pause() already ASSERT()s this to be the case. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 7 ------- xen/arch/x86/mm/shadow/common.c | 3 +-- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index cea7990..d0d3f1e 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -464,13 +464,6 @@ int hap_enable(struct domain *d, u32 mode) domain_pause(d); - /* error check */ - if ( (d == current->domain) ) - { - rv = -EINVAL; - goto out; - } - old_pages = d->arch.paging.hap.total_pages; if ( old_pages == 0 ) { diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 654bacc..919b15b 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2972,8 +2972,7 @@ int shadow_enable(struct domain *d, u32 mode) domain_pause(d); /* Sanity check the arguments */ - if ( (d == current->domain) || - shadow_mode_enabled(d) || + if ( shadow_mode_enabled(d) || ((mode & PG_translate) && !(mode & PG_refcounts)) || ((mode & PG_external) && !(mode & PG_translate)) ) { -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iCK-0005cl-54; Sun, 07 Jun 2015 21:33:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCI-0005cb-If for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:38 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 09/B6-31304-1B8B4755; Sun, 07 Jun 2015 21:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1433712815!9063555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28799 invoked from network); 7 Jun 2015 21:33:36 -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; 7 Jun 2015 21:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCF-00076H-JC for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCF-0001tn-IE for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:35 +0000 Date: Sun, 07 Jun 2015 21:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mem: expose typesafe mfns/gfns/pfns to common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 177bd5fb7b991e6ac461ede4d2b70c0ec5bfc294 Author: Andrew Cooper AuthorDate: Fri Jun 5 12:10:33 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:11:17 2015 +0200 mem: expose typesafe mfns/gfns/pfns to common code As the first step of memory management cleanup, introduce the common code to mfn_t, gfn_t and pfn_t. The typesafe construction moves to its own header file, while the declarations and sentinal values are moved to being common. No functional change. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/include/asm-arm/mm.h | 2 - xen/include/asm-x86/guest_pt.h | 9 ------- xen/include/asm-x86/mm.h | 37 -------------------------------- xen/include/asm-x86/paging.h | 1 - xen/include/xen/mm.h | 28 ++++++++++++++++++++++++ xen/include/xen/typesafe.h | 46 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 74 insertions(+), 49 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index c0afcec..3601140 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -310,8 +310,6 @@ static inline int relinquish_shared_pages(struct domain *d) return 0; } -#define INVALID_MFN (~0UL) - /* Xen always owns P2M on ARM */ #define set_gpfn_from_mfn(mfn, pfn) do { (void) (mfn), (void)(pfn); } while (0) #define mfn_to_gmfn(_d, mfn) (mfn) diff --git a/xen/include/asm-x86/guest_pt.h b/xen/include/asm-x86/guest_pt.h index d2a8250..cf21617 100644 --- a/xen/include/asm-x86/guest_pt.h +++ b/xen/include/asm-x86/guest_pt.h @@ -33,15 +33,6 @@ #error GUEST_PAGING_LEVELS not defined #endif -/* Type of the guest's frame numbers */ -TYPE_SAFE(unsigned long,gfn) -#define PRI_gfn "05lx" - -#ifndef gfn_t -#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ -#undef gfn_t -#endif - #define VALID_GFN(m) (m != INVALID_GFN) static inline int diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index d1f95c8..8595c38 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -433,41 +433,6 @@ extern paddr_t mem_hotplug; * guest L2 page), etc... */ -/* With this defined, we do some ugly things to force the compiler to - * give us type safety between mfns and gfns and other integers. - * TYPE_SAFE(int foo) defines a foo_t, and _foo() and foo_x() functions - * that translate beween int and foo_t. - * - * It does have some performance cost because the types now have - * a different storage attribute, so may not want it on all the time. */ - -#ifndef NDEBUG -#define TYPE_SAFETY 1 -#endif - -#ifdef TYPE_SAFETY -#define TYPE_SAFE(_type,_name) \ -typedef struct { _type _name; } _name##_t; \ -static inline _name##_t _##_name(_type n) { return (_name##_t) { n }; } \ -static inline _type _name##_x(_name##_t n) { return n._name; } -#else -#define TYPE_SAFE(_type,_name) \ -typedef _type _name##_t; \ -static inline _name##_t _##_name(_type n) { return n; } \ -static inline _type _name##_x(_name##_t n) { return n; } -#endif - -TYPE_SAFE(unsigned long,mfn); - -#ifndef mfn_t -#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ -#undef mfn_t -#endif - -/* Macro for printk formats: use as printk("%"PRI_mfn"\n", mfn_x(foo)); */ -#define PRI_mfn "05lx" - - /* * The MPT (machine->physical mapping table) is an array of word-sized * values, indexed on machine frame number. It is expected that guest OSes @@ -510,8 +475,6 @@ extern struct rangeset *mmio_ro_ranges; ? get_gpfn_from_mfn(mfn) \ : (mfn) ) -#define INVALID_MFN (~0UL) - #define compat_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) #define compat_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index c99324c..9c32665 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -255,7 +255,6 @@ static inline int paging_invlpg(struct vcpu *v, unsigned long va) * pfec[0] is used to determine which kind of access this is when * walking the tables. The caller should set the PFEC_page_present bit * in pfec[0]; in the failure case, that bit will be cleared if appropriate. */ -#define INVALID_GFN (-1UL) unsigned long paging_gva_to_gfn(struct vcpu *v, unsigned long va, uint32_t *pfec); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index a7563cd..876d370 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -48,6 +48,34 @@ #include #include #include +#include + +TYPE_SAFE(unsigned long, mfn); +#define PRI_mfn "05lx" +#define INVALID_MFN (~0UL) + +#ifndef mfn_t +#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ +#undef mfn_t +#endif + +TYPE_SAFE(unsigned long, gfn); +#define PRI_gfn "05lx" +#define INVALID_GFN (~0UL) + +#ifndef gfn_t +#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ +#undef gfn_t +#endif + +TYPE_SAFE(unsigned long, pfn); +#define PRI_pfn "05lx" +#define INVALID_PFN (~0UL) + +#ifndef pfn_t +#define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ +#undef pfn_t +#endif struct domain; struct page_info; diff --git a/xen/include/xen/typesafe.h b/xen/include/xen/typesafe.h new file mode 100644 index 0000000..7ecd3b4 --- /dev/null +++ b/xen/include/xen/typesafe.h @@ -0,0 +1,46 @@ +#ifndef __XEN_TYPESAFE_H__ +#define __XEN_TYPESAFE_H__ + +/* + * Compiler games to gain type safety between different logical integers. + * + * TYPE_SAFE($TYPE, $FOO) declares: + * * $FOO_t which encapsulates $TYPE + * * _$FOO() which boxes a $TYPE as a $FOO_t + * * $FOO_x() which unboxes a $FOO_t to $TYPE + * + * This makes a $FOO_t and a $BAR_t incompatible even when the box the same + * $TYPE. + * + * It does have some performance cost because the types now have a different + * storage attribute, so type safety is only enforced in a debug build. + * Non-debug builds degrade to a simple typedef and noops for the functions. + */ + +#ifndef NDEBUG + +#define TYPE_SAFE(_type, _name) \ + typedef struct { _type _name; } _name##_t; \ + static inline _name##_t _##_name(_type n) { return (_name##_t) { n }; } \ + static inline _type _name##_x(_name##_t n) { return n._name; } + +#else + +#define TYPE_SAFE(_type, _name) \ + typedef _type _name##_t; \ + static inline _name##_t _##_name(_type n) { return n; } \ + static inline _type _name##_x(_name##_t n) { return n; } + +#endif + +#endif /* __XEN_TYPESAFE_H__ */ + +/* + * 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 Sun Jun 07 21:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iCK-0005cl-54; Sun, 07 Jun 2015 21:33:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCI-0005cb-If for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:38 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 09/B6-31304-1B8B4755; Sun, 07 Jun 2015 21:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1433712815!9063555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28799 invoked from network); 7 Jun 2015 21:33:36 -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; 7 Jun 2015 21:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCF-00076H-JC for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCF-0001tn-IE for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:35 +0000 Date: Sun, 07 Jun 2015 21:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mem: expose typesafe mfns/gfns/pfns to common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 177bd5fb7b991e6ac461ede4d2b70c0ec5bfc294 Author: Andrew Cooper AuthorDate: Fri Jun 5 12:10:33 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:11:17 2015 +0200 mem: expose typesafe mfns/gfns/pfns to common code As the first step of memory management cleanup, introduce the common code to mfn_t, gfn_t and pfn_t. The typesafe construction moves to its own header file, while the declarations and sentinal values are moved to being common. No functional change. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/include/asm-arm/mm.h | 2 - xen/include/asm-x86/guest_pt.h | 9 ------- xen/include/asm-x86/mm.h | 37 -------------------------------- xen/include/asm-x86/paging.h | 1 - xen/include/xen/mm.h | 28 ++++++++++++++++++++++++ xen/include/xen/typesafe.h | 46 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 74 insertions(+), 49 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index c0afcec..3601140 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -310,8 +310,6 @@ static inline int relinquish_shared_pages(struct domain *d) return 0; } -#define INVALID_MFN (~0UL) - /* Xen always owns P2M on ARM */ #define set_gpfn_from_mfn(mfn, pfn) do { (void) (mfn), (void)(pfn); } while (0) #define mfn_to_gmfn(_d, mfn) (mfn) diff --git a/xen/include/asm-x86/guest_pt.h b/xen/include/asm-x86/guest_pt.h index d2a8250..cf21617 100644 --- a/xen/include/asm-x86/guest_pt.h +++ b/xen/include/asm-x86/guest_pt.h @@ -33,15 +33,6 @@ #error GUEST_PAGING_LEVELS not defined #endif -/* Type of the guest's frame numbers */ -TYPE_SAFE(unsigned long,gfn) -#define PRI_gfn "05lx" - -#ifndef gfn_t -#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ -#undef gfn_t -#endif - #define VALID_GFN(m) (m != INVALID_GFN) static inline int diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index d1f95c8..8595c38 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -433,41 +433,6 @@ extern paddr_t mem_hotplug; * guest L2 page), etc... */ -/* With this defined, we do some ugly things to force the compiler to - * give us type safety between mfns and gfns and other integers. - * TYPE_SAFE(int foo) defines a foo_t, and _foo() and foo_x() functions - * that translate beween int and foo_t. - * - * It does have some performance cost because the types now have - * a different storage attribute, so may not want it on all the time. */ - -#ifndef NDEBUG -#define TYPE_SAFETY 1 -#endif - -#ifdef TYPE_SAFETY -#define TYPE_SAFE(_type,_name) \ -typedef struct { _type _name; } _name##_t; \ -static inline _name##_t _##_name(_type n) { return (_name##_t) { n }; } \ -static inline _type _name##_x(_name##_t n) { return n._name; } -#else -#define TYPE_SAFE(_type,_name) \ -typedef _type _name##_t; \ -static inline _name##_t _##_name(_type n) { return n; } \ -static inline _type _name##_x(_name##_t n) { return n; } -#endif - -TYPE_SAFE(unsigned long,mfn); - -#ifndef mfn_t -#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ -#undef mfn_t -#endif - -/* Macro for printk formats: use as printk("%"PRI_mfn"\n", mfn_x(foo)); */ -#define PRI_mfn "05lx" - - /* * The MPT (machine->physical mapping table) is an array of word-sized * values, indexed on machine frame number. It is expected that guest OSes @@ -510,8 +475,6 @@ extern struct rangeset *mmio_ro_ranges; ? get_gpfn_from_mfn(mfn) \ : (mfn) ) -#define INVALID_MFN (~0UL) - #define compat_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) #define compat_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index c99324c..9c32665 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -255,7 +255,6 @@ static inline int paging_invlpg(struct vcpu *v, unsigned long va) * pfec[0] is used to determine which kind of access this is when * walking the tables. The caller should set the PFEC_page_present bit * in pfec[0]; in the failure case, that bit will be cleared if appropriate. */ -#define INVALID_GFN (-1UL) unsigned long paging_gva_to_gfn(struct vcpu *v, unsigned long va, uint32_t *pfec); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index a7563cd..876d370 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -48,6 +48,34 @@ #include #include #include +#include + +TYPE_SAFE(unsigned long, mfn); +#define PRI_mfn "05lx" +#define INVALID_MFN (~0UL) + +#ifndef mfn_t +#define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ +#undef mfn_t +#endif + +TYPE_SAFE(unsigned long, gfn); +#define PRI_gfn "05lx" +#define INVALID_GFN (~0UL) + +#ifndef gfn_t +#define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ +#undef gfn_t +#endif + +TYPE_SAFE(unsigned long, pfn); +#define PRI_pfn "05lx" +#define INVALID_PFN (~0UL) + +#ifndef pfn_t +#define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ +#undef pfn_t +#endif struct domain; struct page_info; diff --git a/xen/include/xen/typesafe.h b/xen/include/xen/typesafe.h new file mode 100644 index 0000000..7ecd3b4 --- /dev/null +++ b/xen/include/xen/typesafe.h @@ -0,0 +1,46 @@ +#ifndef __XEN_TYPESAFE_H__ +#define __XEN_TYPESAFE_H__ + +/* + * Compiler games to gain type safety between different logical integers. + * + * TYPE_SAFE($TYPE, $FOO) declares: + * * $FOO_t which encapsulates $TYPE + * * _$FOO() which boxes a $TYPE as a $FOO_t + * * $FOO_x() which unboxes a $FOO_t to $TYPE + * + * This makes a $FOO_t and a $BAR_t incompatible even when the box the same + * $TYPE. + * + * It does have some performance cost because the types now have a different + * storage attribute, so type safety is only enforced in a debug build. + * Non-debug builds degrade to a simple typedef and noops for the functions. + */ + +#ifndef NDEBUG + +#define TYPE_SAFE(_type, _name) \ + typedef struct { _type _name; } _name##_t; \ + static inline _name##_t _##_name(_type n) { return (_name##_t) { n }; } \ + static inline _type _name##_x(_name##_t n) { return n._name; } + +#else + +#define TYPE_SAFE(_type, _name) \ + typedef _type _name##_t; \ + static inline _name##_t _##_name(_type n) { return n; } \ + static inline _type _name##_x(_name##_t n) { return n; } + +#endif + +#endif /* __XEN_TYPESAFE_H__ */ + +/* + * 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 Sun Jun 07 21:33:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iCX-0005ek-9f; Sun, 07 Jun 2015 21:33:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCV-0005eW-33 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:51 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 9E/78-18676-EB8B4755; Sun, 07 Jun 2015 21:33:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433712826!21102916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10904 invoked from network); 7 Jun 2015 21:33:48 -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; 7 Jun 2015 21:33:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCP-00076N-Ro for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCP-0001u9-Nj for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:45 +0000 Date: Sun, 07 Jun 2015 21:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmap: convert vmap() to using mfn_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24036a580ea7e4314d72ba1309c3cf40a828ef3a Author: Andrew Cooper AuthorDate: Fri Jun 5 12:17:16 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:17:16 2015 +0200 vmap: convert vmap() to using mfn_t No functional change. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 8 +++++--- xen/arch/x86/domain_page.c | 3 ++- xen/arch/x86/mm.c | 6 +++--- xen/arch/x86/mm/shadow/multi.c | 6 +++--- xen/common/vmap.c | 14 +++++++------- xen/drivers/acpi/osl.c | 5 +++-- xen/include/xen/vmap.h | 6 +++--- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index a91ea77..feabe34 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -273,7 +273,9 @@ void clear_fixmap(unsigned map) #ifdef CONFIG_DOMAIN_PAGE void *map_domain_page_global(unsigned long mfn) { - return vmap(&mfn, 1); + mfn_t m = _mfn(mfn); + + return vmap(&m, 1); } void unmap_domain_page_global(const void *va) @@ -794,10 +796,10 @@ void *__init arch_vmap_virt_end(void) */ void *ioremap_attr(paddr_t pa, size_t len, unsigned int attributes) { - unsigned long pfn = PFN_DOWN(pa); + mfn_t mfn = _mfn(PFN_DOWN(pa)); unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); - void *ptr = __vmap(&pfn, nr, 1, 1, attributes); + void *ptr = __vmap(&mfn, nr, 1, 1, attributes); if ( ptr == NULL ) return NULL; diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 7954998..8f3217b 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -322,6 +322,7 @@ int mapcache_vcpu_init(struct vcpu *v) void *map_domain_page_global(unsigned long mfn) { + mfn_t m = _mfn(mfn); ASSERT(!in_irq() && local_irq_is_enabled()); #ifdef NDEBUG @@ -329,7 +330,7 @@ void *map_domain_page_global(unsigned long mfn) return mfn_to_virt(mfn); #endif - return vmap(&mfn, 1); + return vmap(&m, 1); } void unmap_domain_page_global(const void *ptr) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 7a7a854..1c0783f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5883,10 +5883,10 @@ void *__init arch_vmap_virt_end(void) void __iomem *ioremap(paddr_t pa, size_t len) { - unsigned long pfn = PFN_DOWN(pa); + mfn_t mfn = _mfn(PFN_DOWN(pa)); void *va; - WARN_ON(page_is_ram_type(pfn, RAM_TYPE_CONVENTIONAL)); + WARN_ON(page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL)); /* The low first Mb is always mapped. */ if ( !((pa + len - 1) >> 20) ) @@ -5896,7 +5896,7 @@ void __iomem *ioremap(paddr_t pa, size_t len) unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); - va = __vmap(&pfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; + va = __vmap(&mfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; } return (void __force __iomem *)va; diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 43e70d8..6edac71 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4670,7 +4670,7 @@ static void *emulate_map_dest(struct vcpu *v, } else { - unsigned long mfns[2]; + mfn_t mfns[2]; /* Cross-page emulated writes are only supported for HVM guests; * PV guests ought to know better */ @@ -4689,8 +4689,8 @@ static void *emulate_map_dest(struct vcpu *v, /* Cross-page writes mean probably not a pagetable */ sh_remove_shadows(d, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); - mfns[0] = mfn_x(sh_ctxt->mfn1); - mfns[1] = mfn_x(sh_ctxt->mfn2); + mfns[0] = sh_ctxt->mfn1; + mfns[1] = sh_ctxt->mfn2; map = vmap(mfns, 2); if ( !map ) return MAPPING_UNHANDLEABLE; diff --git a/xen/common/vmap.c b/xen/common/vmap.c index ac66a8c..c57239f 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -181,7 +181,7 @@ void vm_free(const void *va) spin_unlock(&vm_lock); } -void *__vmap(const unsigned long *mfn, unsigned int granularity, +void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr, unsigned int align, unsigned int flags) { void *va = vm_alloc(nr * granularity, align); @@ -189,7 +189,7 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, for ( ; va && nr--; ++mfn, cur += PAGE_SIZE * granularity ) { - if ( map_pages_to_xen(cur, *mfn, granularity, flags) ) + if ( map_pages_to_xen(cur, mfn_x(*mfn), granularity, flags) ) { vunmap(va); va = NULL; @@ -199,7 +199,7 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, return va; } -void *vmap(const unsigned long *mfn, unsigned int nr) +void *vmap(const mfn_t *mfn, unsigned int nr) { return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR); } @@ -218,7 +218,7 @@ void vunmap(const void *va) void *vmalloc(size_t size) { - unsigned long *mfn; + mfn_t *mfn; size_t pages, i; struct page_info *pg; void *va; @@ -226,7 +226,7 @@ void *vmalloc(size_t size) ASSERT(size); pages = PFN_UP(size); - mfn = xmalloc_array(unsigned long, pages); + mfn = xmalloc_array(mfn_t, pages); if ( mfn == NULL ) return NULL; @@ -235,7 +235,7 @@ void *vmalloc(size_t size) pg = alloc_domheap_page(NULL, 0); if ( pg == NULL ) goto error; - mfn[i] = page_to_mfn(pg); + mfn[i] = _mfn(page_to_mfn(pg)); } va = vmap(mfn, pages); @@ -247,7 +247,7 @@ void *vmalloc(size_t size) error: while ( i-- ) - free_domheap_page(mfn_to_page(mfn[i])); + free_domheap_page(mfn_to_page(mfn_x(mfn[i]))); xfree(mfn); return NULL; } diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index 93c983c..4c09859 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -88,13 +88,14 @@ void __iomem * acpi_os_map_memory(acpi_physical_address phys, acpi_size size) { if (system_state >= SYS_STATE_active) { - unsigned long pfn = PFN_DOWN(phys); + mfn_t mfn = _mfn(PFN_DOWN(phys)); unsigned int offs = phys & (PAGE_SIZE - 1); /* The low first Mb is always mapped. */ if ( !((phys + size - 1) >> 20) ) return __va(phys); - return __vmap(&pfn, PFN_UP(offs + size), 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; + return __vmap(&mfn, PFN_UP(offs + size), 1, 1, + PAGE_HYPERVISOR_NOCACHE) + offs; } return __acpi_map_table(phys, size); } diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index a13591d..5671ac8 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -1,15 +1,15 @@ #if !defined(__XEN_VMAP_H__) && defined(VMAP_VIRT_START) #define __XEN_VMAP_H__ -#include +#include #include void *vm_alloc(unsigned int nr, unsigned int align); void vm_free(const void *); -void *__vmap(const unsigned long *mfn, unsigned int granularity, +void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr, unsigned int align, unsigned int flags); -void *vmap(const unsigned long *mfn, unsigned int nr); +void *vmap(const mfn_t *mfn, unsigned int nr); void vunmap(const void *); void *vmalloc(size_t size); void *vzalloc(size_t 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 Sun Jun 07 21:33:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:33: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 1Z1iCX-0005ek-9f; Sun, 07 Jun 2015 21:33:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCV-0005eW-33 for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:51 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 9E/78-18676-EB8B4755; Sun, 07 Jun 2015 21:33:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433712826!21102916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10904 invoked from network); 7 Jun 2015 21:33:48 -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; 7 Jun 2015 21:33:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCP-00076N-Ro for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCP-0001u9-Nj for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:45 +0000 Date: Sun, 07 Jun 2015 21:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmap: convert vmap() to using mfn_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24036a580ea7e4314d72ba1309c3cf40a828ef3a Author: Andrew Cooper AuthorDate: Fri Jun 5 12:17:16 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:17:16 2015 +0200 vmap: convert vmap() to using mfn_t No functional change. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 8 +++++--- xen/arch/x86/domain_page.c | 3 ++- xen/arch/x86/mm.c | 6 +++--- xen/arch/x86/mm/shadow/multi.c | 6 +++--- xen/common/vmap.c | 14 +++++++------- xen/drivers/acpi/osl.c | 5 +++-- xen/include/xen/vmap.h | 6 +++--- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index a91ea77..feabe34 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -273,7 +273,9 @@ void clear_fixmap(unsigned map) #ifdef CONFIG_DOMAIN_PAGE void *map_domain_page_global(unsigned long mfn) { - return vmap(&mfn, 1); + mfn_t m = _mfn(mfn); + + return vmap(&m, 1); } void unmap_domain_page_global(const void *va) @@ -794,10 +796,10 @@ void *__init arch_vmap_virt_end(void) */ void *ioremap_attr(paddr_t pa, size_t len, unsigned int attributes) { - unsigned long pfn = PFN_DOWN(pa); + mfn_t mfn = _mfn(PFN_DOWN(pa)); unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); - void *ptr = __vmap(&pfn, nr, 1, 1, attributes); + void *ptr = __vmap(&mfn, nr, 1, 1, attributes); if ( ptr == NULL ) return NULL; diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 7954998..8f3217b 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -322,6 +322,7 @@ int mapcache_vcpu_init(struct vcpu *v) void *map_domain_page_global(unsigned long mfn) { + mfn_t m = _mfn(mfn); ASSERT(!in_irq() && local_irq_is_enabled()); #ifdef NDEBUG @@ -329,7 +330,7 @@ void *map_domain_page_global(unsigned long mfn) return mfn_to_virt(mfn); #endif - return vmap(&mfn, 1); + return vmap(&m, 1); } void unmap_domain_page_global(const void *ptr) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 7a7a854..1c0783f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5883,10 +5883,10 @@ void *__init arch_vmap_virt_end(void) void __iomem *ioremap(paddr_t pa, size_t len) { - unsigned long pfn = PFN_DOWN(pa); + mfn_t mfn = _mfn(PFN_DOWN(pa)); void *va; - WARN_ON(page_is_ram_type(pfn, RAM_TYPE_CONVENTIONAL)); + WARN_ON(page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL)); /* The low first Mb is always mapped. */ if ( !((pa + len - 1) >> 20) ) @@ -5896,7 +5896,7 @@ void __iomem *ioremap(paddr_t pa, size_t len) unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); - va = __vmap(&pfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; + va = __vmap(&mfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; } return (void __force __iomem *)va; diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 43e70d8..6edac71 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4670,7 +4670,7 @@ static void *emulate_map_dest(struct vcpu *v, } else { - unsigned long mfns[2]; + mfn_t mfns[2]; /* Cross-page emulated writes are only supported for HVM guests; * PV guests ought to know better */ @@ -4689,8 +4689,8 @@ static void *emulate_map_dest(struct vcpu *v, /* Cross-page writes mean probably not a pagetable */ sh_remove_shadows(d, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); - mfns[0] = mfn_x(sh_ctxt->mfn1); - mfns[1] = mfn_x(sh_ctxt->mfn2); + mfns[0] = sh_ctxt->mfn1; + mfns[1] = sh_ctxt->mfn2; map = vmap(mfns, 2); if ( !map ) return MAPPING_UNHANDLEABLE; diff --git a/xen/common/vmap.c b/xen/common/vmap.c index ac66a8c..c57239f 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -181,7 +181,7 @@ void vm_free(const void *va) spin_unlock(&vm_lock); } -void *__vmap(const unsigned long *mfn, unsigned int granularity, +void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr, unsigned int align, unsigned int flags) { void *va = vm_alloc(nr * granularity, align); @@ -189,7 +189,7 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, for ( ; va && nr--; ++mfn, cur += PAGE_SIZE * granularity ) { - if ( map_pages_to_xen(cur, *mfn, granularity, flags) ) + if ( map_pages_to_xen(cur, mfn_x(*mfn), granularity, flags) ) { vunmap(va); va = NULL; @@ -199,7 +199,7 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, return va; } -void *vmap(const unsigned long *mfn, unsigned int nr) +void *vmap(const mfn_t *mfn, unsigned int nr) { return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR); } @@ -218,7 +218,7 @@ void vunmap(const void *va) void *vmalloc(size_t size) { - unsigned long *mfn; + mfn_t *mfn; size_t pages, i; struct page_info *pg; void *va; @@ -226,7 +226,7 @@ void *vmalloc(size_t size) ASSERT(size); pages = PFN_UP(size); - mfn = xmalloc_array(unsigned long, pages); + mfn = xmalloc_array(mfn_t, pages); if ( mfn == NULL ) return NULL; @@ -235,7 +235,7 @@ void *vmalloc(size_t size) pg = alloc_domheap_page(NULL, 0); if ( pg == NULL ) goto error; - mfn[i] = page_to_mfn(pg); + mfn[i] = _mfn(page_to_mfn(pg)); } va = vmap(mfn, pages); @@ -247,7 +247,7 @@ void *vmalloc(size_t size) error: while ( i-- ) - free_domheap_page(mfn_to_page(mfn[i])); + free_domheap_page(mfn_to_page(mfn_x(mfn[i]))); xfree(mfn); return NULL; } diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index 93c983c..4c09859 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -88,13 +88,14 @@ void __iomem * acpi_os_map_memory(acpi_physical_address phys, acpi_size size) { if (system_state >= SYS_STATE_active) { - unsigned long pfn = PFN_DOWN(phys); + mfn_t mfn = _mfn(PFN_DOWN(phys)); unsigned int offs = phys & (PAGE_SIZE - 1); /* The low first Mb is always mapped. */ if ( !((phys + size - 1) >> 20) ) return __va(phys); - return __vmap(&pfn, PFN_UP(offs + size), 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; + return __vmap(&mfn, PFN_UP(offs + size), 1, 1, + PAGE_HYPERVISOR_NOCACHE) + offs; } return __acpi_map_table(phys, size); } diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index a13591d..5671ac8 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -1,15 +1,15 @@ #if !defined(__XEN_VMAP_H__) && defined(VMAP_VIRT_START) #define __XEN_VMAP_H__ -#include +#include #include void *vm_alloc(unsigned int nr, unsigned int align); void vm_free(const void *); -void *__vmap(const unsigned long *mfn, unsigned int granularity, +void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr, unsigned int align, unsigned int flags); -void *vmap(const unsigned long *mfn, unsigned int nr); +void *vmap(const mfn_t *mfn, unsigned int nr); void vunmap(const void *); void *vmalloc(size_t size); void *vzalloc(size_t 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 Sun Jun 07 21:34:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:34: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 1Z1iCg-0005gH-CB; Sun, 07 Jun 2015 21:34:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCe-0005g0-HD for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:00 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 13/07-31650-7C8B4755; Sun, 07 Jun 2015 21:33:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1433712836!21072763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21765 invoked from network); 7 Jun 2015 21:33:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2015 21:33:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCa-00076U-1b for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCZ-0001uW-Vc for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:56 +0000 Date: Sun, 07 Jun 2015 21:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vm_event: clean up control-register-write vm_events and add XCR0 event X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 712bdd018502f9bf88bb761ea648860bb0302d3b Author: Razvan Cojocaru AuthorDate: Fri Jun 5 12:20:18 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:20:18 2015 +0200 vm_event: clean up control-register-write vm_events and add XCR0 event As suggested by Andrew Cooper, this patch attempts to remove some redundancy and allow for an easier time when adding vm_events for new control registers in the future, by having a single VM_EVENT_REASON_WRITE_CTRLREG vm_event type, meant to serve CR0, CR3, CR4 and (newly introduced) XCR0. The actual control register will be deduced by the new .index field in vm_event_write_ctrlreg (renamed from vm_event_mov_to_cr). Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Kevin Tian Acked-by: Ian Campbell Acked-by: Tim Deegan --- tools/libxc/include/xenctrl.h | 9 ++---- tools/libxc/xc_monitor.c | 40 +++--------------------- xen/arch/x86/hvm/event.c | 55 +++++++++------------------------ xen/arch/x86/hvm/hvm.c | 11 ++++-- xen/arch/x86/hvm/vmx/vmx.c | 6 ++- xen/arch/x86/monitor.c | 63 ++++++++++++++------------------------ xen/include/asm-x86/domain.h | 12 ++----- xen/include/asm-x86/hvm/event.h | 6 ++-- xen/include/asm-x86/monitor.h | 2 + xen/include/public/domctl.h | 12 ++++---- xen/include/public/vm_event.h | 29 ++++++++++-------- 11 files changed, 87 insertions(+), 158 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 100b89c..50fa9e7 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2375,12 +2375,9 @@ int xc_mem_access_disable_emulate(xc_interface *xch, domid_t domain_id); void *xc_monitor_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); int xc_monitor_disable(xc_interface *xch, domid_t domain_id); int xc_monitor_resume(xc_interface *xch, domid_t domain_id); -int xc_monitor_mov_to_cr0(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly); -int xc_monitor_mov_to_cr3(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly); -int xc_monitor_mov_to_cr4(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly); +int xc_monitor_write_ctrlreg(xc_interface *xch, domid_t domain_id, + uint16_t index, bool enable, bool sync, + bool onchangeonly); int xc_monitor_mov_to_msr(xc_interface *xch, domid_t domain_id, bool enable, bool extended_capture); int xc_monitor_singlestep(xc_interface *xch, domid_t domain_id, bool enable); diff --git a/tools/libxc/xc_monitor.c b/tools/libxc/xc_monitor.c index 87ad968..63013de 100644 --- a/tools/libxc/xc_monitor.c +++ b/tools/libxc/xc_monitor.c @@ -45,8 +45,9 @@ int xc_monitor_resume(xc_interface *xch, domid_t domain_id) NULL); } -int xc_monitor_mov_to_cr0(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly) +int xc_monitor_write_ctrlreg(xc_interface *xch, domid_t domain_id, + uint16_t index, bool enable, bool sync, + bool onchangeonly) { DECLARE_DOMCTL; @@ -54,39 +55,8 @@ int xc_monitor_mov_to_cr0(xc_interface *xch, domid_t domain_id, bool enable, domctl.domain = domain_id; domctl.u.monitor_op.op = enable ? XEN_DOMCTL_MONITOR_OP_ENABLE : XEN_DOMCTL_MONITOR_OP_DISABLE; - domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR0; - domctl.u.monitor_op.u.mov_to_cr.sync = sync; - domctl.u.monitor_op.u.mov_to_cr.onchangeonly = onchangeonly; - - return do_domctl(xch, &domctl); -} - -int xc_monitor_mov_to_cr3(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly) -{ - DECLARE_DOMCTL; - - domctl.cmd = XEN_DOMCTL_monitor_op; - domctl.domain = domain_id; - domctl.u.monitor_op.op = enable ? XEN_DOMCTL_MONITOR_OP_ENABLE - : XEN_DOMCTL_MONITOR_OP_DISABLE; - domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR3; - domctl.u.monitor_op.u.mov_to_cr.sync = sync; - domctl.u.monitor_op.u.mov_to_cr.onchangeonly = onchangeonly; - - return do_domctl(xch, &domctl); -} - -int xc_monitor_mov_to_cr4(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly) -{ - DECLARE_DOMCTL; - - domctl.cmd = XEN_DOMCTL_monitor_op; - domctl.domain = domain_id; - domctl.u.monitor_op.op = enable ? XEN_DOMCTL_MONITOR_OP_ENABLE - : XEN_DOMCTL_MONITOR_OP_DISABLE; - domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR4; + domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG; + domctl.u.monitor_op.u.mov_to_cr.index = index; domctl.u.monitor_op.u.mov_to_cr.sync = sync; domctl.u.monitor_op.u.mov_to_cr.onchangeonly = onchangeonly; diff --git a/xen/arch/x86/hvm/event.c b/xen/arch/x86/hvm/event.c index 9d5f9f3..53b9ca4 100644 --- a/xen/arch/x86/hvm/event.c +++ b/xen/arch/x86/hvm/event.c @@ -21,6 +21,8 @@ #include #include +#include +#include #include static void hvm_event_fill_regs(vm_event_request_t *req) @@ -88,55 +90,28 @@ static int hvm_event_traps(uint8_t sync, vm_event_request_t *req) return 1; } -static inline -void hvm_event_cr(uint32_t reason, unsigned long value, - unsigned long old, bool_t onchangeonly, bool_t sync) +void hvm_event_cr(unsigned int index, unsigned long value, unsigned long old) { - if ( onchangeonly && value == old ) - return; - else + struct arch_domain *currad = ¤t->domain->arch; + unsigned int ctrlreg_bitmask = monitor_ctrlreg_bitmask(index); + + if ( (currad->monitor.write_ctrlreg_enabled & ctrlreg_bitmask) && + (!(currad->monitor.write_ctrlreg_onchangeonly & ctrlreg_bitmask) || + value != old) ) { vm_event_request_t req = { - .reason = reason, + .reason = VM_EVENT_REASON_WRITE_CTRLREG, .vcpu_id = current->vcpu_id, - .u.mov_to_cr.new_value = value, - .u.mov_to_cr.old_value = old + .u.write_ctrlreg.index = index, + .u.write_ctrlreg.new_value = value, + .u.write_ctrlreg.old_value = old }; - hvm_event_traps(sync, &req); + hvm_event_traps(currad->monitor.write_ctrlreg_sync & ctrlreg_bitmask, + &req); } } -void hvm_event_cr0(unsigned long value, unsigned long old) -{ - struct arch_domain *currad = ¤t->domain->arch; - - if ( currad->monitor.mov_to_cr0_enabled ) - hvm_event_cr(VM_EVENT_REASON_MOV_TO_CR0, value, old, - currad->monitor.mov_to_cr0_onchangeonly, - currad->monitor.mov_to_cr0_sync); -} - -void hvm_event_cr3(unsigned long value, unsigned long old) -{ - struct arch_domain *currad = ¤t->domain->arch; - - if ( currad->monitor.mov_to_cr3_enabled ) - hvm_event_cr(VM_EVENT_REASON_MOV_TO_CR3, value, old, - currad->monitor.mov_to_cr3_onchangeonly, - currad->monitor.mov_to_cr3_sync); -} - -void hvm_event_cr4(unsigned long value, unsigned long old) -{ - struct arch_domain *currad = ¤t->domain->arch; - - if ( currad->monitor.mov_to_cr4_enabled ) - hvm_event_cr(VM_EVENT_REASON_MOV_TO_CR4, value, old, - currad->monitor.mov_to_cr4_onchangeonly, - currad->monitor.mov_to_cr4_sync); -} - void hvm_event_msr(unsigned int msr, uint64_t value) { struct vcpu *curr = current; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 89423fa..b1023bb 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2985,11 +2985,14 @@ out: int hvm_handle_xsetbv(u32 index, u64 new_bv) { struct segment_register sreg; + struct vcpu *curr = current; - hvm_get_segment_register(current, x86_seg_ss, &sreg); + hvm_get_segment_register(curr, x86_seg_ss, &sreg); if ( sreg.attr.fields.dpl != 0 ) goto err; + hvm_event_crX(XCR0, new_bv, curr->arch.xcr0); + if ( handle_xsetbv(index, new_bv) ) goto err; @@ -3287,7 +3290,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); - hvm_event_cr0(value, old_value); + hvm_event_crX(CR0, value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) @@ -3328,7 +3331,7 @@ int hvm_set_cr3(unsigned long value) old=v->arch.hvm_vcpu.guest_cr[3]; v->arch.hvm_vcpu.guest_cr[3] = value; paging_update_cr3(v); - hvm_event_cr3(value, old); + hvm_event_crX(CR3, value, old); return X86EMUL_OKAY; bad_cr3: @@ -3369,7 +3372,7 @@ int hvm_set_cr4(unsigned long value) } hvm_update_cr(v, 4, value); - hvm_event_cr4(value, old_cr); + hvm_event_crX(CR4, value, old_cr); /* * Modifying CR4.{PSE,PAE,PGE,SMEP}, or clearing CR4.PCIDE diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 74f563f..af257db 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -57,6 +57,7 @@ #include #include #include +#include #include static bool_t __initdata opt_force_ept; @@ -1262,7 +1263,8 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) v->arch.hvm_vmx.exec_control |= cr3_ctls; /* Trap CR3 updates if CR3 memory events are enabled. */ - if ( v->domain->arch.monitor.mov_to_cr3_enabled ) + if ( v->domain->arch.monitor.write_ctrlreg_enabled & + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3) ) v->arch.hvm_vmx.exec_control |= CPU_BASED_CR3_LOAD_EXITING; vmx_update_cpu_exec_control(v); @@ -2010,7 +2012,7 @@ static int vmx_cr_access(unsigned long exit_qualification) unsigned long old = curr->arch.hvm_vcpu.guest_cr[0]; curr->arch.hvm_vcpu.guest_cr[0] &= ~X86_CR0_TS; vmx_update_guest_cr(curr, 0); - hvm_event_cr0(curr->arch.hvm_vcpu.guest_cr[0], old); + hvm_event_crX(CR0, curr->arch.hvm_vcpu.guest_cr[0], old); HVMTRACE_0D(CLTS); break; } diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c index d7b1c18..896acf7 100644 --- a/xen/arch/x86/monitor.c +++ b/xen/arch/x86/monitor.c @@ -67,59 +67,42 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) switch ( mop->event ) { - case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR0: + case XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG: { - bool_t status = ad->monitor.mov_to_cr0_enabled; - - rc = status_check(mop, status); - if ( rc ) - return rc; - - ad->monitor.mov_to_cr0_sync = mop->u.mov_to_cr.sync; - ad->monitor.mov_to_cr0_onchangeonly = mop->u.mov_to_cr.onchangeonly; - - domain_pause(d); - ad->monitor.mov_to_cr0_enabled = !status; - domain_unpause(d); - break; - } - - case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR3: - { - bool_t status = ad->monitor.mov_to_cr3_enabled; + unsigned int ctrlreg_bitmask = + monitor_ctrlreg_bitmask(mop->u.mov_to_cr.index); + bool_t status = + !!(ad->monitor.write_ctrlreg_enabled & ctrlreg_bitmask); struct vcpu *v; rc = status_check(mop, status); if ( rc ) return rc; - ad->monitor.mov_to_cr3_sync = mop->u.mov_to_cr.sync; - ad->monitor.mov_to_cr3_onchangeonly = mop->u.mov_to_cr.onchangeonly; + if ( mop->u.mov_to_cr.sync ) + ad->monitor.write_ctrlreg_sync |= ctrlreg_bitmask; + else + ad->monitor.write_ctrlreg_sync &= ~ctrlreg_bitmask; - domain_pause(d); - ad->monitor.mov_to_cr3_enabled = !status; - domain_unpause(d); + if ( mop->u.mov_to_cr.onchangeonly ) + ad->monitor.write_ctrlreg_onchangeonly |= ctrlreg_bitmask; + else + ad->monitor.write_ctrlreg_onchangeonly &= ~ctrlreg_bitmask; - /* Latches new CR3 mask through CR0 code */ - for_each_vcpu ( d, v ) - hvm_funcs.update_guest_cr(v, 0); - break; - } + domain_pause(d); - case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR4: - { - bool_t status = ad->monitor.mov_to_cr4_enabled; + if ( !status ) + ad->monitor.write_ctrlreg_enabled |= ctrlreg_bitmask; + else + ad->monitor.write_ctrlreg_enabled &= ~ctrlreg_bitmask; - rc = status_check(mop, status); - if ( rc ) - return rc; + domain_unpause(d); - ad->monitor.mov_to_cr4_sync = mop->u.mov_to_cr.sync; - ad->monitor.mov_to_cr4_onchangeonly = mop->u.mov_to_cr.onchangeonly; + if ( mop->u.mov_to_cr.index == VM_EVENT_X86_CR3 ) + /* Latches new CR3 mask through CR0 code */ + for_each_vcpu ( d, v ) + hvm_funcs.update_guest_cr(v, 0); - domain_pause(d); - ad->monitor.mov_to_cr4_enabled = !status; - domain_unpause(d); break; } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 45b5283..a3c117f 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -341,15 +341,9 @@ struct arch_domain /* Monitor options */ struct { - uint16_t mov_to_cr0_enabled : 1; - uint16_t mov_to_cr0_sync : 1; - uint16_t mov_to_cr0_onchangeonly : 1; - uint16_t mov_to_cr3_enabled : 1; - uint16_t mov_to_cr3_sync : 1; - uint16_t mov_to_cr3_onchangeonly : 1; - uint16_t mov_to_cr4_enabled : 1; - uint16_t mov_to_cr4_sync : 1; - uint16_t mov_to_cr4_onchangeonly : 1; + uint16_t write_ctrlreg_enabled : 4; + uint16_t write_ctrlreg_sync : 4; + uint16_t write_ctrlreg_onchangeonly : 4; uint16_t mov_to_msr_enabled : 1; uint16_t mov_to_msr_extended : 1; uint16_t singlestep_enabled : 1; diff --git a/xen/include/asm-x86/hvm/event.h b/xen/include/asm-x86/hvm/event.h index bb757a1..819ef96 100644 --- a/xen/include/asm-x86/hvm/event.h +++ b/xen/include/asm-x86/hvm/event.h @@ -19,9 +19,9 @@ #define __ASM_X86_HVM_EVENT_H__ /* Called for current VCPU on crX/MSR changes by guest */ -void hvm_event_cr0(unsigned long value, unsigned long old); -void hvm_event_cr3(unsigned long value, unsigned long old); -void hvm_event_cr4(unsigned long value, unsigned long old); +void hvm_event_cr(unsigned int index, unsigned long value, unsigned long old); +#define hvm_event_crX(what, new, old) \ + hvm_event_cr(VM_EVENT_X86_##what, new, old) void hvm_event_msr(unsigned int msr, uint64_t value); /* Called for current VCPU: returns -1 if no listener */ int hvm_event_int3(unsigned long gla); diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h index 21b3e5b..d5815db 100644 --- a/xen/include/asm-x86/monitor.h +++ b/xen/include/asm-x86/monitor.h @@ -26,6 +26,8 @@ struct domain; struct xen_domctl_monitor_op; +#define monitor_ctrlreg_bitmask(ctrlreg_index) (1U << (ctrlreg_index)) + int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *op); #endif /* __ASM_X86_MONITOR_H__ */ diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 88f8002..bc45ea5 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1008,12 +1008,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cmt_op_t); #define XEN_DOMCTL_MONITOR_OP_ENABLE 0 #define XEN_DOMCTL_MONITOR_OP_DISABLE 1 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR0 0 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR3 1 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR4 2 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR 3 -#define XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP 4 -#define XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT 5 +#define XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG 0 +#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR 1 +#define XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP 2 +#define XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT 3 struct xen_domctl_monitor_op { uint32_t op; /* XEN_DOMCTL_MONITOR_OP_* */ @@ -1024,6 +1022,8 @@ struct xen_domctl_monitor_op { */ union { struct { + /* Which control register */ + uint8_t index; /* Pause vCPU until response */ uint8_t sync; /* Send event only on a change of value */ diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h index c7426de..577e971 100644 --- a/xen/include/public/vm_event.h +++ b/xen/include/public/vm_event.h @@ -60,22 +60,24 @@ #define VM_EVENT_REASON_MEM_SHARING 2 /* Memory paging event */ #define VM_EVENT_REASON_MEM_PAGING 3 -/* CR0 was updated */ -#define VM_EVENT_REASON_MOV_TO_CR0 4 -/* CR3 was updated */ -#define VM_EVENT_REASON_MOV_TO_CR3 5 -/* CR4 was updated */ -#define VM_EVENT_REASON_MOV_TO_CR4 6 +/* A control register was updated */ +#define VM_EVENT_REASON_WRITE_CTRLREG 4 /* An MSR was updated. */ -#define VM_EVENT_REASON_MOV_TO_MSR 7 +#define VM_EVENT_REASON_MOV_TO_MSR 5 /* Debug operation executed (e.g. int3) */ -#define VM_EVENT_REASON_SOFTWARE_BREAKPOINT 8 +#define VM_EVENT_REASON_SOFTWARE_BREAKPOINT 6 /* Single-step (e.g. MTF) */ -#define VM_EVENT_REASON_SINGLESTEP 9 +#define VM_EVENT_REASON_SINGLESTEP 7 + +/* Supported values for the vm_event_write_ctrlreg index. */ +#define VM_EVENT_X86_CR0 0 +#define VM_EVENT_X86_CR3 1 +#define VM_EVENT_X86_CR4 2 +#define VM_EVENT_X86_XCR0 3 /* * Using a custom struct (not hvm_hw_cpu) so as to not fill - * the mem_event ring buffer too quickly. + * the vm_event ring buffer too quickly. */ struct vm_event_regs_x86 { uint64_t rax; @@ -156,14 +158,15 @@ struct vm_event_mem_access { uint32_t _pad; }; -struct vm_event_mov_to_cr { +struct vm_event_write_ctrlreg { + uint32_t index; + uint32_t _pad; uint64_t new_value; uint64_t old_value; }; struct vm_event_debug { uint64_t gfn; - uint32_t _pad; }; struct vm_event_mov_to_msr { @@ -196,7 +199,7 @@ typedef struct vm_event_st { struct vm_event_paging mem_paging; struct vm_event_sharing mem_sharing; struct vm_event_mem_access mem_access; - struct vm_event_mov_to_cr mov_to_cr; + struct vm_event_write_ctrlreg write_ctrlreg; struct vm_event_mov_to_msr mov_to_msr; struct vm_event_debug software_breakpoint; struct vm_event_debug singlestep; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:34:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:34: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 1Z1iCg-0005gH-CB; Sun, 07 Jun 2015 21:34:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCe-0005g0-HD for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:00 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 13/07-31650-7C8B4755; Sun, 07 Jun 2015 21:33:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1433712836!21072763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21765 invoked from network); 7 Jun 2015 21:33:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2015 21:33:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCa-00076U-1b for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCZ-0001uW-Vc for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:33:56 +0000 Date: Sun, 07 Jun 2015 21:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vm_event: clean up control-register-write vm_events and add XCR0 event X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 712bdd018502f9bf88bb761ea648860bb0302d3b Author: Razvan Cojocaru AuthorDate: Fri Jun 5 12:20:18 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 5 12:20:18 2015 +0200 vm_event: clean up control-register-write vm_events and add XCR0 event As suggested by Andrew Cooper, this patch attempts to remove some redundancy and allow for an easier time when adding vm_events for new control registers in the future, by having a single VM_EVENT_REASON_WRITE_CTRLREG vm_event type, meant to serve CR0, CR3, CR4 and (newly introduced) XCR0. The actual control register will be deduced by the new .index field in vm_event_write_ctrlreg (renamed from vm_event_mov_to_cr). Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Kevin Tian Acked-by: Ian Campbell Acked-by: Tim Deegan --- tools/libxc/include/xenctrl.h | 9 ++---- tools/libxc/xc_monitor.c | 40 +++--------------------- xen/arch/x86/hvm/event.c | 55 +++++++++------------------------ xen/arch/x86/hvm/hvm.c | 11 ++++-- xen/arch/x86/hvm/vmx/vmx.c | 6 ++- xen/arch/x86/monitor.c | 63 ++++++++++++++------------------------ xen/include/asm-x86/domain.h | 12 ++----- xen/include/asm-x86/hvm/event.h | 6 ++-- xen/include/asm-x86/monitor.h | 2 + xen/include/public/domctl.h | 12 ++++---- xen/include/public/vm_event.h | 29 ++++++++++-------- 11 files changed, 87 insertions(+), 158 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 100b89c..50fa9e7 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2375,12 +2375,9 @@ int xc_mem_access_disable_emulate(xc_interface *xch, domid_t domain_id); void *xc_monitor_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); int xc_monitor_disable(xc_interface *xch, domid_t domain_id); int xc_monitor_resume(xc_interface *xch, domid_t domain_id); -int xc_monitor_mov_to_cr0(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly); -int xc_monitor_mov_to_cr3(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly); -int xc_monitor_mov_to_cr4(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly); +int xc_monitor_write_ctrlreg(xc_interface *xch, domid_t domain_id, + uint16_t index, bool enable, bool sync, + bool onchangeonly); int xc_monitor_mov_to_msr(xc_interface *xch, domid_t domain_id, bool enable, bool extended_capture); int xc_monitor_singlestep(xc_interface *xch, domid_t domain_id, bool enable); diff --git a/tools/libxc/xc_monitor.c b/tools/libxc/xc_monitor.c index 87ad968..63013de 100644 --- a/tools/libxc/xc_monitor.c +++ b/tools/libxc/xc_monitor.c @@ -45,8 +45,9 @@ int xc_monitor_resume(xc_interface *xch, domid_t domain_id) NULL); } -int xc_monitor_mov_to_cr0(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly) +int xc_monitor_write_ctrlreg(xc_interface *xch, domid_t domain_id, + uint16_t index, bool enable, bool sync, + bool onchangeonly) { DECLARE_DOMCTL; @@ -54,39 +55,8 @@ int xc_monitor_mov_to_cr0(xc_interface *xch, domid_t domain_id, bool enable, domctl.domain = domain_id; domctl.u.monitor_op.op = enable ? XEN_DOMCTL_MONITOR_OP_ENABLE : XEN_DOMCTL_MONITOR_OP_DISABLE; - domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR0; - domctl.u.monitor_op.u.mov_to_cr.sync = sync; - domctl.u.monitor_op.u.mov_to_cr.onchangeonly = onchangeonly; - - return do_domctl(xch, &domctl); -} - -int xc_monitor_mov_to_cr3(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly) -{ - DECLARE_DOMCTL; - - domctl.cmd = XEN_DOMCTL_monitor_op; - domctl.domain = domain_id; - domctl.u.monitor_op.op = enable ? XEN_DOMCTL_MONITOR_OP_ENABLE - : XEN_DOMCTL_MONITOR_OP_DISABLE; - domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR3; - domctl.u.monitor_op.u.mov_to_cr.sync = sync; - domctl.u.monitor_op.u.mov_to_cr.onchangeonly = onchangeonly; - - return do_domctl(xch, &domctl); -} - -int xc_monitor_mov_to_cr4(xc_interface *xch, domid_t domain_id, bool enable, - bool sync, bool onchangeonly) -{ - DECLARE_DOMCTL; - - domctl.cmd = XEN_DOMCTL_monitor_op; - domctl.domain = domain_id; - domctl.u.monitor_op.op = enable ? XEN_DOMCTL_MONITOR_OP_ENABLE - : XEN_DOMCTL_MONITOR_OP_DISABLE; - domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR4; + domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG; + domctl.u.monitor_op.u.mov_to_cr.index = index; domctl.u.monitor_op.u.mov_to_cr.sync = sync; domctl.u.monitor_op.u.mov_to_cr.onchangeonly = onchangeonly; diff --git a/xen/arch/x86/hvm/event.c b/xen/arch/x86/hvm/event.c index 9d5f9f3..53b9ca4 100644 --- a/xen/arch/x86/hvm/event.c +++ b/xen/arch/x86/hvm/event.c @@ -21,6 +21,8 @@ #include #include +#include +#include #include static void hvm_event_fill_regs(vm_event_request_t *req) @@ -88,55 +90,28 @@ static int hvm_event_traps(uint8_t sync, vm_event_request_t *req) return 1; } -static inline -void hvm_event_cr(uint32_t reason, unsigned long value, - unsigned long old, bool_t onchangeonly, bool_t sync) +void hvm_event_cr(unsigned int index, unsigned long value, unsigned long old) { - if ( onchangeonly && value == old ) - return; - else + struct arch_domain *currad = ¤t->domain->arch; + unsigned int ctrlreg_bitmask = monitor_ctrlreg_bitmask(index); + + if ( (currad->monitor.write_ctrlreg_enabled & ctrlreg_bitmask) && + (!(currad->monitor.write_ctrlreg_onchangeonly & ctrlreg_bitmask) || + value != old) ) { vm_event_request_t req = { - .reason = reason, + .reason = VM_EVENT_REASON_WRITE_CTRLREG, .vcpu_id = current->vcpu_id, - .u.mov_to_cr.new_value = value, - .u.mov_to_cr.old_value = old + .u.write_ctrlreg.index = index, + .u.write_ctrlreg.new_value = value, + .u.write_ctrlreg.old_value = old }; - hvm_event_traps(sync, &req); + hvm_event_traps(currad->monitor.write_ctrlreg_sync & ctrlreg_bitmask, + &req); } } -void hvm_event_cr0(unsigned long value, unsigned long old) -{ - struct arch_domain *currad = ¤t->domain->arch; - - if ( currad->monitor.mov_to_cr0_enabled ) - hvm_event_cr(VM_EVENT_REASON_MOV_TO_CR0, value, old, - currad->monitor.mov_to_cr0_onchangeonly, - currad->monitor.mov_to_cr0_sync); -} - -void hvm_event_cr3(unsigned long value, unsigned long old) -{ - struct arch_domain *currad = ¤t->domain->arch; - - if ( currad->monitor.mov_to_cr3_enabled ) - hvm_event_cr(VM_EVENT_REASON_MOV_TO_CR3, value, old, - currad->monitor.mov_to_cr3_onchangeonly, - currad->monitor.mov_to_cr3_sync); -} - -void hvm_event_cr4(unsigned long value, unsigned long old) -{ - struct arch_domain *currad = ¤t->domain->arch; - - if ( currad->monitor.mov_to_cr4_enabled ) - hvm_event_cr(VM_EVENT_REASON_MOV_TO_CR4, value, old, - currad->monitor.mov_to_cr4_onchangeonly, - currad->monitor.mov_to_cr4_sync); -} - void hvm_event_msr(unsigned int msr, uint64_t value) { struct vcpu *curr = current; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 89423fa..b1023bb 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2985,11 +2985,14 @@ out: int hvm_handle_xsetbv(u32 index, u64 new_bv) { struct segment_register sreg; + struct vcpu *curr = current; - hvm_get_segment_register(current, x86_seg_ss, &sreg); + hvm_get_segment_register(curr, x86_seg_ss, &sreg); if ( sreg.attr.fields.dpl != 0 ) goto err; + hvm_event_crX(XCR0, new_bv, curr->arch.xcr0); + if ( handle_xsetbv(index, new_bv) ) goto err; @@ -3287,7 +3290,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); - hvm_event_cr0(value, old_value); + hvm_event_crX(CR0, value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) @@ -3328,7 +3331,7 @@ int hvm_set_cr3(unsigned long value) old=v->arch.hvm_vcpu.guest_cr[3]; v->arch.hvm_vcpu.guest_cr[3] = value; paging_update_cr3(v); - hvm_event_cr3(value, old); + hvm_event_crX(CR3, value, old); return X86EMUL_OKAY; bad_cr3: @@ -3369,7 +3372,7 @@ int hvm_set_cr4(unsigned long value) } hvm_update_cr(v, 4, value); - hvm_event_cr4(value, old_cr); + hvm_event_crX(CR4, value, old_cr); /* * Modifying CR4.{PSE,PAE,PGE,SMEP}, or clearing CR4.PCIDE diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 74f563f..af257db 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -57,6 +57,7 @@ #include #include #include +#include #include static bool_t __initdata opt_force_ept; @@ -1262,7 +1263,8 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) v->arch.hvm_vmx.exec_control |= cr3_ctls; /* Trap CR3 updates if CR3 memory events are enabled. */ - if ( v->domain->arch.monitor.mov_to_cr3_enabled ) + if ( v->domain->arch.monitor.write_ctrlreg_enabled & + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3) ) v->arch.hvm_vmx.exec_control |= CPU_BASED_CR3_LOAD_EXITING; vmx_update_cpu_exec_control(v); @@ -2010,7 +2012,7 @@ static int vmx_cr_access(unsigned long exit_qualification) unsigned long old = curr->arch.hvm_vcpu.guest_cr[0]; curr->arch.hvm_vcpu.guest_cr[0] &= ~X86_CR0_TS; vmx_update_guest_cr(curr, 0); - hvm_event_cr0(curr->arch.hvm_vcpu.guest_cr[0], old); + hvm_event_crX(CR0, curr->arch.hvm_vcpu.guest_cr[0], old); HVMTRACE_0D(CLTS); break; } diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c index d7b1c18..896acf7 100644 --- a/xen/arch/x86/monitor.c +++ b/xen/arch/x86/monitor.c @@ -67,59 +67,42 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) switch ( mop->event ) { - case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR0: + case XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG: { - bool_t status = ad->monitor.mov_to_cr0_enabled; - - rc = status_check(mop, status); - if ( rc ) - return rc; - - ad->monitor.mov_to_cr0_sync = mop->u.mov_to_cr.sync; - ad->monitor.mov_to_cr0_onchangeonly = mop->u.mov_to_cr.onchangeonly; - - domain_pause(d); - ad->monitor.mov_to_cr0_enabled = !status; - domain_unpause(d); - break; - } - - case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR3: - { - bool_t status = ad->monitor.mov_to_cr3_enabled; + unsigned int ctrlreg_bitmask = + monitor_ctrlreg_bitmask(mop->u.mov_to_cr.index); + bool_t status = + !!(ad->monitor.write_ctrlreg_enabled & ctrlreg_bitmask); struct vcpu *v; rc = status_check(mop, status); if ( rc ) return rc; - ad->monitor.mov_to_cr3_sync = mop->u.mov_to_cr.sync; - ad->monitor.mov_to_cr3_onchangeonly = mop->u.mov_to_cr.onchangeonly; + if ( mop->u.mov_to_cr.sync ) + ad->monitor.write_ctrlreg_sync |= ctrlreg_bitmask; + else + ad->monitor.write_ctrlreg_sync &= ~ctrlreg_bitmask; - domain_pause(d); - ad->monitor.mov_to_cr3_enabled = !status; - domain_unpause(d); + if ( mop->u.mov_to_cr.onchangeonly ) + ad->monitor.write_ctrlreg_onchangeonly |= ctrlreg_bitmask; + else + ad->monitor.write_ctrlreg_onchangeonly &= ~ctrlreg_bitmask; - /* Latches new CR3 mask through CR0 code */ - for_each_vcpu ( d, v ) - hvm_funcs.update_guest_cr(v, 0); - break; - } + domain_pause(d); - case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR4: - { - bool_t status = ad->monitor.mov_to_cr4_enabled; + if ( !status ) + ad->monitor.write_ctrlreg_enabled |= ctrlreg_bitmask; + else + ad->monitor.write_ctrlreg_enabled &= ~ctrlreg_bitmask; - rc = status_check(mop, status); - if ( rc ) - return rc; + domain_unpause(d); - ad->monitor.mov_to_cr4_sync = mop->u.mov_to_cr.sync; - ad->monitor.mov_to_cr4_onchangeonly = mop->u.mov_to_cr.onchangeonly; + if ( mop->u.mov_to_cr.index == VM_EVENT_X86_CR3 ) + /* Latches new CR3 mask through CR0 code */ + for_each_vcpu ( d, v ) + hvm_funcs.update_guest_cr(v, 0); - domain_pause(d); - ad->monitor.mov_to_cr4_enabled = !status; - domain_unpause(d); break; } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 45b5283..a3c117f 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -341,15 +341,9 @@ struct arch_domain /* Monitor options */ struct { - uint16_t mov_to_cr0_enabled : 1; - uint16_t mov_to_cr0_sync : 1; - uint16_t mov_to_cr0_onchangeonly : 1; - uint16_t mov_to_cr3_enabled : 1; - uint16_t mov_to_cr3_sync : 1; - uint16_t mov_to_cr3_onchangeonly : 1; - uint16_t mov_to_cr4_enabled : 1; - uint16_t mov_to_cr4_sync : 1; - uint16_t mov_to_cr4_onchangeonly : 1; + uint16_t write_ctrlreg_enabled : 4; + uint16_t write_ctrlreg_sync : 4; + uint16_t write_ctrlreg_onchangeonly : 4; uint16_t mov_to_msr_enabled : 1; uint16_t mov_to_msr_extended : 1; uint16_t singlestep_enabled : 1; diff --git a/xen/include/asm-x86/hvm/event.h b/xen/include/asm-x86/hvm/event.h index bb757a1..819ef96 100644 --- a/xen/include/asm-x86/hvm/event.h +++ b/xen/include/asm-x86/hvm/event.h @@ -19,9 +19,9 @@ #define __ASM_X86_HVM_EVENT_H__ /* Called for current VCPU on crX/MSR changes by guest */ -void hvm_event_cr0(unsigned long value, unsigned long old); -void hvm_event_cr3(unsigned long value, unsigned long old); -void hvm_event_cr4(unsigned long value, unsigned long old); +void hvm_event_cr(unsigned int index, unsigned long value, unsigned long old); +#define hvm_event_crX(what, new, old) \ + hvm_event_cr(VM_EVENT_X86_##what, new, old) void hvm_event_msr(unsigned int msr, uint64_t value); /* Called for current VCPU: returns -1 if no listener */ int hvm_event_int3(unsigned long gla); diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h index 21b3e5b..d5815db 100644 --- a/xen/include/asm-x86/monitor.h +++ b/xen/include/asm-x86/monitor.h @@ -26,6 +26,8 @@ struct domain; struct xen_domctl_monitor_op; +#define monitor_ctrlreg_bitmask(ctrlreg_index) (1U << (ctrlreg_index)) + int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *op); #endif /* __ASM_X86_MONITOR_H__ */ diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 88f8002..bc45ea5 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1008,12 +1008,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cmt_op_t); #define XEN_DOMCTL_MONITOR_OP_ENABLE 0 #define XEN_DOMCTL_MONITOR_OP_DISABLE 1 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR0 0 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR3 1 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_CR4 2 -#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR 3 -#define XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP 4 -#define XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT 5 +#define XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG 0 +#define XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR 1 +#define XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP 2 +#define XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT 3 struct xen_domctl_monitor_op { uint32_t op; /* XEN_DOMCTL_MONITOR_OP_* */ @@ -1024,6 +1022,8 @@ struct xen_domctl_monitor_op { */ union { struct { + /* Which control register */ + uint8_t index; /* Pause vCPU until response */ uint8_t sync; /* Send event only on a change of value */ diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h index c7426de..577e971 100644 --- a/xen/include/public/vm_event.h +++ b/xen/include/public/vm_event.h @@ -60,22 +60,24 @@ #define VM_EVENT_REASON_MEM_SHARING 2 /* Memory paging event */ #define VM_EVENT_REASON_MEM_PAGING 3 -/* CR0 was updated */ -#define VM_EVENT_REASON_MOV_TO_CR0 4 -/* CR3 was updated */ -#define VM_EVENT_REASON_MOV_TO_CR3 5 -/* CR4 was updated */ -#define VM_EVENT_REASON_MOV_TO_CR4 6 +/* A control register was updated */ +#define VM_EVENT_REASON_WRITE_CTRLREG 4 /* An MSR was updated. */ -#define VM_EVENT_REASON_MOV_TO_MSR 7 +#define VM_EVENT_REASON_MOV_TO_MSR 5 /* Debug operation executed (e.g. int3) */ -#define VM_EVENT_REASON_SOFTWARE_BREAKPOINT 8 +#define VM_EVENT_REASON_SOFTWARE_BREAKPOINT 6 /* Single-step (e.g. MTF) */ -#define VM_EVENT_REASON_SINGLESTEP 9 +#define VM_EVENT_REASON_SINGLESTEP 7 + +/* Supported values for the vm_event_write_ctrlreg index. */ +#define VM_EVENT_X86_CR0 0 +#define VM_EVENT_X86_CR3 1 +#define VM_EVENT_X86_CR4 2 +#define VM_EVENT_X86_XCR0 3 /* * Using a custom struct (not hvm_hw_cpu) so as to not fill - * the mem_event ring buffer too quickly. + * the vm_event ring buffer too quickly. */ struct vm_event_regs_x86 { uint64_t rax; @@ -156,14 +158,15 @@ struct vm_event_mem_access { uint32_t _pad; }; -struct vm_event_mov_to_cr { +struct vm_event_write_ctrlreg { + uint32_t index; + uint32_t _pad; uint64_t new_value; uint64_t old_value; }; struct vm_event_debug { uint64_t gfn; - uint32_t _pad; }; struct vm_event_mov_to_msr { @@ -196,7 +199,7 @@ typedef struct vm_event_st { struct vm_event_paging mem_paging; struct vm_event_sharing mem_sharing; struct vm_event_mem_access mem_access; - struct vm_event_mov_to_cr mov_to_cr; + struct vm_event_write_ctrlreg write_ctrlreg; struct vm_event_mov_to_msr mov_to_msr; struct vm_event_debug software_breakpoint; struct vm_event_debug singlestep; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 07 21:34:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCo-0005hy-Gq; Sun, 07 Jun 2015 21:34:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCm-0005he-SV for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:08 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 92/E4-19853-0D8B4755; Sun, 07 Jun 2015 21:34:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1433712846!9063583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29761 invoked from network); 7 Jun 2015 21:34:07 -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; 7 Jun 2015 21:34:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCk-000775-8f for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCk-0001v9-6E for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:06 +0000 Date: Sun, 07 Jun 2015 21:34:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecdae1cfaa7f6123decaa1b9d7205c3ff726b941 Merge: 6a7f7c988b8c159ffad50cfee7f81c6ab3d7b037 712bdd018502f9bf88bb761ea648860bb0302d3b Author: Ian Campbell AuthorDate: Fri Jun 5 14:35:49 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 5 14:35:49 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/libxc/include/xenctrl.h | 9 ++---- tools/libxc/xc_monitor.c | 40 +++--------------------- xen/arch/arm/mm.c | 8 +++-- xen/arch/x86/domain_page.c | 3 +- xen/arch/x86/hvm/event.c | 55 +++++++++------------------------ xen/arch/x86/hvm/hvm.c | 11 ++++-- xen/arch/x86/hvm/vmx/vmx.c | 6 ++- xen/arch/x86/mm.c | 6 ++-- xen/arch/x86/mm/hap/hap.c | 7 ---- xen/arch/x86/mm/shadow/common.c | 3 +- xen/arch/x86/mm/shadow/multi.c | 6 ++-- xen/arch/x86/monitor.c | 63 ++++++++++++++------------------------ xen/common/vmap.c | 14 ++++---- xen/drivers/acpi/osl.c | 5 ++- xen/include/asm-arm/mm.h | 2 - xen/include/asm-x86/domain.h | 12 ++----- xen/include/asm-x86/guest_pt.h | 9 ----- xen/include/asm-x86/hvm/event.h | 6 ++-- xen/include/asm-x86/mm.h | 37 ----------------------- xen/include/asm-x86/monitor.h | 2 + xen/include/asm-x86/paging.h | 1 - xen/include/public/domctl.h | 12 ++++---- xen/include/public/vm_event.h | 29 ++++++++++-------- xen/include/xen/mm.h | 28 +++++++++++++++++ xen/include/xen/typesafe.h | 46 ++++++++++++++++++++++++++++ xen/include/xen/vmap.h | 6 ++-- 26 files changed, 188 insertions(+), 238 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 07 21:34:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Jun 2015 21:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCo-0005hy-Gq; Sun, 07 Jun 2015 21:34:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCm-0005he-SV for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:08 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 92/E4-19853-0D8B4755; Sun, 07 Jun 2015 21:34:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1433712846!9063583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29761 invoked from network); 7 Jun 2015 21:34:07 -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; 7 Jun 2015 21:34:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z1iCk-000775-8f for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z1iCk-0001v9-6E for xen-changelog@lists.xensource.com; Sun, 07 Jun 2015 21:34:06 +0000 Date: Sun, 07 Jun 2015 21:34:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecdae1cfaa7f6123decaa1b9d7205c3ff726b941 Merge: 6a7f7c988b8c159ffad50cfee7f81c6ab3d7b037 712bdd018502f9bf88bb761ea648860bb0302d3b Author: Ian Campbell AuthorDate: Fri Jun 5 14:35:49 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 5 14:35:49 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/libxc/include/xenctrl.h | 9 ++---- tools/libxc/xc_monitor.c | 40 +++--------------------- xen/arch/arm/mm.c | 8 +++-- xen/arch/x86/domain_page.c | 3 +- xen/arch/x86/hvm/event.c | 55 +++++++++------------------------ xen/arch/x86/hvm/hvm.c | 11 ++++-- xen/arch/x86/hvm/vmx/vmx.c | 6 ++- xen/arch/x86/mm.c | 6 ++-- xen/arch/x86/mm/hap/hap.c | 7 ---- xen/arch/x86/mm/shadow/common.c | 3 +- xen/arch/x86/mm/shadow/multi.c | 6 ++-- xen/arch/x86/monitor.c | 63 ++++++++++++++------------------------ xen/common/vmap.c | 14 ++++---- xen/drivers/acpi/osl.c | 5 ++- xen/include/asm-arm/mm.h | 2 - xen/include/asm-x86/domain.h | 12 ++----- xen/include/asm-x86/guest_pt.h | 9 ----- xen/include/asm-x86/hvm/event.h | 6 ++-- xen/include/asm-x86/mm.h | 37 ----------------------- xen/include/asm-x86/monitor.h | 2 + xen/include/asm-x86/paging.h | 1 - xen/include/public/domctl.h | 12 ++++---- xen/include/public/vm_event.h | 29 ++++++++++-------- xen/include/xen/mm.h | 28 +++++++++++++++++ xen/include/xen/typesafe.h | 46 ++++++++++++++++++++++++++++ xen/include/xen/vmap.h | 6 ++-- 26 files changed, 188 insertions(+), 238 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LLt-0000Xg-1K; Tue, 09 Jun 2015 15: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 1Z2LLs-0000XL-8l for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:08 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id F8/D7-31304-F9407755; Tue, 09 Jun 2015 15:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1433863325!12975682!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23748 invoked from network); 9 Jun 2015 15:22:06 -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; 9 Jun 2015 15:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LLn-0001l7-C4 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LLm-0001wN-Vw for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:03 +0000 Date: Tue, 09 Jun 2015 15:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] The old logic didn't work as intended when an access spanned multiple X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a9fdd6114c15ebfa1c9ea0e9ccd57def05cf526 Author: Jan Beulich AuthorDate: Tue Jun 9 16:12:30 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:12:30 2015 +0100 The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LLt-0000Xg-1K; Tue, 09 Jun 2015 15: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 1Z2LLs-0000XL-8l for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:08 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id F8/D7-31304-F9407755; Tue, 09 Jun 2015 15:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1433863325!12975682!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23748 invoked from network); 9 Jun 2015 15:22:06 -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; 9 Jun 2015 15:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LLn-0001l7-C4 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LLm-0001wN-Vw for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:03 +0000 Date: Tue, 09 Jun 2015 15:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] The old logic didn't work as intended when an access spanned multiple X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a9fdd6114c15ebfa1c9ea0e9ccd57def05cf526 Author: Jan Beulich AuthorDate: Tue Jun 9 16:12:30 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:12:30 2015 +0100 The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LM4-0000Zd-4I; Tue, 09 Jun 2015 15:22:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LM2-0000ZN-Pb for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:18 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id DA/05-25881-AA407755; Tue, 09 Jun 2015 15:22:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433863336!12933493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29945 invoked from network); 9 Jun 2015 15:22:17 -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; 9 Jun 2015 15:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LM0-0001lG-83 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LLz-0001wx-Nq for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:15 +0000 Date: Tue, 09 Jun 2015 15:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] It's being used by the hypervisor. For now simply mimic a device not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df0abbff66b3d4cb8d692b9b38cd3cfcb371d850 Author: Jan Beulich AuthorDate: Tue Jun 9 16:12:55 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:12:55 2015 +0100 It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LM4-0000Zd-4I; Tue, 09 Jun 2015 15:22:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LM2-0000ZN-Pb for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:18 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id DA/05-25881-AA407755; Tue, 09 Jun 2015 15:22:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433863336!12933493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29945 invoked from network); 9 Jun 2015 15:22:17 -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; 9 Jun 2015 15:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LM0-0001lG-83 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LLz-0001wx-Nq for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:15 +0000 Date: Tue, 09 Jun 2015 15:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] It's being used by the hypervisor. For now simply mimic a device not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df0abbff66b3d4cb8d692b9b38cd3cfcb371d850 Author: Jan Beulich AuthorDate: Tue Jun 9 16:12:55 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:12:55 2015 +0100 It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LME-0000e0-74; Tue, 09 Jun 2015 15:22:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMD-0000d4-8D for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:29 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id C5/7F-08467-4B407755; Tue, 09 Jun 2015 15:22:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1433863346!12951862!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16304 invoked from network); 9 Jun 2015 15:22:27 -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; 9 Jun 2015 15:22:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMA-0001lQ-DT for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMA-0001xK-Bx for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:26 +0000 Date: Tue, 09 Jun 2015 15:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] ... to avoid allowing the guest to cause the control domain's disk to X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 490ef713a85ae073ae074a7e1d434a4220d64351 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:00 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:00 2015 +0100 ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LME-0000e0-74; Tue, 09 Jun 2015 15:22:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMD-0000d4-8D for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:29 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id C5/7F-08467-4B407755; Tue, 09 Jun 2015 15:22:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1433863346!12951862!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16304 invoked from network); 9 Jun 2015 15:22:27 -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; 9 Jun 2015 15:22:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMA-0001lQ-DT for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMA-0001xK-Bx for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:26 +0000 Date: Tue, 09 Jun 2015 15:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] ... to avoid allowing the guest to cause the control domain's disk to X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 490ef713a85ae073ae074a7e1d434a4220d64351 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:00 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:00 2015 +0100 ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LMO-0000fx-9c; Tue, 09 Jun 2015 15:22:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMM-0000fh-Rd for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:38 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id D5/CB-15949-EB407755; Tue, 09 Jun 2015 15:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1433863356!5370465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6064 invoked from network); 9 Jun 2015 15:22:37 -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; 9 Jun 2015 15:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMK-0001lY-Ie for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMK-0001yH-HT for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:36 +0000 Date: Tue, 09 Jun 2015 15:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] Without this the actual XSA-131 fix would cause the enable bit to not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d3e28955f88c52b27bc1d9819795868930bdff4 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LMO-0000fx-9c; Tue, 09 Jun 2015 15:22:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMM-0000fh-Rd for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:38 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id D5/CB-15949-EB407755; Tue, 09 Jun 2015 15:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1433863356!5370465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6064 invoked from network); 9 Jun 2015 15:22:37 -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; 9 Jun 2015 15:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMK-0001lY-Ie for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMK-0001yH-HT for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:36 +0000 Date: Tue, 09 Jun 2015 15:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] Without this the actual XSA-131 fix would cause the enable bit to not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d3e28955f88c52b27bc1d9819795868930bdff4 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LMY-0000i2-CA; Tue, 09 Jun 2015 15: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 1Z2LMX-0000hi-8v for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:49 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 6C/72-05081-8C407755; Tue, 09 Jun 2015 15:22:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433863366!12933996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31744 invoked from network); 9 Jun 2015 15:22: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; 9 Jun 2015 15:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMU-0001le-Ou for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMU-0001yd-Ma for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:46 +0000 Date: Tue, 09 Jun 2015 15:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] There's no point in xen_pt_pmcsr_reg_{read, write}() each ORing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5104c5170bddbf00686462245a9e7dbb0dff213a Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:22:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LMY-0000i2-CA; Tue, 09 Jun 2015 15: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 1Z2LMX-0000hi-8v for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:49 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 6C/72-05081-8C407755; Tue, 09 Jun 2015 15:22:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1433863366!12933996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31744 invoked from network); 9 Jun 2015 15:22: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; 9 Jun 2015 15:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMU-0001le-Ou for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMU-0001yd-Ma for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:46 +0000 Date: Tue, 09 Jun 2015 15:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] There's no point in xen_pt_pmcsr_reg_{read, write}() each ORing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5104c5170bddbf00686462245a9e7dbb0dff213a Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LMi-0000kP-Ib; Tue, 09 Jun 2015 15:23:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMh-0000k4-4t for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:59 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id B4/0B-21325-2D407755; Tue, 09 Jun 2015 15:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1433863377!12951132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6471 invoked from network); 9 Jun 2015 15:22:57 -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; 9 Jun 2015 15:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMe-0001ll-U3 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMe-0001z7-T7 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:56 +0000 Date: Tue, 09 Jun 2015 15:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50c69a0b2e8e1c734a08ff0e94872c7a5f28c7e8 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LMi-0000kP-Ib; Tue, 09 Jun 2015 15:23:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMh-0000k4-4t for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:59 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id B4/0B-21325-2D407755; Tue, 09 Jun 2015 15:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1433863377!12951132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6471 invoked from network); 9 Jun 2015 15:22:57 -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; 9 Jun 2015 15:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMe-0001ll-U3 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMe-0001z7-T7 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:22:56 +0000 Date: Tue, 09 Jun 2015 15:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50c69a0b2e8e1c734a08ff0e94872c7a5f28c7e8 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LMv-0000mk-LL; Tue, 09 Jun 2015 15:23:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMt-0000mQ-P9 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 1E/3A-29123-ED407755; Tue, 09 Jun 2015 15:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1433863387!21692895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25764 invoked from network); 9 Jun 2015 15:23:09 -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; 9 Jun 2015 15:23:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMp-0001mO-5Z for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMp-0001zg-4c for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:07 +0000 Date: Tue, 09 Jun 2015 15:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] This is just to avoid having to adjust that calculation later 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 7a2383ac363810b82ccaac6670e092b71c02a525 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LMv-0000mk-LL; Tue, 09 Jun 2015 15:23:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMt-0000mQ-P9 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 1E/3A-29123-ED407755; Tue, 09 Jun 2015 15:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1433863387!21692895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25764 invoked from network); 9 Jun 2015 15:23:09 -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; 9 Jun 2015 15:23:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMp-0001mO-5Z for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMp-0001zg-4c for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:07 +0000 Date: Tue, 09 Jun 2015 15:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] This is just to avoid having to adjust that calculation later 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 7a2383ac363810b82ccaac6670e092b71c02a525 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LN4-0000oe-Nx; Tue, 09 Jun 2015 15:23:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LN3-0000o4-0o for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:21 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id DF/13-32733-7E407755; Tue, 09 Jun 2015 15:23:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1433863397!17142246!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19395 invoked from network); 9 Jun 2015 15:23:19 -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; 9 Jun 2015 15:23:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMz-0001mS-9u for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMz-00020A-8z for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:17 +0000 Date: Tue, 09 Jun 2015 15:23:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21260261162434d43735b1304d3ef4d428906412 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LN4-0000oe-Nx; Tue, 09 Jun 2015 15:23:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LN3-0000o4-0o for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:21 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id DF/13-32733-7E407755; Tue, 09 Jun 2015 15:23:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1433863397!17142246!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19395 invoked from network); 9 Jun 2015 15:23:19 -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; 9 Jun 2015 15:23:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LMz-0001mS-9u for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LMz-00020A-8z for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:17 +0000 Date: Tue, 09 Jun 2015 15:23:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21260261162434d43735b1304d3ef4d428906412 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LND-0000qI-Qc; Tue, 09 Jun 2015 15:23:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNC-0000pv-4P for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:30 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4B/00-13517-1F407755; Tue, 09 Jun 2015 15:23:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1433863407!14640447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5537 invoked from network); 9 Jun 2015 15:23:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:23:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LN9-0001me-H6 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LN9-00020X-DF for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:27 +0000 Date: Tue, 09 Jun 2015 15:23:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] The adjustments are solely to make the subsequent patches work right X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e32bea70046019bad64efb0d2103dcf1013e19dd Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LND-0000qI-Qc; Tue, 09 Jun 2015 15:23:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNC-0000pv-4P for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:30 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4B/00-13517-1F407755; Tue, 09 Jun 2015 15:23:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1433863407!14640447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5537 invoked from network); 9 Jun 2015 15:23:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:23:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LN9-0001me-H6 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LN9-00020X-DF for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:27 +0000 Date: Tue, 09 Jun 2015 15:23:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] The adjustments are solely to make the subsequent patches work right X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e32bea70046019bad64efb0d2103dcf1013e19dd Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LNN-0000s5-VF; Tue, 09 Jun 2015 15:23:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNM-0000ri-3J for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:40 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 4B/4C-21325-BF407755; Tue, 09 Jun 2015 15:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433863418!12996994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10292 invoked from network); 9 Jun 2015 15:23:38 -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; 9 Jun 2015 15:23:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNJ-0001nY-Qf for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LNJ-00021g-LO for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:37 +0000 Date: Tue, 09 Jun 2015 15:23:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] Since the next patch will turn all not explicitly described fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7a6dad2990063eaa13bf0e8c4c3a952cfff7421 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LNN-0000s5-VF; Tue, 09 Jun 2015 15:23:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNM-0000ri-3J for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:40 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 4B/4C-21325-BF407755; Tue, 09 Jun 2015 15:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433863418!12996994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10292 invoked from network); 9 Jun 2015 15:23:38 -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; 9 Jun 2015 15:23:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNJ-0001nY-Qf for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LNJ-00021g-LO for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:37 +0000 Date: Tue, 09 Jun 2015 15:23:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] Since the next patch will turn all not explicitly described fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7a6dad2990063eaa13bf0e8c4c3a952cfff7421 Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LNY-0000ug-5Y; Tue, 09 Jun 2015 15:23:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNW-0000uK-Jj for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:50 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 0F/82-19853-50507755; Tue, 09 Jun 2015 15:23:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433863428!12933893!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8268 invoked from network); 9 Jun 2015 15:23:49 -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; 9 Jun 2015 15:23:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNU-0001nj-1x for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LNU-00022f-0M for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:48 +0000 Date: Tue, 09 Jun 2015 15:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] ... by default. Add a per-device "permissive" mode similar to pciback'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 38609ae72b0a9e09b42be94f469fef928a1049fa Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:23:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:23: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 1Z2LNY-0000ug-5Y; Tue, 09 Jun 2015 15:23:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNW-0000uK-Jj for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:50 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 0F/82-19853-50507755; Tue, 09 Jun 2015 15:23:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433863428!12933893!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8268 invoked from network); 9 Jun 2015 15:23:49 -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; 9 Jun 2015 15:23:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LNU-0001nj-1x for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LNU-00022f-0M for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:23:48 +0000 Date: Tue, 09 Jun 2015 15:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] ... by default. Add a per-device "permissive" mode similar to pciback'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 38609ae72b0a9e09b42be94f469fef928a1049fa Author: Jan Beulich AuthorDate: Tue Jun 9 16:13:11 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:13:11 2015 +0100 ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 09 15:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LWV-0001xK-Sc; Tue, 09 Jun 2015 15:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWU-0001wn-Mg for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:06 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 7E/20-10593-13707755; Tue, 09 Jun 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1433863984!14646854!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2440 invoked from network); 9 Jun 2015 15:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWS-0001vU-42 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWR-0002Ul-R0 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:03 +0000 Date: Tue, 09 Jun 2015 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] The old logic didn't work as intended when an access spanned multiple X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fc82bfe038cc1df32231268cda018b1310549d3 Author: Jan Beulich AuthorDate: Tue Jun 9 16:31:57 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:31:57 2015 +0100 The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LWV-0001xK-Sc; Tue, 09 Jun 2015 15:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWU-0001wn-Mg for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:06 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 7E/20-10593-13707755; Tue, 09 Jun 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1433863984!14646854!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2440 invoked from network); 9 Jun 2015 15:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWS-0001vU-42 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWR-0002Ul-R0 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:03 +0000 Date: Tue, 09 Jun 2015 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] The old logic didn't work as intended when an access spanned multiple X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fc82bfe038cc1df32231268cda018b1310549d3 Author: Jan Beulich AuthorDate: Tue Jun 9 16:31:57 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:31:57 2015 +0100 The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWh-00021x-BU; Tue, 09 Jun 2015 15:33:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWg-00021h-CH for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:18 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id DB/0A-30151-D3707755; Tue, 09 Jun 2015 15:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1433863994!21793171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18203 invoked from network); 9 Jun 2015 15:33:16 -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; 9 Jun 2015 15:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWc-0001vd-Em for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWc-0002VD-8c for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:14 +0000 Date: Tue, 09 Jun 2015 15:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] It's being used by the hypervisor. For now simply mimic a device not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f99bb9c097c46f6a77292bcd94e6038d75c26a9 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:00 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:00 2015 +0100 It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWh-00021x-BU; Tue, 09 Jun 2015 15:33:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWg-00021h-CH for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:18 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id DB/0A-30151-D3707755; Tue, 09 Jun 2015 15:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1433863994!21793171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18203 invoked from network); 9 Jun 2015 15:33:16 -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; 9 Jun 2015 15:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWc-0001vd-Em for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWc-0002VD-8c for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:14 +0000 Date: Tue, 09 Jun 2015 15:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] It's being used by the hypervisor. For now simply mimic a device not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f99bb9c097c46f6a77292bcd94e6038d75c26a9 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:00 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:00 2015 +0100 It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LWq-00025Z-Dz; Tue, 09 Jun 2015 15:33:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWo-00024Z-Vw for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:27 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 25/EA-31258-64707755; Tue, 09 Jun 2015 15:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433864004!21793151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32162 invoked from network); 9 Jun 2015 15:33:25 -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; 9 Jun 2015 15:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWm-0001vk-KL for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWm-0002Va-I0 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:24 +0000 Date: Tue, 09 Jun 2015 15:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] ... to avoid allowing the guest to cause the control domain's disk to X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51f3b5b0ec56a607d43df507b0cb1cfdf1b7678e Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:19 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:19 2015 +0100 ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LWq-00025Z-Dz; Tue, 09 Jun 2015 15:33:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWo-00024Z-Vw for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:27 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 25/EA-31258-64707755; Tue, 09 Jun 2015 15:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433864004!21793151!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32162 invoked from network); 9 Jun 2015 15:33:25 -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; 9 Jun 2015 15:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWm-0001vk-KL for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWm-0002Va-I0 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:24 +0000 Date: Tue, 09 Jun 2015 15:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] ... to avoid allowing the guest to cause the control domain's disk to X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51f3b5b0ec56a607d43df507b0cb1cfdf1b7678e Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:19 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:19 2015 +0100 ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LX0-00029Q-Ns; Tue, 09 Jun 2015 15:33:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWz-00028y-0r for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:37 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 13/81-29702-05707755; Tue, 09 Jun 2015 15:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1433864015!12978706!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27986 invoked from network); 9 Jun 2015 15:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWw-0001vp-QH for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWw-0002Wk-Oy for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:34 +0000 Date: Tue, 09 Jun 2015 15:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] Without this the actual XSA-131 fix would cause the enable bit to not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 751d20d7b12a31a435a3354e9d1cee9f2f0d8404 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LX0-00029Q-Ns; Tue, 09 Jun 2015 15:33:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWz-00028y-0r for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:37 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 13/81-29702-05707755; Tue, 09 Jun 2015 15:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1433864015!12978706!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27986 invoked from network); 9 Jun 2015 15:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LWw-0001vp-QH for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LWw-0002Wk-Oy for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:34 +0000 Date: Tue, 09 Jun 2015 15:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] Without this the actual XSA-131 fix would cause the enable bit to not X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 751d20d7b12a31a435a3354e9d1cee9f2f0d8404 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LXA-0002D9-SQ; Tue, 09 Jun 2015 15:33:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LX9-0002Cb-D6 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:47 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 5D/C1-10593-A5707755; Tue, 09 Jun 2015 15:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1433864025!14628253!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13470 invoked from network); 9 Jun 2015 15:33:45 -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; 9 Jun 2015 15:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LX6-0001w1-UX for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LX6-0002X8-TE for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:44 +0000 Date: Tue, 09 Jun 2015 15:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] There's no point in xen_pt_pmcsr_reg_{read, write}() each ORing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e19270f544b57c76b063746fbf2469fafd5f012 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15: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 1Z2LXA-0002D9-SQ; Tue, 09 Jun 2015 15:33:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LX9-0002Cb-D6 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:47 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 5D/C1-10593-A5707755; Tue, 09 Jun 2015 15:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1433864025!14628253!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13470 invoked from network); 9 Jun 2015 15:33:45 -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; 9 Jun 2015 15:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LX6-0001w1-UX for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LX6-0002X8-TE for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:44 +0000 Date: Tue, 09 Jun 2015 15:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] There's no point in xen_pt_pmcsr_reg_{read, write}() each ORing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e19270f544b57c76b063746fbf2469fafd5f012 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXJ-0002Hg-V1; Tue, 09 Jun 2015 15:33:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXJ-0002HG-Hr for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:57 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id A1/EB-29123-46707755; Tue, 09 Jun 2015 15:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1433864035!21763938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18336 invoked from network); 9 Jun 2015 15:33:56 -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; 9 Jun 2015 15:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXH-0001wA-4g for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXH-0002XU-3B for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:55 +0000 Date: Tue, 09 Jun 2015 15:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29d956630173a55fe53f3b877bccd888f10d5968 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:33:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXJ-0002Hg-V1; Tue, 09 Jun 2015 15:33:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXJ-0002HG-Hr for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:57 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id A1/EB-29123-46707755; Tue, 09 Jun 2015 15:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1433864035!21763938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18336 invoked from network); 9 Jun 2015 15:33:56 -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; 9 Jun 2015 15:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXH-0001wA-4g for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXH-0002XU-3B for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:33:55 +0000 Date: Tue, 09 Jun 2015 15:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29d956630173a55fe53f3b877bccd888f10d5968 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXW-0002Lm-1U; Tue, 09 Jun 2015 15:34:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXV-0002LU-5s for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:09 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F5/DE-01068-07707755; Tue, 09 Jun 2015 15:34:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1433864045!14567066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7783 invoked from network); 9 Jun 2015 15:34:06 -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; 9 Jun 2015 15:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXR-0001wi-Bt for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXR-0002Y3-95 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:05 +0000 Date: Tue, 09 Jun 2015 15:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] This is just to avoid having to adjust that calculation later 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 2dc40590f41e8f73af224e6097ad5e673aeab353 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXW-0002Lm-1U; Tue, 09 Jun 2015 15:34:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXV-0002LU-5s for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:09 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F5/DE-01068-07707755; Tue, 09 Jun 2015 15:34:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1433864045!14567066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7783 invoked from network); 9 Jun 2015 15:34:06 -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; 9 Jun 2015 15:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXR-0001wi-Bt for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXR-0002Y3-95 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:05 +0000 Date: Tue, 09 Jun 2015 15:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] This is just to avoid having to adjust that calculation later 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 2dc40590f41e8f73af224e6097ad5e673aeab353 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LXf-0002OE-4N; Tue, 09 Jun 2015 15:34:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXd-0002Ny-Sp for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:17 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 60/79-00727-97707755; Tue, 09 Jun 2015 15:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433864055!14667444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27624 invoked from network); 9 Jun 2015 15:34:16 -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; 9 Jun 2015 15:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXb-0001wo-IC for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXb-0002Yo-FW for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:15 +0000 Date: Tue, 09 Jun 2015 15:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37c77b8a61ab1ca5b3594c7b3aa922c7cfed796c Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LXf-0002OE-4N; Tue, 09 Jun 2015 15:34:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXd-0002Ny-Sp for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:17 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 60/79-00727-97707755; Tue, 09 Jun 2015 15:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433864055!14667444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27624 invoked from network); 9 Jun 2015 15:34:16 -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; 9 Jun 2015 15:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXb-0001wo-IC for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXb-0002Yo-FW for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:15 +0000 Date: Tue, 09 Jun 2015 15:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37c77b8a61ab1ca5b3594c7b3aa922c7cfed796c Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LXp-0002Q6-6t; Tue, 09 Jun 2015 15:34:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXn-0002Pt-Sc for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:27 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 72/AE-25881-38707755; Tue, 09 Jun 2015 15:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1433864065!5373960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11456 invoked from network); 9 Jun 2015 15:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXl-0001wu-Nf for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXl-0002ZS-M7 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:25 +0000 Date: Tue, 09 Jun 2015 15:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] The adjustments are solely to make the subsequent patches work right X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec61b935a0eefbd0b6822e2b7bca958bb676bb40 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LXp-0002Q6-6t; Tue, 09 Jun 2015 15:34:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXn-0002Pt-Sc for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:27 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 72/AE-25881-38707755; Tue, 09 Jun 2015 15:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1433864065!5373960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11456 invoked from network); 9 Jun 2015 15:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXl-0001wu-Nf for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXl-0002ZS-M7 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:25 +0000 Date: Tue, 09 Jun 2015 15:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] The adjustments are solely to make the subsequent patches work right X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec61b935a0eefbd0b6822e2b7bca958bb676bb40 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LY0-0002Sm-Bt; Tue, 09 Jun 2015 15:34:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXz-0002SY-JL for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:39 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 95/73-13047-E8707755; Tue, 09 Jun 2015 15:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1433864076!17145998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26432 invoked from network); 9 Jun 2015 15:34:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXv-0001x2-TS for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXv-0002aS-RX for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:35 +0000 Date: Tue, 09 Jun 2015 15:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] Since the next patch will turn all not explicitly described fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3cff7add905c1676b1f63a6d92244fef08fa6722 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LY0-0002Sm-Bt; Tue, 09 Jun 2015 15:34:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXz-0002SY-JL for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:39 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 95/73-13047-E8707755; Tue, 09 Jun 2015 15:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1433864076!17145998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26432 invoked from network); 9 Jun 2015 15:34:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jun 2015 15:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LXv-0001x2-TS for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LXv-0002aS-RX for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:35 +0000 Date: Tue, 09 Jun 2015 15:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] Since the next patch will turn all not explicitly described fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3cff7add905c1676b1f63a6d92244fef08fa6722 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LY9-0002Ua-Ee; Tue, 09 Jun 2015 15:34:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LY8-0002UO-IB for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:48 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 1B/B7-25925-79707755; Tue, 09 Jun 2015 15:34:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433864086!13000370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12718 invoked from network); 9 Jun 2015 15:34:47 -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; 9 Jun 2015 15:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LY6-0001x8-27 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LY6-0002az-0r for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:46 +0000 Date: Tue, 09 Jun 2015 15:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] ... by default. Add a per-device "permissive" mode similar to pciback'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 afaa35b4bc975b2b89ad44c481d0d7623e3d1c49 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 09 15:34:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jun 2015 15:34: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 1Z2LY9-0002Ua-Ee; Tue, 09 Jun 2015 15:34:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LY8-0002UO-IB for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:48 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 1B/B7-25925-79707755; Tue, 09 Jun 2015 15:34:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1433864086!13000370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12718 invoked from network); 9 Jun 2015 15:34:47 -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; 9 Jun 2015 15:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2LY6-0001x8-27 for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2LY6-0002az-0r for xen-changelog@lists.xensource.com; Tue, 09 Jun 2015 15:34:46 +0000 Date: Tue, 09 Jun 2015 15:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] ... by default. Add a per-device "permissive" mode similar to pciback'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 afaa35b4bc975b2b89ad44c481d0d7623e3d1c49 Author: Jan Beulich AuthorDate: Tue Jun 9 16:32:24 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:32:24 2015 +0100 ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-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 Jun 10 03:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44: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 1Z2Wvw-0000f1-HP; Wed, 10 Jun 2015 03:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wvv-0000et-6J for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:07 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 35/74-18676-682B7755; Wed, 10 Jun 2015 03:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433907845!21924820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14150 invoked from network); 10 Jun 2015 03: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; 10 Jun 2015 03:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wvr-0001Gt-Jt for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Wvq-0005rV-Vr for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:03 +0000 Date: Wed, 10 Jun 2015 03:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: fix memory leak in rt_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 d17547414199f4434289f75ab2b1364cc961982e Author: Andrew Cooper AuthorDate: Mon Jun 8 14:13:23 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:13:23 2015 +0200 sched_rt: fix memory leak in rt_init() Introduced by c/s 376bbba "sched_rt: print useful affinity info when dumping". If the allocation of cpumask failed, prv was leaked. Signed-off-by: Andrew Cooper Coverity-ID: 1304398 Reviewed-by: Dario Faggioli --- xen/common/sched_rt.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 5836d27..4372486 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -441,7 +441,7 @@ rt_init(struct scheduler *ops) { _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids); if ( !_cpumask_scratch ) - return -ENOMEM; + goto no_mem; } nr_rt_ops++; @@ -455,6 +455,10 @@ rt_init(struct scheduler *ops) ops->sched_data = prv; return 0; + + no_mem: + xfree(prv); + return -ENOMEM; } 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 Wed Jun 10 03:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44: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 1Z2Wvw-0000f1-HP; Wed, 10 Jun 2015 03:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wvv-0000et-6J for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:07 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 35/74-18676-682B7755; Wed, 10 Jun 2015 03:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433907845!21924820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14150 invoked from network); 10 Jun 2015 03: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; 10 Jun 2015 03:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wvr-0001Gt-Jt for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Wvq-0005rV-Vr for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:03 +0000 Date: Wed, 10 Jun 2015 03:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: fix memory leak in rt_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 d17547414199f4434289f75ab2b1364cc961982e Author: Andrew Cooper AuthorDate: Mon Jun 8 14:13:23 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:13:23 2015 +0200 sched_rt: fix memory leak in rt_init() Introduced by c/s 376bbba "sched_rt: print useful affinity info when dumping". If the allocation of cpumask failed, prv was leaked. Signed-off-by: Andrew Cooper Coverity-ID: 1304398 Reviewed-by: Dario Faggioli --- xen/common/sched_rt.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 5836d27..4372486 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -441,7 +441,7 @@ rt_init(struct scheduler *ops) { _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids); if ( !_cpumask_scratch ) - return -ENOMEM; + goto no_mem; } nr_rt_ops++; @@ -455,6 +455,10 @@ rt_init(struct scheduler *ops) ops->sched_data = prv; return 0; + + no_mem: + xfree(prv); + return -ENOMEM; } 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 Wed Jun 10 03:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03: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 1Z2Ww6-0000fl-K5; Wed, 10 Jun 2015 03:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Ww5-0000fb-CV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:17 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id F3/E4-08244-092B7755; Wed, 10 Jun 2015 03:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433907855!13039430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32239 invoked from network); 10 Jun 2015 03:44:16 -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; 10 Jun 2015 03:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Ww3-0001Gw-29 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Ww2-0005rz-TN for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:14 +0000 Date: Wed, 10 Jun 2015 03:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: use existing __section() macro instead of opencoding 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 498266eb5fd2af5bed995ed5cf30266eebe7926b Author: Andrew Cooper AuthorDate: Mon Jun 8 14:14:38 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:14:38 2015 +0200 x86: use existing __section() macro instead of opencoding it No functional change Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm.c | 3 +-- xen/arch/x86/setup.c | 2 +- xen/arch/x86/x86_64/mm.c | 6 ++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b1023bb..f354cb7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -82,7 +82,7 @@ struct hvm_function_table hvm_funcs __read_mostly; * the hardware domain which needs a more permissive one. */ #define HVM_IOBITMAP_SIZE (3 * PAGE_SIZE) -unsigned long __attribute__ ((__section__ (".bss.page_aligned"))) +unsigned long __section(".bss.page_aligned") hvm_io_bitmap[HVM_IOBITMAP_SIZE / BYTES_PER_LONG]; /* Xen command-line option to enable HAP */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 1c0783f..c1a38bc 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -126,8 +126,7 @@ #include /* Mapping of the fixmap space needed early. */ -l1_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l1_fixmap[L1_PAGETABLE_ENTRIES]; +l1_pgentry_t __section(".bss.page_aligned") l1_fixmap[L1_PAGETABLE_ENTRIES]; #define MEM_LOG(_f, _a...) gdprintk(XENLOG_WARNING , _f "\n" , ## _a) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 8e21859..d118dec 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -101,7 +101,7 @@ unsigned long __read_mostly xen_virt_end; DEFINE_PER_CPU(struct tss_struct, init_tss); -char __attribute__ ((__section__(".bss.stack_aligned"))) cpu0_stack[STACK_SIZE]; +char __section(".bss.stack_aligned") cpu0_stack[STACK_SIZE]; struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index e58de58..3ef4618 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -43,10 +43,8 @@ unsigned int __read_mostly m2p_compat_vstart = __HYPERVISOR_COMPAT_VIRT_START; /* Enough page directories to map into the bottom 1GB. */ -l3_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l3_bootmap[L3_PAGETABLE_ENTRIES]; -l2_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l2_bootmap[L2_PAGETABLE_ENTRIES]; +l3_pgentry_t __section(".bss.page_aligned") l3_bootmap[L3_PAGETABLE_ENTRIES]; +l2_pgentry_t __section(".bss.page_aligned") l2_bootmap[L2_PAGETABLE_ENTRIES]; l2_pgentry_t *compat_idle_pg_table_l2; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03: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 1Z2Ww6-0000fl-K5; Wed, 10 Jun 2015 03:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Ww5-0000fb-CV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:17 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id F3/E4-08244-092B7755; Wed, 10 Jun 2015 03:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433907855!13039430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32239 invoked from network); 10 Jun 2015 03:44:16 -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; 10 Jun 2015 03:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Ww3-0001Gw-29 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Ww2-0005rz-TN for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:14 +0000 Date: Wed, 10 Jun 2015 03:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: use existing __section() macro instead of opencoding 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 498266eb5fd2af5bed995ed5cf30266eebe7926b Author: Andrew Cooper AuthorDate: Mon Jun 8 14:14:38 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:14:38 2015 +0200 x86: use existing __section() macro instead of opencoding it No functional change Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm.c | 3 +-- xen/arch/x86/setup.c | 2 +- xen/arch/x86/x86_64/mm.c | 6 ++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b1023bb..f354cb7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -82,7 +82,7 @@ struct hvm_function_table hvm_funcs __read_mostly; * the hardware domain which needs a more permissive one. */ #define HVM_IOBITMAP_SIZE (3 * PAGE_SIZE) -unsigned long __attribute__ ((__section__ (".bss.page_aligned"))) +unsigned long __section(".bss.page_aligned") hvm_io_bitmap[HVM_IOBITMAP_SIZE / BYTES_PER_LONG]; /* Xen command-line option to enable HAP */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 1c0783f..c1a38bc 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -126,8 +126,7 @@ #include /* Mapping of the fixmap space needed early. */ -l1_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l1_fixmap[L1_PAGETABLE_ENTRIES]; +l1_pgentry_t __section(".bss.page_aligned") l1_fixmap[L1_PAGETABLE_ENTRIES]; #define MEM_LOG(_f, _a...) gdprintk(XENLOG_WARNING , _f "\n" , ## _a) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 8e21859..d118dec 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -101,7 +101,7 @@ unsigned long __read_mostly xen_virt_end; DEFINE_PER_CPU(struct tss_struct, init_tss); -char __attribute__ ((__section__(".bss.stack_aligned"))) cpu0_stack[STACK_SIZE]; +char __section(".bss.stack_aligned") cpu0_stack[STACK_SIZE]; struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index e58de58..3ef4618 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -43,10 +43,8 @@ unsigned int __read_mostly m2p_compat_vstart = __HYPERVISOR_COMPAT_VIRT_START; /* Enough page directories to map into the bottom 1GB. */ -l3_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l3_bootmap[L3_PAGETABLE_ENTRIES]; -l2_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l2_bootmap[L2_PAGETABLE_ENTRIES]; +l3_pgentry_t __section(".bss.page_aligned") l3_bootmap[L3_PAGETABLE_ENTRIES]; +l2_pgentry_t __section(".bss.page_aligned") l2_bootmap[L2_PAGETABLE_ENTRIES]; l2_pgentry_t *compat_idle_pg_table_l2; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwH-0000h1-Mi; Wed, 10 Jun 2015 03:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwG-0000gv-9M for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 8B/CD-32406-B92B7755; Wed, 10 Jun 2015 03:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1433907865!10329492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32423 invoked from network); 10 Jun 2015 03:44: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; 10 Jun 2015 03:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwD-0001H5-AV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2WwD-0005t5-5n for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:25 +0000 Date: Wed, 10 Jun 2015 03:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: misc boot/link tweaking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb7d7dd277fedd898db4a22ce929eb3d7d407567 Author: Andrew Cooper AuthorDate: Mon Jun 8 14:15:59 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:15:59 2015 +0200 x86: misc boot/link tweaking * Introduce symbols bounding the multiboot1 header, which helps clarify that it is data and not code corruption when viewing the disassembly. * Move the __high_start symbol to its implementation, and declare it correctly as ENTRY() * Move the l1_identmap construction to be with all the other pagetables, and within __page_tables_{start,end}. This won't affect the EFI relocation algorithm, as l1_identmap contains no relocations. * Move the cpu0_stack alignment check to the linker. Chances are very good that a binary with a misaligned stack won't get as far as the test. * Use MB() in linker script. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/boot/head.S | 26 ++------------------------ xen/arch/x86/boot/x86_64.S | 20 ++++++++++++++++++++ xen/arch/x86/setup.c | 3 --- xen/arch/x86/xen.lds.S | 5 +++-- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 2d0e56c..cfd59dc 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -23,7 +23,7 @@ ENTRY(start) jmp __start .align 4 -/*** MULTIBOOT HEADER ****/ +multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ #define MULTIBOOT_HEADER_FLAGS (MULTIBOOT_HEADER_MODS_ALIGNED | \ MULTIBOOT_HEADER_WANT_MEMORY) /* Magic number indicating a Multiboot header. */ @@ -32,6 +32,7 @@ ENTRY(start) .long MULTIBOOT_HEADER_FLAGS /* Checksum: must be the negated sum of the first two fields. */ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) +multiboot1_header_end: .section .init.rodata, "a", @progbits .align 4 @@ -212,27 +213,4 @@ ENTRY(trampoline_start) #include "trampoline.S" GLOBAL(trampoline_end) - .text -__high_start: #include "x86_64.S" - - .section .data.page_aligned, "aw", @progbits - .p2align PAGE_SHIFT -/* - * Mapping of first 2 megabytes of memory. This is mapped with 4kB mappings - * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte - * of physical memory. In any case the VGA hole should be mapped with type UC. - */ -GLOBAL(l1_identmap) - pfn = 0 - .rept L1_PAGETABLE_ENTRIES - /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ - .if pfn >= 0xa0 && pfn < 0xc0 - .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES - .else - .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | MAP_SMALL_PAGES - .endif - .long 0 - pfn = pfn + 1 - .endr - .size l1_identmap, . - l1_identmap diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index bfbafd2..c8bf9d0 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -1,5 +1,7 @@ + .text .code64 +ENTRY(__high_start) /* Install relocated data selectors. */ lgdt gdt_descr(%rip) mov $(__HYPERVISOR_DS64),%ecx @@ -80,6 +82,24 @@ GLOBAL(boot_cpu_compat_gdt_table) .align PAGE_SIZE, 0 GLOBAL(__page_tables_start) +/* + * Mapping of first 2 megabytes of memory. This is mapped with 4kB mappings + * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte + * of physical memory. In any case the VGA hole should be mapped with type UC. + */ +GLOBAL(l1_identmap) + pfn = 0 + .rept L1_PAGETABLE_ENTRIES + /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ + .if pfn >= 0xa0 && pfn < 0xc0 + .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES + .else + .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | MAP_SMALL_PAGES + .endif + .long 0 + pfn = pfn + 1 + .endr + .size l1_identmap, . - l1_identmap /* Mapping of first 16 megabytes of memory. */ GLOBAL(l2_identmap) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d118dec..d3c1817 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -674,9 +674,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( !(mbi->flags & MBI_MODULES) || (mbi->mods_count == 0) ) panic("dom0 kernel not specified. Check bootloader configuration."); - if ( ((unsigned long)cpu0_stack & (STACK_SIZE-1)) != 0 ) - panic("Misaligned CPU0 stack."); - if ( efi_enabled ) { set_pdx_range(xen_phys_start >> PAGE_SHIFT, diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 5fc6c9f..6553cff 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -38,7 +38,7 @@ SECTIONS . = __XEN_VIRT_START; __image_base__ = .; #endif - . = __XEN_VIRT_START + 0x100000; + . = __XEN_VIRT_START + MB(1); _start = .; .text : { _stext = .; /* Text and read-only data */ @@ -187,7 +187,7 @@ SECTIONS /* Trick the linker into setting the image size to exactly 16Mb. */ . = ALIGN(__section_alignment__); .pad : { - . = ALIGN(0x1000000); + . = ALIGN(MB(16)); } :text #else efi = .; @@ -221,3 +221,4 @@ ASSERT(__image_base__ > XEN_VIRT_START || _end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE, "Xen image overlaps stubs area") ASSERT(kexec_reloc_size - kexec_reloc <= PAGE_SIZE, "kexec_reloc is too large") +ASSERT((cpu0_stack & (STACK_SIZE - 1)) == 0, "cpu0_stack misaligned") -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwH-0000h1-Mi; Wed, 10 Jun 2015 03:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwG-0000gv-9M for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 8B/CD-32406-B92B7755; Wed, 10 Jun 2015 03:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1433907865!10329492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32423 invoked from network); 10 Jun 2015 03:44: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; 10 Jun 2015 03:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwD-0001H5-AV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2WwD-0005t5-5n for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:25 +0000 Date: Wed, 10 Jun 2015 03:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: misc boot/link tweaking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb7d7dd277fedd898db4a22ce929eb3d7d407567 Author: Andrew Cooper AuthorDate: Mon Jun 8 14:15:59 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:15:59 2015 +0200 x86: misc boot/link tweaking * Introduce symbols bounding the multiboot1 header, which helps clarify that it is data and not code corruption when viewing the disassembly. * Move the __high_start symbol to its implementation, and declare it correctly as ENTRY() * Move the l1_identmap construction to be with all the other pagetables, and within __page_tables_{start,end}. This won't affect the EFI relocation algorithm, as l1_identmap contains no relocations. * Move the cpu0_stack alignment check to the linker. Chances are very good that a binary with a misaligned stack won't get as far as the test. * Use MB() in linker script. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/boot/head.S | 26 ++------------------------ xen/arch/x86/boot/x86_64.S | 20 ++++++++++++++++++++ xen/arch/x86/setup.c | 3 --- xen/arch/x86/xen.lds.S | 5 +++-- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 2d0e56c..cfd59dc 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -23,7 +23,7 @@ ENTRY(start) jmp __start .align 4 -/*** MULTIBOOT HEADER ****/ +multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ #define MULTIBOOT_HEADER_FLAGS (MULTIBOOT_HEADER_MODS_ALIGNED | \ MULTIBOOT_HEADER_WANT_MEMORY) /* Magic number indicating a Multiboot header. */ @@ -32,6 +32,7 @@ ENTRY(start) .long MULTIBOOT_HEADER_FLAGS /* Checksum: must be the negated sum of the first two fields. */ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) +multiboot1_header_end: .section .init.rodata, "a", @progbits .align 4 @@ -212,27 +213,4 @@ ENTRY(trampoline_start) #include "trampoline.S" GLOBAL(trampoline_end) - .text -__high_start: #include "x86_64.S" - - .section .data.page_aligned, "aw", @progbits - .p2align PAGE_SHIFT -/* - * Mapping of first 2 megabytes of memory. This is mapped with 4kB mappings - * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte - * of physical memory. In any case the VGA hole should be mapped with type UC. - */ -GLOBAL(l1_identmap) - pfn = 0 - .rept L1_PAGETABLE_ENTRIES - /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ - .if pfn >= 0xa0 && pfn < 0xc0 - .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES - .else - .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | MAP_SMALL_PAGES - .endif - .long 0 - pfn = pfn + 1 - .endr - .size l1_identmap, . - l1_identmap diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index bfbafd2..c8bf9d0 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -1,5 +1,7 @@ + .text .code64 +ENTRY(__high_start) /* Install relocated data selectors. */ lgdt gdt_descr(%rip) mov $(__HYPERVISOR_DS64),%ecx @@ -80,6 +82,24 @@ GLOBAL(boot_cpu_compat_gdt_table) .align PAGE_SIZE, 0 GLOBAL(__page_tables_start) +/* + * Mapping of first 2 megabytes of memory. This is mapped with 4kB mappings + * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte + * of physical memory. In any case the VGA hole should be mapped with type UC. + */ +GLOBAL(l1_identmap) + pfn = 0 + .rept L1_PAGETABLE_ENTRIES + /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ + .if pfn >= 0xa0 && pfn < 0xc0 + .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES + .else + .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | MAP_SMALL_PAGES + .endif + .long 0 + pfn = pfn + 1 + .endr + .size l1_identmap, . - l1_identmap /* Mapping of first 16 megabytes of memory. */ GLOBAL(l2_identmap) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d118dec..d3c1817 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -674,9 +674,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( !(mbi->flags & MBI_MODULES) || (mbi->mods_count == 0) ) panic("dom0 kernel not specified. Check bootloader configuration."); - if ( ((unsigned long)cpu0_stack & (STACK_SIZE-1)) != 0 ) - panic("Misaligned CPU0 stack."); - if ( efi_enabled ) { set_pdx_range(xen_phys_start >> PAGE_SHIFT, diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 5fc6c9f..6553cff 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -38,7 +38,7 @@ SECTIONS . = __XEN_VIRT_START; __image_base__ = .; #endif - . = __XEN_VIRT_START + 0x100000; + . = __XEN_VIRT_START + MB(1); _start = .; .text : { _stext = .; /* Text and read-only data */ @@ -187,7 +187,7 @@ SECTIONS /* Trick the linker into setting the image size to exactly 16Mb. */ . = ALIGN(__section_alignment__); .pad : { - . = ALIGN(0x1000000); + . = ALIGN(MB(16)); } :text #else efi = .; @@ -221,3 +221,4 @@ ASSERT(__image_base__ > XEN_VIRT_START || _end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE, "Xen image overlaps stubs area") ASSERT(kexec_reloc_size - kexec_reloc <= PAGE_SIZE, "kexec_reloc is too large") +ASSERT((cpu0_stack & (STACK_SIZE - 1)) == 0, "cpu0_stack misaligned") -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwR-0000iJ-PZ; Wed, 10 Jun 2015 03:44:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwQ-0000i1-3V for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:38 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 9A/E7-31880-5A2B7755; Wed, 10 Jun 2015 03:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1433907875!10182785!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22038 invoked from network); 10 Jun 2015 03:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 03:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwN-0001HD-Ht for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2WwN-0005tV-Dg for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:35 +0000 Date: Wed, 10 Jun 2015 03:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/setup: move CPU0s stack out of the Xen text/data/bss virtual region X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a92efb747bbf256c20278517dfc179ced84bb869 Author: Andrew Cooper AuthorDate: Mon Jun 8 14:16:27 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:16:27 2015 +0200 x86/setup: move CPU0s stack out of the Xen text/data/bss virtual region Currently, the BSP's stack is the BSS symbol cpu0_stack. In builds using memguard_stack(), a page gets shot out of the mappings. To avoid shattering the superpage which will eventually map the BSS, use the directmap virtual address of cpu0_stack, while still using the same underlying physical memory. (Xen has an order 21 physical relocation requirement meaning that the order 3 alignment requirement for cpu0_stack will be honoured even via its diretmap mapping.) In addition, fix two issues exposed by the changes. * do_invalid_op() should use is_active_kernel_text() rather than having its own, different, idea of when to search through the bugframes. * Setting of system_state to active needs to be deferred until after code has left .init.text, for bugframes/backtraces to function in reinit_bsp_stack(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 34 ++++++++++++++++++++++++++-------- xen/arch/x86/traps.c | 3 +-- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d3c1817..c32e49f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -507,6 +507,10 @@ static void __init kexec_reserve_area(struct e820map *e820) static void noinline init_done(void) { + system_state = SYS_STATE_active; + + domain_unpause_by_systemcontroller(hardware_domain); + /* Free (or page-protect) the init areas. */ memset(__init_begin, 0xcc, __init_end - __init_begin); /* int3 poison */ free_xen_data(__init_begin, __init_end); @@ -515,6 +519,23 @@ static void noinline init_done(void) startup_cpu_idle_loop(); } +/* Reinitalise all state referring to the old virtual address of the stack. */ +static void __init noreturn reinit_bsp_stack(void) +{ + unsigned long *stack = (void*)(get_stack_bottom() & ~(STACK_SIZE - 1)); + + /* Update TSS and ISTs */ + load_system_tables(); + + /* Update SYSCALL trampolines */ + percpu_traps_init(); + + stack_base[0] = stack; + memguard_guard_stack(stack); + + reset_stack_and_jump(init_done); +} + static bool_t __init loader_is_grub2(const char *loader_name) { /* GRUB1="GNU GRUB 0.xx"; GRUB2="GRUB 1.xx" */ @@ -1210,9 +1231,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) tboot_probe(); - /* Unmap the first page of CPU0's stack. */ - memguard_guard_stack(cpu0_stack); - open_softirq(NEW_TLBFLUSH_CLOCK_PERIOD_SOFTIRQ, new_tlbflush_clock_period); if ( opt_watchdog ) @@ -1454,11 +1472,11 @@ void __init noreturn __start_xen(unsigned long mbi_p) setup_io_bitmap(dom0); - system_state = SYS_STATE_active; - - domain_unpause_by_systemcontroller(dom0); - - reset_stack_and_jump(init_done); + /* Jump to the 1:1 virtual mappings of cpu0_stack. */ + asm volatile ("mov %[stk], %%rsp; jmp %c[fn]" :: + [stk] "g" (__va(__pa(get_stack_bottom()))), + [fn] "i" (reinit_bsp_stack) : "memory"); + unreachable(); } void arch_get_xen_caps(xen_capabilities_info_t *info) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 91701a2..080c0c1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1072,8 +1072,7 @@ void do_invalid_op(struct cpu_user_regs *regs) return; } - if ( (!is_kernel_text(eip) && - (system_state > SYS_STATE_boot || !is_kernel_inittext(eip))) || + if ( !is_active_kernel_text(regs->eip) || __copy_from_user(bug_insn, eip, sizeof(bug_insn)) || memcmp(bug_insn, "\xf\xb", sizeof(bug_insn)) ) goto die; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwR-0000iJ-PZ; Wed, 10 Jun 2015 03:44:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwQ-0000i1-3V for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:38 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 9A/E7-31880-5A2B7755; Wed, 10 Jun 2015 03:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1433907875!10182785!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22038 invoked from network); 10 Jun 2015 03:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 03:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwN-0001HD-Ht for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2WwN-0005tV-Dg for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:35 +0000 Date: Wed, 10 Jun 2015 03:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/setup: move CPU0s stack out of the Xen text/data/bss virtual region X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a92efb747bbf256c20278517dfc179ced84bb869 Author: Andrew Cooper AuthorDate: Mon Jun 8 14:16:27 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:16:27 2015 +0200 x86/setup: move CPU0s stack out of the Xen text/data/bss virtual region Currently, the BSP's stack is the BSS symbol cpu0_stack. In builds using memguard_stack(), a page gets shot out of the mappings. To avoid shattering the superpage which will eventually map the BSS, use the directmap virtual address of cpu0_stack, while still using the same underlying physical memory. (Xen has an order 21 physical relocation requirement meaning that the order 3 alignment requirement for cpu0_stack will be honoured even via its diretmap mapping.) In addition, fix two issues exposed by the changes. * do_invalid_op() should use is_active_kernel_text() rather than having its own, different, idea of when to search through the bugframes. * Setting of system_state to active needs to be deferred until after code has left .init.text, for bugframes/backtraces to function in reinit_bsp_stack(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 34 ++++++++++++++++++++++++++-------- xen/arch/x86/traps.c | 3 +-- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d3c1817..c32e49f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -507,6 +507,10 @@ static void __init kexec_reserve_area(struct e820map *e820) static void noinline init_done(void) { + system_state = SYS_STATE_active; + + domain_unpause_by_systemcontroller(hardware_domain); + /* Free (or page-protect) the init areas. */ memset(__init_begin, 0xcc, __init_end - __init_begin); /* int3 poison */ free_xen_data(__init_begin, __init_end); @@ -515,6 +519,23 @@ static void noinline init_done(void) startup_cpu_idle_loop(); } +/* Reinitalise all state referring to the old virtual address of the stack. */ +static void __init noreturn reinit_bsp_stack(void) +{ + unsigned long *stack = (void*)(get_stack_bottom() & ~(STACK_SIZE - 1)); + + /* Update TSS and ISTs */ + load_system_tables(); + + /* Update SYSCALL trampolines */ + percpu_traps_init(); + + stack_base[0] = stack; + memguard_guard_stack(stack); + + reset_stack_and_jump(init_done); +} + static bool_t __init loader_is_grub2(const char *loader_name) { /* GRUB1="GNU GRUB 0.xx"; GRUB2="GRUB 1.xx" */ @@ -1210,9 +1231,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) tboot_probe(); - /* Unmap the first page of CPU0's stack. */ - memguard_guard_stack(cpu0_stack); - open_softirq(NEW_TLBFLUSH_CLOCK_PERIOD_SOFTIRQ, new_tlbflush_clock_period); if ( opt_watchdog ) @@ -1454,11 +1472,11 @@ void __init noreturn __start_xen(unsigned long mbi_p) setup_io_bitmap(dom0); - system_state = SYS_STATE_active; - - domain_unpause_by_systemcontroller(dom0); - - reset_stack_and_jump(init_done); + /* Jump to the 1:1 virtual mappings of cpu0_stack. */ + asm volatile ("mov %[stk], %%rsp; jmp %c[fn]" :: + [stk] "g" (__va(__pa(get_stack_bottom()))), + [fn] "i" (reinit_bsp_stack) : "memory"); + unreachable(); } void arch_get_xen_caps(xen_capabilities_info_t *info) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 91701a2..080c0c1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1072,8 +1072,7 @@ void do_invalid_op(struct cpu_user_regs *regs) return; } - if ( (!is_kernel_text(eip) && - (system_state > SYS_STATE_boot || !is_kernel_inittext(eip))) || + if ( !is_active_kernel_text(regs->eip) || __copy_from_user(bug_insn, eip, sizeof(bug_insn)) || memcmp(bug_insn, "\xf\xb", sizeof(bug_insn)) ) goto die; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03: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 1Z2Wwb-0000kZ-Uw; Wed, 10 Jun 2015 03:44:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwa-0000kD-4c for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:48 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id EA/69-13517-FA2B7755; Wed, 10 Jun 2015 03:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1433907885!14750799!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1344 invoked from network); 10 Jun 2015 03:44:46 -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; 10 Jun 2015 03:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwX-0001HJ-PL for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2WwX-0005ts-L0 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:45 +0000 Date: Wed, 10 Jun 2015 03:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: add lost Intel processor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fcc6f3c2f7bc57d8ea7f263274296929f5162ef Author: Alan Robinson AuthorDate: Mon Jun 8 14:17:06 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:17:06 2015 +0200 x86/VPMU: add lost Intel processor commit 6d112f2b50 ("x86/vPMU: change Intel model numbers from decimal to hex") translated 47 to 0x27, now corrected to 0x2f. Signed-off-by: Alan Robinson Signed-off-by: Dietmar Hahn Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 8ad522a..311f35f 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -848,7 +848,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* Westmere: */ case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x27: /* 32 nm Westmere-EX */ + case 0x2f: /* 32 nm Westmere-EX */ case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03: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 1Z2Wwb-0000kZ-Uw; Wed, 10 Jun 2015 03:44:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwa-0000kD-4c for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:48 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id EA/69-13517-FA2B7755; Wed, 10 Jun 2015 03:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1433907885!14750799!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1344 invoked from network); 10 Jun 2015 03:44:46 -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; 10 Jun 2015 03:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2WwX-0001HJ-PL for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2WwX-0005ts-L0 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:45 +0000 Date: Wed, 10 Jun 2015 03:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: add lost Intel processor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fcc6f3c2f7bc57d8ea7f263274296929f5162ef Author: Alan Robinson AuthorDate: Mon Jun 8 14:17:06 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:17:06 2015 +0200 x86/VPMU: add lost Intel processor commit 6d112f2b50 ("x86/vPMU: change Intel model numbers from decimal to hex") translated 47 to 0x27, now corrected to 0x2f. Signed-off-by: Alan Robinson Signed-off-by: Dietmar Hahn Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 8ad522a..311f35f 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -848,7 +848,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* Westmere: */ case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x27: /* 32 nm Westmere-EX */ + case 0x2f: /* 32 nm Westmere-EX */ case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 10 03:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwl-0000m7-1F; Wed, 10 Jun 2015 03:44:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwk-0000ls-CP for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 98/1F-18733-9B2B7755; Wed, 10 Jun 2015 03:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433907896!21892672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16132 invoked from network); 10 Jun 2015 03:44:56 -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; 10 Jun 2015 03:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwh-0001HY-UQ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Wwh-0005uF-TH for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:55 +0000 Date: Wed, 10 Jun 2015 03:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: print domain IDs instead of pointers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 978a4f044659158c04d77e2494178e9caf6f7718 Author: Jan Beulich AuthorDate: Mon Jun 8 14:41:25 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:41:25 2015 +0200 x86/mm: print domain IDs instead of pointers Printing pointers to struct domain isn't really useful for initial problem analysis. In get_page() also drop the page only after issuing the log message, so that at the time of printing the state can be considered reasonably consistent. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c1a38bc..472c494 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2008,14 +2008,16 @@ int get_page(struct page_info *page, struct domain *domain) if ( likely(owner == domain) ) return 1; - if ( owner != NULL ) - put_page(page); - if ( !paging_mode_refcounts(domain) && !domain->is_dying ) gprintk(XENLOG_INFO, - "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info "\n", - page_to_mfn(page), domain, owner, - page->count_info, page->u.inuse.type_info); + "Error pfn %lx: rd=%d od=%d caf=%08lx taf=%" PRtype_info "\n", + page_to_mfn(page), domain->domain_id, + owner ? owner->domain_id : DOMID_INVALID, + page->count_info - !!owner, page->u.inuse.type_info); + + if ( owner ) + put_page(page); + return 0; } @@ -4150,9 +4152,11 @@ int replace_grant_host_mapping( int donate_page( struct domain *d, struct page_info *page, unsigned int memflags) { + const struct domain *owner = dom_xen; + spin_lock(&d->page_alloc_lock); - if ( is_xen_heap_page(page) || (page_get_owner(page) != NULL) ) + if ( is_xen_heap_page(page) || ((owner = page_get_owner(page)) != NULL) ) goto fail; if ( d->is_dying ) @@ -4177,9 +4181,10 @@ int donate_page( fail: spin_unlock(&d->page_alloc_lock); - MEM_LOG("Bad donate %p: ed=%p(%u), sd=%p, caf=%08lx, taf=%" PRtype_info, - (void *)page_to_mfn(page), d, d->domain_id, - page_get_owner(page), page->count_info, page->u.inuse.type_info); + MEM_LOG("Bad donate %lx: ed=%d sd=%d caf=%08lx taf=%" PRtype_info, + page_to_mfn(page), d->domain_id, + owner ? owner->domain_id : DOMID_INVALID, + page->count_info, page->u.inuse.type_info); return -1; } @@ -4188,10 +4193,11 @@ int steal_page( { unsigned long x, y; bool_t drop_dom_ref = 0; + const struct domain *owner = dom_xen; spin_lock(&d->page_alloc_lock); - if ( is_xen_heap_page(page) || (page_get_owner(page) != d) ) + if ( is_xen_heap_page(page) || ((owner = page_get_owner(page)) != d) ) goto fail; /* @@ -4226,9 +4232,10 @@ int steal_page( fail: spin_unlock(&d->page_alloc_lock); - MEM_LOG("Bad page %p: ed=%p(%u), sd=%p, caf=%08lx, taf=%" PRtype_info, - (void *)page_to_mfn(page), d, d->domain_id, - page_get_owner(page), page->count_info, page->u.inuse.type_info); + MEM_LOG("Bad page %lx: ed=%d sd=%d caf=%08lx taf=%" PRtype_info, + page_to_mfn(page), d->domain_id, + owner ? owner->domain_id : DOMID_INVALID, + page->count_info, page->u.inuse.type_info); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 10 03:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwl-0000m7-1F; Wed, 10 Jun 2015 03:44:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwk-0000ls-CP for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 98/1F-18733-9B2B7755; Wed, 10 Jun 2015 03:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433907896!21892672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16132 invoked from network); 10 Jun 2015 03:44:56 -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; 10 Jun 2015 03:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwh-0001HY-UQ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Wwh-0005uF-TH for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:44:55 +0000 Date: Wed, 10 Jun 2015 03:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: print domain IDs instead of pointers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 978a4f044659158c04d77e2494178e9caf6f7718 Author: Jan Beulich AuthorDate: Mon Jun 8 14:41:25 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 14:41:25 2015 +0200 x86/mm: print domain IDs instead of pointers Printing pointers to struct domain isn't really useful for initial problem analysis. In get_page() also drop the page only after issuing the log message, so that at the time of printing the state can be considered reasonably consistent. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c1a38bc..472c494 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2008,14 +2008,16 @@ int get_page(struct page_info *page, struct domain *domain) if ( likely(owner == domain) ) return 1; - if ( owner != NULL ) - put_page(page); - if ( !paging_mode_refcounts(domain) && !domain->is_dying ) gprintk(XENLOG_INFO, - "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info "\n", - page_to_mfn(page), domain, owner, - page->count_info, page->u.inuse.type_info); + "Error pfn %lx: rd=%d od=%d caf=%08lx taf=%" PRtype_info "\n", + page_to_mfn(page), domain->domain_id, + owner ? owner->domain_id : DOMID_INVALID, + page->count_info - !!owner, page->u.inuse.type_info); + + if ( owner ) + put_page(page); + return 0; } @@ -4150,9 +4152,11 @@ int replace_grant_host_mapping( int donate_page( struct domain *d, struct page_info *page, unsigned int memflags) { + const struct domain *owner = dom_xen; + spin_lock(&d->page_alloc_lock); - if ( is_xen_heap_page(page) || (page_get_owner(page) != NULL) ) + if ( is_xen_heap_page(page) || ((owner = page_get_owner(page)) != NULL) ) goto fail; if ( d->is_dying ) @@ -4177,9 +4181,10 @@ int donate_page( fail: spin_unlock(&d->page_alloc_lock); - MEM_LOG("Bad donate %p: ed=%p(%u), sd=%p, caf=%08lx, taf=%" PRtype_info, - (void *)page_to_mfn(page), d, d->domain_id, - page_get_owner(page), page->count_info, page->u.inuse.type_info); + MEM_LOG("Bad donate %lx: ed=%d sd=%d caf=%08lx taf=%" PRtype_info, + page_to_mfn(page), d->domain_id, + owner ? owner->domain_id : DOMID_INVALID, + page->count_info, page->u.inuse.type_info); return -1; } @@ -4188,10 +4193,11 @@ int steal_page( { unsigned long x, y; bool_t drop_dom_ref = 0; + const struct domain *owner = dom_xen; spin_lock(&d->page_alloc_lock); - if ( is_xen_heap_page(page) || (page_get_owner(page) != d) ) + if ( is_xen_heap_page(page) || ((owner = page_get_owner(page)) != d) ) goto fail; /* @@ -4226,9 +4232,10 @@ int steal_page( fail: spin_unlock(&d->page_alloc_lock); - MEM_LOG("Bad page %p: ed=%p(%u), sd=%p, caf=%08lx, taf=%" PRtype_info, - (void *)page_to_mfn(page), d, d->domain_id, - page_get_owner(page), page->count_info, page->u.inuse.type_info); + MEM_LOG("Bad page %lx: ed=%d sd=%d caf=%08lx taf=%" PRtype_info, + page_to_mfn(page), d->domain_id, + owner ? owner->domain_id : DOMID_INVALID, + page->count_info, page->u.inuse.type_info); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 10 03:45:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwv-0000no-GP; Wed, 10 Jun 2015 03:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwu-0000nd-OB for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:45:08 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 1B/32-01068-4C2B7755; Wed, 10 Jun 2015 03:45:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1433907906!10329577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2723 invoked from network); 10 Jun 2015 03:45:07 -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; 10 Jun 2015 03:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wws-0001IY-B2 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:45:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Wws-0005uw-1O for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:45:06 +0000 Date: Wed, 10 Jun 2015 03:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: use existing __section() macro instead of opencoding 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 522b9d0be31048e51079b2b7a8f511084a016221 Author: Andrew Cooper AuthorDate: Mon Jun 8 15:38:39 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 15:38:39 2015 +0200 arm: use existing __section() macro instead of opencoding it No functional change Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/include/asm-arm/device.h | 2 +- xen/include/asm-arm/platform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index a72f7c9..5d0a4cd 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -71,7 +71,7 @@ enum device_class device_get_class(const struct dt_device_node *dev); #define DT_DEVICE_START(_name, _namestr, _class) \ static const struct device_desc __dev_desc_##_name __used \ -__attribute__((__section__(".dev.info"))) = { \ +__section(".dev.info") = { \ .name = _namestr, \ .class = _class, \ diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 746e126..283b50f 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -67,7 +67,7 @@ void platform_dom0_gnttab(paddr_t *start, paddr_t *size); #define PLATFORM_START(_name, _namestr) \ static const struct platform_desc __plat_desc_##_name __used \ -__attribute__((__section__(".arch.info"))) = { \ +__section(".arch.info") = { \ .name = _namestr, #define PLATFORM_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 Wed Jun 10 03:45:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 03:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwv-0000no-GP; Wed, 10 Jun 2015 03:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wwu-0000nd-OB for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:45:08 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 1B/32-01068-4C2B7755; Wed, 10 Jun 2015 03:45:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1433907906!10329577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2723 invoked from network); 10 Jun 2015 03:45:07 -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; 10 Jun 2015 03:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2Wws-0001IY-B2 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:45:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2Wws-0005uw-1O for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 03:45:06 +0000 Date: Wed, 10 Jun 2015 03:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: use existing __section() macro instead of opencoding 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 522b9d0be31048e51079b2b7a8f511084a016221 Author: Andrew Cooper AuthorDate: Mon Jun 8 15:38:39 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 8 15:38:39 2015 +0200 arm: use existing __section() macro instead of opencoding it No functional change Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/include/asm-arm/device.h | 2 +- xen/include/asm-arm/platform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index a72f7c9..5d0a4cd 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -71,7 +71,7 @@ enum device_class device_get_class(const struct dt_device_node *dev); #define DT_DEVICE_START(_name, _namestr, _class) \ static const struct device_desc __dev_desc_##_name __used \ -__attribute__((__section__(".dev.info"))) = { \ +__section(".dev.info") = { \ .name = _namestr, \ .class = _class, \ diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 746e126..283b50f 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -67,7 +67,7 @@ void platform_dom0_gnttab(paddr_t *start, paddr_t *size); #define PLATFORM_START(_name, _namestr) \ static const struct platform_desc __plat_desc_##_name __used \ -__attribute__((__section__(".arch.info"))) = { \ +__section(".arch.info") = { \ .name = _namestr, #define PLATFORM_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 Wed Jun 10 04:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XM5-0002eD-Vy; Wed, 10 Jun 2015 04:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XM4-0002e8-HN for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:08 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 0E/23-01068-BD8B7755; Wed, 10 Jun 2015 04:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1433909466!11043639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10110 invoked from network); 10 Jun 2015 04:11:06 -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; 10 Jun 2015 04:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XLz-0001ep-EH for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XLz-00077j-00 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:03 +0000 Date: Wed, 10 Jun 2015 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98fc2a309a039b6e3c6ed6ac0f1c33548448d3da Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:11 2015 +0000 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.c | 25 +++++++++++++++++++++---- hw/xen/xen_pt.h | 2 -- hw/xen/xen_pt_config_init.c | 4 ---- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index d9d0885..da3953e 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -234,7 +234,7 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, int index = 0; XenPTRegGroup *reg_grp_entry = NULL; int rc = 0; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; int emul_len = 0; XenPTReg *reg_entry = NULL; uint32_t find_addr = addr; @@ -271,6 +271,9 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, if (rc < 0) { XEN_PT_ERR(d, "pci_read_block failed. return value: %d.\n", rc); memset(&read_val, 0xff, len); + wb_mask = 0; + } else { + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); } /* pass directly to the real device for passthrough type register group */ @@ -298,6 +301,11 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, valid_mask <<= (find_addr - real_offset) << 3; ptr_val = (uint8_t *)&val + (real_offset & 3); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation based on register size */ switch (reg->size) { @@ -350,10 +358,19 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, memory_region_transaction_commit(); out: - if (!(reg && reg->no_wb)) { + for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ - rc = xen_host_pci_set_block(&s->real_device, addr, - (uint8_t *)&val, len); + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + rc = xen_host_pci_set_block(&s->real_device, addr + index, + (uint8_t *)&val + index, len); if (rc < 0) { XEN_PT_ERR(d, "pci_write_block failed. return value: %d.\n", rc); diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 942dc60..52ceb85 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -105,8 +105,6 @@ struct XenPTRegInfo { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; xen_pt_conf_reg_init init; /* read/write function pointer * for double_word/word/byte size */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index c4c0319..fd73281 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1281,7 +1281,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = xen_pt_common_reg_init, .u.dw.read = xen_pt_long_reg_read, .u.dw.write = xen_pt_msgaddr32_reg_write, @@ -1293,7 +1292,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = xen_pt_msgaddr64_reg_init, .u.dw.read = xen_pt_long_reg_read, .u.dw.write = xen_pt_msgaddr64_reg_write, @@ -1305,7 +1303,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = xen_pt_msgdata_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgdata_reg_write, @@ -1317,7 +1314,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = xen_pt_msgdata_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgdata_reg_write, -- 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 Wed Jun 10 04:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XM5-0002eD-Vy; Wed, 10 Jun 2015 04:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XM4-0002e8-HN for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:08 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 0E/23-01068-BD8B7755; Wed, 10 Jun 2015 04:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1433909466!11043639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10110 invoked from network); 10 Jun 2015 04:11:06 -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; 10 Jun 2015 04:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XLz-0001ep-EH for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XLz-00077j-00 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:03 +0000 Date: Wed, 10 Jun 2015 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98fc2a309a039b6e3c6ed6ac0f1c33548448d3da Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:11 2015 +0000 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.c | 25 +++++++++++++++++++++---- hw/xen/xen_pt.h | 2 -- hw/xen/xen_pt_config_init.c | 4 ---- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index d9d0885..da3953e 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -234,7 +234,7 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, int index = 0; XenPTRegGroup *reg_grp_entry = NULL; int rc = 0; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; int emul_len = 0; XenPTReg *reg_entry = NULL; uint32_t find_addr = addr; @@ -271,6 +271,9 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, if (rc < 0) { XEN_PT_ERR(d, "pci_read_block failed. return value: %d.\n", rc); memset(&read_val, 0xff, len); + wb_mask = 0; + } else { + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); } /* pass directly to the real device for passthrough type register group */ @@ -298,6 +301,11 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, valid_mask <<= (find_addr - real_offset) << 3; ptr_val = (uint8_t *)&val + (real_offset & 3); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation based on register size */ switch (reg->size) { @@ -350,10 +358,19 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, memory_region_transaction_commit(); out: - if (!(reg && reg->no_wb)) { + for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ - rc = xen_host_pci_set_block(&s->real_device, addr, - (uint8_t *)&val, len); + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + rc = xen_host_pci_set_block(&s->real_device, addr + index, + (uint8_t *)&val + index, len); if (rc < 0) { XEN_PT_ERR(d, "pci_write_block failed. return value: %d.\n", rc); diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 942dc60..52ceb85 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -105,8 +105,6 @@ struct XenPTRegInfo { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; xen_pt_conf_reg_init init; /* read/write function pointer * for double_word/word/byte size */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index c4c0319..fd73281 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1281,7 +1281,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = xen_pt_common_reg_init, .u.dw.read = xen_pt_long_reg_read, .u.dw.write = xen_pt_msgaddr32_reg_write, @@ -1293,7 +1292,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = xen_pt_msgaddr64_reg_init, .u.dw.read = xen_pt_long_reg_read, .u.dw.write = xen_pt_msgaddr64_reg_write, @@ -1305,7 +1303,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = xen_pt_msgdata_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgdata_reg_write, @@ -1317,7 +1314,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = xen_pt_msgdata_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgdata_reg_write, -- 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 Wed Jun 10 04:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMG-0002f5-2Q; Wed, 10 Jun 2015 04:11:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XME-0002ev-Nn for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:18 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 6D/31-15949-6E8B7755; Wed, 10 Jun 2015 04:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1433909476!7772965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2927 invoked from network); 10 Jun 2015 04:11:17 -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; 10 Jun 2015 04:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMC-0001ex-01 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMB-00078d-Uo for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:15 +0000 Date: Wed, 10 Jun 2015 04:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ee7a3e24aaa032f88e91e01b44aadcdaa4c5609 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:18 2015 +0000 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pci/msi.c | 4 -- hw/xen/xen_pt_config_init.c | 98 ++++++++++++++++++++++++++++++++++++++---- include/hw/pci/pci_regs.h | 2 + 3 files changed, 90 insertions(+), 14 deletions(-) diff --git a/hw/pci/msi.c b/hw/pci/msi.c index 52d2313..1d25b62 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -21,10 +21,6 @@ #include "hw/pci/msi.h" #include "qemu/range.h" -/* Eventually those constants should go to Linux pci_regs.h */ -#define PCI_MSI_PENDING_32 0x10 -#define PCI_MSI_PENDING_64 0x14 - /* PCI_MSI_ADDRESS_LO */ #define PCI_MSI_ADDRESS_LO_MASK (~0x3) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index fd73281..8a74dc2 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1018,13 +1018,9 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] = { */ /* Helper */ -static bool xen_pt_msgdata_check_type(uint32_t offset, uint16_t flags) -{ - /* check the offset whether matches the type or not */ - bool is_32 = (offset == PCI_MSI_DATA_32) && !(flags & PCI_MSI_FLAGS_64BIT); - bool is_64 = (offset == PCI_MSI_DATA_64) && (flags & PCI_MSI_FLAGS_64BIT); - return is_32 || is_64; -} +#define xen_pt_msi_check_type(offset, flags, what) \ + ((offset) == ((flags) & PCI_MSI_FLAGS_64BIT ? \ + PCI_MSI_##what##_64 : PCI_MSI_##what##_32)) /* Message Control register */ static int xen_pt_msgctrl_reg_init(XenPCIPassthroughState *s, @@ -1136,7 +1132,45 @@ static int xen_pt_msgdata_reg_init(XenPCIPassthroughState *s, uint32_t offset = reg->offset; /* check the offset whether matches the type or not */ - if (xen_pt_msgdata_check_type(offset, flags)) { + if (xen_pt_msi_check_type(offset, flags, DATA)) { + *data = reg->init_val; + } else { + *data = XEN_PT_INVALID_REG; + } + return 0; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static int xen_pt_mask_reg_init(XenPCIPassthroughState *s, + XenPTRegInfo *reg, uint32_t real_offset, + uint32_t *data) +{ + uint32_t flags = s->msi->flags; + + /* check the offset whether matches the type or not */ + if (!(flags & PCI_MSI_FLAGS_MASKBIT)) { + *data = XEN_PT_INVALID_REG; + } else if (xen_pt_msi_check_type(reg->offset, flags, MASK)) { + *data = reg->init_val; + } else { + *data = XEN_PT_INVALID_REG; + } + return 0; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static int xen_pt_pending_reg_init(XenPCIPassthroughState *s, + XenPTRegInfo *reg, uint32_t real_offset, + uint32_t *data) +{ + uint32_t flags = s->msi->flags; + + /* check the offset whether matches the type or not */ + if (!(flags & PCI_MSI_FLAGS_MASKBIT)) { + *data = XEN_PT_INVALID_REG; + } else if (xen_pt_msi_check_type(reg->offset, flags, PENDING)) { *data = reg->init_val; } else { *data = XEN_PT_INVALID_REG; @@ -1224,7 +1258,7 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, uint32_t offset = reg->offset; /* check the offset whether matches the type or not */ - if (!xen_pt_msgdata_check_type(offset, msi->flags)) { + if (!xen_pt_msi_check_type(offset, msi->flags, DATA)) { /* exit I/O emulator */ XEN_PT_ERR(&s->dev, "the offset does not match the 32/64 bit type!\n"); return -1; @@ -1269,7 +1303,7 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = xen_pt_msgctrl_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgctrl_reg_write, @@ -1318,6 +1352,50 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgdata_reg_write, }, + /* Mask reg (if PCI_MSI_FLAGS_MASKBIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = xen_pt_mask_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASKBIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = xen_pt_mask_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASKBIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = xen_pt_pending_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASKBIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = xen_pt_pending_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, { .size = 0, }, diff --git a/include/hw/pci/pci_regs.h b/include/hw/pci/pci_regs.h index 56a404b..57e8c80 100644 --- a/include/hw/pci/pci_regs.h +++ b/include/hw/pci/pci_regs.h @@ -298,8 +298,10 @@ #define PCI_MSI_ADDRESS_HI 8 /* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */ #define PCI_MSI_DATA_32 8 /* 16 bits of data for 32-bit devices */ #define PCI_MSI_MASK_32 12 /* Mask bits register for 32-bit devices */ +#define PCI_MSI_PENDING_32 16 /* Pending bits register for 32-bit devices */ #define PCI_MSI_DATA_64 12 /* 16 bits of data for 64-bit devices */ #define PCI_MSI_MASK_64 16 /* Mask bits register for 64-bit devices */ +#define PCI_MSI_PENDING_64 20 /* Pending bits register for 32-bit devices */ /* MSI-X registers */ #define PCI_MSIX_FLAGS 2 -- 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 Wed Jun 10 04:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMG-0002f5-2Q; Wed, 10 Jun 2015 04:11:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XME-0002ev-Nn for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:18 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 6D/31-15949-6E8B7755; Wed, 10 Jun 2015 04:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1433909476!7772965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2927 invoked from network); 10 Jun 2015 04:11:17 -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; 10 Jun 2015 04:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMC-0001ex-01 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMB-00078d-Uo for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:15 +0000 Date: Wed, 10 Jun 2015 04:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ee7a3e24aaa032f88e91e01b44aadcdaa4c5609 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:18 2015 +0000 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pci/msi.c | 4 -- hw/xen/xen_pt_config_init.c | 98 ++++++++++++++++++++++++++++++++++++++---- include/hw/pci/pci_regs.h | 2 + 3 files changed, 90 insertions(+), 14 deletions(-) diff --git a/hw/pci/msi.c b/hw/pci/msi.c index 52d2313..1d25b62 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -21,10 +21,6 @@ #include "hw/pci/msi.h" #include "qemu/range.h" -/* Eventually those constants should go to Linux pci_regs.h */ -#define PCI_MSI_PENDING_32 0x10 -#define PCI_MSI_PENDING_64 0x14 - /* PCI_MSI_ADDRESS_LO */ #define PCI_MSI_ADDRESS_LO_MASK (~0x3) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index fd73281..8a74dc2 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1018,13 +1018,9 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] = { */ /* Helper */ -static bool xen_pt_msgdata_check_type(uint32_t offset, uint16_t flags) -{ - /* check the offset whether matches the type or not */ - bool is_32 = (offset == PCI_MSI_DATA_32) && !(flags & PCI_MSI_FLAGS_64BIT); - bool is_64 = (offset == PCI_MSI_DATA_64) && (flags & PCI_MSI_FLAGS_64BIT); - return is_32 || is_64; -} +#define xen_pt_msi_check_type(offset, flags, what) \ + ((offset) == ((flags) & PCI_MSI_FLAGS_64BIT ? \ + PCI_MSI_##what##_64 : PCI_MSI_##what##_32)) /* Message Control register */ static int xen_pt_msgctrl_reg_init(XenPCIPassthroughState *s, @@ -1136,7 +1132,45 @@ static int xen_pt_msgdata_reg_init(XenPCIPassthroughState *s, uint32_t offset = reg->offset; /* check the offset whether matches the type or not */ - if (xen_pt_msgdata_check_type(offset, flags)) { + if (xen_pt_msi_check_type(offset, flags, DATA)) { + *data = reg->init_val; + } else { + *data = XEN_PT_INVALID_REG; + } + return 0; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static int xen_pt_mask_reg_init(XenPCIPassthroughState *s, + XenPTRegInfo *reg, uint32_t real_offset, + uint32_t *data) +{ + uint32_t flags = s->msi->flags; + + /* check the offset whether matches the type or not */ + if (!(flags & PCI_MSI_FLAGS_MASKBIT)) { + *data = XEN_PT_INVALID_REG; + } else if (xen_pt_msi_check_type(reg->offset, flags, MASK)) { + *data = reg->init_val; + } else { + *data = XEN_PT_INVALID_REG; + } + return 0; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static int xen_pt_pending_reg_init(XenPCIPassthroughState *s, + XenPTRegInfo *reg, uint32_t real_offset, + uint32_t *data) +{ + uint32_t flags = s->msi->flags; + + /* check the offset whether matches the type or not */ + if (!(flags & PCI_MSI_FLAGS_MASKBIT)) { + *data = XEN_PT_INVALID_REG; + } else if (xen_pt_msi_check_type(reg->offset, flags, PENDING)) { *data = reg->init_val; } else { *data = XEN_PT_INVALID_REG; @@ -1224,7 +1258,7 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, uint32_t offset = reg->offset; /* check the offset whether matches the type or not */ - if (!xen_pt_msgdata_check_type(offset, msi->flags)) { + if (!xen_pt_msi_check_type(offset, msi->flags, DATA)) { /* exit I/O emulator */ XEN_PT_ERR(&s->dev, "the offset does not match the 32/64 bit type!\n"); return -1; @@ -1269,7 +1303,7 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = xen_pt_msgctrl_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgctrl_reg_write, @@ -1318,6 +1352,50 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgdata_reg_write, }, + /* Mask reg (if PCI_MSI_FLAGS_MASKBIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = xen_pt_mask_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASKBIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = xen_pt_mask_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASKBIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = xen_pt_pending_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASKBIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = xen_pt_pending_reg_init, + .u.dw.read = xen_pt_long_reg_read, + .u.dw.write = xen_pt_long_reg_write, + }, { .size = 0, }, diff --git a/include/hw/pci/pci_regs.h b/include/hw/pci/pci_regs.h index 56a404b..57e8c80 100644 --- a/include/hw/pci/pci_regs.h +++ b/include/hw/pci/pci_regs.h @@ -298,8 +298,10 @@ #define PCI_MSI_ADDRESS_HI 8 /* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */ #define PCI_MSI_DATA_32 8 /* 16 bits of data for 32-bit devices */ #define PCI_MSI_MASK_32 12 /* Mask bits register for 32-bit devices */ +#define PCI_MSI_PENDING_32 16 /* Pending bits register for 32-bit devices */ #define PCI_MSI_DATA_64 12 /* 16 bits of data for 64-bit devices */ #define PCI_MSI_MASK_64 16 /* Mask bits register for 64-bit devices */ +#define PCI_MSI_PENDING_64 20 /* Pending bits register for 32-bit devices */ /* MSI-X registers */ #define PCI_MSIX_FLAGS 2 -- 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 Wed Jun 10 04:11:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:11: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 1Z2XMR-0002ga-7m; Wed, 10 Jun 2015 04:11:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMP-0002gR-3a for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:29 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 7F/1F-05081-0F8B7755; Wed, 10 Jun 2015 04:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433909486!8941435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16793 invoked from network); 10 Jun 2015 04:11:27 -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; 10 Jun 2015 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMM-0001f7-EU for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMM-00079V-3X for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:26 +0000 Date: Wed, 10 Jun 2015 04:11:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/MSI-X: limit error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f26a9bbce40a5f9651e1062a8ab9975e68d9f03 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:24 2015 +0000 xen/MSI-X: limit error messages Limit error messages resulting from bad guest behavior to avoid allowing the guest to cause the control domain's disk to fill. The first message in pci_msix_write() can simply be deleted, as this is indeed bad guest behavior, but such out of bounds writes don't really need to be logged. The second one is more problematic, as there guest behavior may only appear to be wrong: For one, the old logic didn't take the mask-all bit into account. And then this shouldn't depend on host device state (i.e. the host may have masked the entry without the guest having done so). Plus these writes shouldn't be dropped even when an entry is unmasked. Instead, if they can't be made take effect right away, they should take effect on the next unmasking or enabling operation - the specification explicitly describes such caching behavior. Until we can validly drop the message (implementing such caching/latching behavior), issue the message just once per MSI-X table entry. Note that the log message in pci_msix_read() similar to the one being removed here is not an issue: "addr" being of unsigned type, and the maximum size of the MSI-X table being 32k, entry_nr simply can't be negative and hence the conditonal guarding issuing of the message will never be true. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.h | 1 + hw/xen/xen_pt_msi.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 52ceb85..8c9b6c2 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -175,6 +175,7 @@ typedef struct XenPTMSIXEntry { uint32_t data; uint32_t vector_ctrl; bool updated; /* indicate whether MSI ADDR or DATA is updated */ + bool warned; /* avoid issuing (bogus) warning more than once */ } XenPTMSIXEntry; typedef struct XenPTMSIX { uint32_t ctrl_offset; diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 9ed9321..68db623 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -434,11 +434,10 @@ static void pci_msix_write(void *opaque, hwaddr addr, XenPCIPassthroughState *s = opaque; XenPTMSIX *msix = s->msix; XenPTMSIXEntry *entry; - int entry_nr, offset; + unsigned int entry_nr, offset; entry_nr = addr / PCI_MSIX_ENTRY_SIZE; - if (entry_nr < 0 || entry_nr >= msix->total_entries) { - XEN_PT_ERR(&s->dev, "asked MSI-X entry '%i' invalid!\n", entry_nr); + if (entry_nr >= msix->total_entries) { return; } entry = &msix->msix_entry[entry_nr]; @@ -460,8 +459,11 @@ static void pci_msix_write(void *opaque, hwaddr addr, + PCI_MSIX_ENTRY_VECTOR_CTRL; if (msix->enabled && !(*vec_ctrl & PCI_MSIX_ENTRY_CTRL_MASKBIT)) { - XEN_PT_ERR(&s->dev, "Can't update msix entry %d since MSI-X is" - " already enabled.\n", entry_nr); + if (!entry->warned) { + entry->warned = true; + XEN_PT_ERR(&s->dev, "Can't update msix entry %d since MSI-X is" + " already enabled.\n", entry_nr); + } return; } -- 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 Wed Jun 10 04:11:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:11: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 1Z2XMR-0002ga-7m; Wed, 10 Jun 2015 04:11:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMP-0002gR-3a for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:29 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 7F/1F-05081-0F8B7755; Wed, 10 Jun 2015 04:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433909486!8941435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16793 invoked from network); 10 Jun 2015 04:11:27 -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; 10 Jun 2015 04:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMM-0001f7-EU for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMM-00079V-3X for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:26 +0000 Date: Wed, 10 Jun 2015 04:11:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/MSI-X: limit error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f26a9bbce40a5f9651e1062a8ab9975e68d9f03 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:24 2015 +0000 xen/MSI-X: limit error messages Limit error messages resulting from bad guest behavior to avoid allowing the guest to cause the control domain's disk to fill. The first message in pci_msix_write() can simply be deleted, as this is indeed bad guest behavior, but such out of bounds writes don't really need to be logged. The second one is more problematic, as there guest behavior may only appear to be wrong: For one, the old logic didn't take the mask-all bit into account. And then this shouldn't depend on host device state (i.e. the host may have masked the entry without the guest having done so). Plus these writes shouldn't be dropped even when an entry is unmasked. Instead, if they can't be made take effect right away, they should take effect on the next unmasking or enabling operation - the specification explicitly describes such caching behavior. Until we can validly drop the message (implementing such caching/latching behavior), issue the message just once per MSI-X table entry. Note that the log message in pci_msix_read() similar to the one being removed here is not an issue: "addr" being of unsigned type, and the maximum size of the MSI-X table being 32k, entry_nr simply can't be negative and hence the conditonal guarding issuing of the message will never be true. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.h | 1 + hw/xen/xen_pt_msi.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 52ceb85..8c9b6c2 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -175,6 +175,7 @@ typedef struct XenPTMSIXEntry { uint32_t data; uint32_t vector_ctrl; bool updated; /* indicate whether MSI ADDR or DATA is updated */ + bool warned; /* avoid issuing (bogus) warning more than once */ } XenPTMSIXEntry; typedef struct XenPTMSIX { uint32_t ctrl_offset; diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 9ed9321..68db623 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -434,11 +434,10 @@ static void pci_msix_write(void *opaque, hwaddr addr, XenPCIPassthroughState *s = opaque; XenPTMSIX *msix = s->msix; XenPTMSIXEntry *entry; - int entry_nr, offset; + unsigned int entry_nr, offset; entry_nr = addr / PCI_MSIX_ENTRY_SIZE; - if (entry_nr < 0 || entry_nr >= msix->total_entries) { - XEN_PT_ERR(&s->dev, "asked MSI-X entry '%i' invalid!\n", entry_nr); + if (entry_nr >= msix->total_entries) { return; } entry = &msix->msix_entry[entry_nr]; @@ -460,8 +459,11 @@ static void pci_msix_write(void *opaque, hwaddr addr, + PCI_MSIX_ENTRY_VECTOR_CTRL; if (msix->enabled && !(*vec_ctrl & PCI_MSIX_ENTRY_CTRL_MASKBIT)) { - XEN_PT_ERR(&s->dev, "Can't update msix entry %d since MSI-X is" - " already enabled.\n", entry_nr); + if (!entry->warned) { + entry->warned = true; + XEN_PT_ERR(&s->dev, "Can't update msix entry %d since MSI-X is" + " already enabled.\n", entry_nr); + } return; } -- 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 Wed Jun 10 04:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:11: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 1Z2XMa-0002i6-AN; Wed, 10 Jun 2015 04:11:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMZ-0002hs-B8 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:39 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 1C/4B-16276-AF8B7755; Wed, 10 Jun 2015 04:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433909496!12329612!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16032 invoked from network); 10 Jun 2015 04:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 04:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMW-0001fF-Lp for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMW-00079w-Hu for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:36 +0000 Date: Wed, 10 Jun 2015 04:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0090c14f57c3ffe07df4dd8d57f5a9481591c9ee Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:31 2015 +0000 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 8a74dc2..fcea005 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1055,7 +1055,6 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; - uint16_t raw_val; /* Currently no support for multi-vector */ if (*val & PCI_MSI_FLAGS_QSIZE) { @@ -1068,12 +1067,11 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; /* create value for writing to I/O device register */ - raw_val = *val; throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); /* update MSI */ - if (raw_val & PCI_MSI_FLAGS_ENABLE) { + if (*val & PCI_MSI_FLAGS_ENABLE) { /* setup MSI pirq for the first time */ if (!msi->initialized) { /* Init physical one */ @@ -1101,10 +1099,6 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, xen_pt_msi_disable(s); } - /* pass through MSI_ENABLE bit */ - *val &= ~PCI_MSI_FLAGS_ENABLE; - *val |= raw_val & PCI_MSI_FLAGS_ENABLE; - return 0; } @@ -1303,7 +1297,7 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = xen_pt_msgctrl_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgctrl_reg_write, -- 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 Wed Jun 10 04:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:11: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 1Z2XMa-0002i6-AN; Wed, 10 Jun 2015 04:11:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMZ-0002hs-B8 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:39 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 1C/4B-16276-AF8B7755; Wed, 10 Jun 2015 04:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433909496!12329612!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16032 invoked from network); 10 Jun 2015 04:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 04:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMW-0001fF-Lp for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMW-00079w-Hu for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:36 +0000 Date: Wed, 10 Jun 2015 04:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0090c14f57c3ffe07df4dd8d57f5a9481591c9ee Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:31 2015 +0000 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 8a74dc2..fcea005 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1055,7 +1055,6 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; - uint16_t raw_val; /* Currently no support for multi-vector */ if (*val & PCI_MSI_FLAGS_QSIZE) { @@ -1068,12 +1067,11 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; /* create value for writing to I/O device register */ - raw_val = *val; throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); /* update MSI */ - if (raw_val & PCI_MSI_FLAGS_ENABLE) { + if (*val & PCI_MSI_FLAGS_ENABLE) { /* setup MSI pirq for the first time */ if (!msi->initialized) { /* Init physical one */ @@ -1101,10 +1099,6 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, xen_pt_msi_disable(s); } - /* pass through MSI_ENABLE bit */ - *val &= ~PCI_MSI_FLAGS_ENABLE; - *val |= raw_val & PCI_MSI_FLAGS_ENABLE; - return 0; } @@ -1303,7 +1297,7 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = xen_pt_msgctrl_reg_init, .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_msgctrl_reg_write, -- 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 Wed Jun 10 04:11:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XMk-0002jm-D9; Wed, 10 Jun 2015 04: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 1Z2XMj-0002jZ-Hh for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:49 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 11/57-30658-409B7755; Wed, 10 Jun 2015 04:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1433909507!14314671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22519 invoked from network); 10 Jun 2015 04:11:48 -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; 10 Jun 2015 04:11:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMh-0001fL-0T for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMg-0007AJ-P4 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:46 +0000 Date: Wed, 10 Jun 2015 04:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: consolidate PM capability emu_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 369baec3d19ca051cc4abeaa9d9e6bf5ec5d9925 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:38 2015 +0000 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/xen/xen_pt_config_init.c | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index fcea005..e07f645 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -935,38 +935,21 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { * Power Management Capability */ -/* read Power Management Control/Status register */ -static int xen_pt_pmcsr_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - XenPTRegInfo *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} /* write Power Management Control/Status register */ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, uint16_t *val, uint16_t dev_value, uint16_t valid_mask) { XenPTRegInfo *reg = cfg_entry->reg; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -1002,9 +985,9 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] = { .size = 2, .init_val = 0x0008, .ro_mask = 0xE1FC, - .emu_mask = 0x8100, + .emu_mask = 0x810B, .init = xen_pt_common_reg_init, - .u.w.read = xen_pt_pmcsr_reg_read, + .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_pmcsr_reg_write, }, { -- 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 Wed Jun 10 04:11:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XMk-0002jm-D9; Wed, 10 Jun 2015 04: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 1Z2XMj-0002jZ-Hh for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:49 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 11/57-30658-409B7755; Wed, 10 Jun 2015 04:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1433909507!14314671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22519 invoked from network); 10 Jun 2015 04:11:48 -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; 10 Jun 2015 04:11:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMh-0001fL-0T for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMg-0007AJ-P4 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:46 +0000 Date: Wed, 10 Jun 2015 04:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: consolidate PM capability emu_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 369baec3d19ca051cc4abeaa9d9e6bf5ec5d9925 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:38 2015 +0000 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/xen/xen_pt_config_init.c | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index fcea005..e07f645 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -935,38 +935,21 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { * Power Management Capability */ -/* read Power Management Control/Status register */ -static int xen_pt_pmcsr_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - XenPTRegInfo *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} /* write Power Management Control/Status register */ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, uint16_t *val, uint16_t dev_value, uint16_t valid_mask) { XenPTRegInfo *reg = cfg_entry->reg; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -1002,9 +985,9 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] = { .size = 2, .init_val = 0x0008, .ro_mask = 0xE1FC, - .emu_mask = 0x8100, + .emu_mask = 0x810B, .init = xen_pt_common_reg_init, - .u.w.read = xen_pt_pmcsr_reg_read, + .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_pmcsr_reg_write, }, { -- 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 Wed Jun 10 04:12:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XMu-0002lG-Fm; Wed, 10 Jun 2015 04:12:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMt-0002l4-Ey for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:59 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 36/6E-30151-E09B7755; Wed, 10 Jun 2015 04:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1433909517!21915832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28884 invoked from network); 10 Jun 2015 04:11:58 -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; 10 Jun 2015 04:11:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMr-0001fU-4j for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMr-0007Af-3Y for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:57 +0000 Date: Wed, 10 Jun 2015 04:11:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60abfa7e7750945c4d222e8089fe6d06479d3367 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:43 2015 +0000 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index e07f645..026a7da 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -950,7 +950,8 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); return 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 Wed Jun 10 04:12:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XMu-0002lG-Fm; Wed, 10 Jun 2015 04:12:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMt-0002l4-Ey for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:59 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 36/6E-30151-E09B7755; Wed, 10 Jun 2015 04:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1433909517!21915832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28884 invoked from network); 10 Jun 2015 04:11:58 -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; 10 Jun 2015 04:11:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XMr-0001fU-4j for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XMr-0007Af-3Y for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:11:57 +0000 Date: Wed, 10 Jun 2015 04:11:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60abfa7e7750945c4d222e8089fe6d06479d3367 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:43 2015 +0000 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index e07f645..026a7da 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -950,7 +950,8 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); return 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 Wed Jun 10 04:12:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XN5-0002md-Ib; Wed, 10 Jun 2015 04:12:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XN4-0002mT-Bz for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:10 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 9B/E6-08244-919B7755; Wed, 10 Jun 2015 04:12:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1433909527!9711583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14575 invoked from network); 10 Jun 2015 04:12:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 04:12:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XN1-0001g2-8l for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XN1-0007BK-7N for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:07 +0000 Date: Wed, 10 Jun 2015 04:12:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb1e0cea8e5fdd1f8677c1733eec6175600ea69e Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:48 2015 +0000 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/xen/xen_pt_config_init.c | 51 ++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 31 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 026a7da..1a18dbb 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -95,6 +95,14 @@ XenPTReg *xen_pt_find_reg(XenPTRegGroup *reg_grp, uint32_t address) return NULL; } +static uint32_t get_throughable_mask(const XenPCIPassthroughState *s, + const XenPTRegInfo *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} /**************** * general register functions @@ -157,14 +165,13 @@ static int xen_pt_byte_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -175,14 +182,13 @@ static int xen_pt_word_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -193,14 +199,13 @@ static int xen_pt_long_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -292,15 +297,13 @@ static int xen_pt_cmd_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*val & PCI_COMMAND_INTX_DISABLE) { throughable_mask |= PCI_COMMAND_INTX_DISABLE; } else { @@ -456,7 +459,6 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, PCIDevice *d = &s->dev; const PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t r_size = 0; @@ -513,8 +515,7 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, } /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); return 0; } @@ -528,9 +529,8 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, XenPTRegion *base = NULL; PCIDevice *d = (PCIDevice *)&s->dev; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); pcibus_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r_size = d->io_regions[PCI_ROM_SLOT].size; @@ -539,7 +539,6 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, r_size = xen_pt_get_emul_size(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -547,7 +546,6 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -942,14 +940,13 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -1038,7 +1035,7 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* Currently no support for multi-vector */ if (*val & PCI_MSI_FLAGS_QSIZE) { @@ -1051,7 +1048,6 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); /* update MSI */ @@ -1163,7 +1159,6 @@ static int xen_pt_msgaddr32_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -1172,8 +1167,7 @@ static int xen_pt_msgaddr32_reg_write(XenPCIPassthroughState *s, s->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) { @@ -1191,7 +1185,6 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -1208,8 +1201,7 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, s->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) { @@ -1231,7 +1223,6 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t offset = reg->offset; @@ -1249,8 +1240,7 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) { @@ -1412,7 +1402,7 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); int debug_msix_enabled_old; /* modify emulate register */ @@ -1420,7 +1410,6 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s, cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); /* update MSI-X */ -- 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 Wed Jun 10 04:12:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XN5-0002md-Ib; Wed, 10 Jun 2015 04:12:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XN4-0002mT-Bz for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:10 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 9B/E6-08244-919B7755; Wed, 10 Jun 2015 04:12:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1433909527!9711583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14575 invoked from network); 10 Jun 2015 04:12:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 04:12:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XN1-0001g2-8l for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XN1-0007BK-7N for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:07 +0000 Date: Wed, 10 Jun 2015 04:12:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb1e0cea8e5fdd1f8677c1733eec6175600ea69e Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:48 2015 +0000 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/xen/xen_pt_config_init.c | 51 ++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 31 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 026a7da..1a18dbb 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -95,6 +95,14 @@ XenPTReg *xen_pt_find_reg(XenPTRegGroup *reg_grp, uint32_t address) return NULL; } +static uint32_t get_throughable_mask(const XenPCIPassthroughState *s, + const XenPTRegInfo *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} /**************** * general register functions @@ -157,14 +165,13 @@ static int xen_pt_byte_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -175,14 +182,13 @@ static int xen_pt_word_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -193,14 +199,13 @@ static int xen_pt_long_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -292,15 +297,13 @@ static int xen_pt_cmd_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*val & PCI_COMMAND_INTX_DISABLE) { throughable_mask |= PCI_COMMAND_INTX_DISABLE; } else { @@ -456,7 +459,6 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, PCIDevice *d = &s->dev; const PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t r_size = 0; @@ -513,8 +515,7 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, } /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); return 0; } @@ -528,9 +529,8 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, XenPTRegion *base = NULL; PCIDevice *d = (PCIDevice *)&s->dev; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); pcibus_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r_size = d->io_regions[PCI_ROM_SLOT].size; @@ -539,7 +539,6 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, r_size = xen_pt_get_emul_size(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -547,7 +546,6 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); return 0; @@ -942,14 +940,13 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -1038,7 +1035,7 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); /* Currently no support for multi-vector */ if (*val & PCI_MSI_FLAGS_QSIZE) { @@ -1051,7 +1048,6 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); /* update MSI */ @@ -1163,7 +1159,6 @@ static int xen_pt_msgaddr32_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -1172,8 +1167,7 @@ static int xen_pt_msgaddr32_reg_write(XenPCIPassthroughState *s, s->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) { @@ -1191,7 +1185,6 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -1208,8 +1201,7 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, s->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) { @@ -1231,7 +1223,6 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t offset = reg->offset; @@ -1249,8 +1240,7 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); + *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) { @@ -1412,7 +1402,7 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); int debug_msix_enabled_old; /* modify emulate register */ @@ -1420,7 +1410,6 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s, cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); /* update MSI-X */ -- 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 Wed Jun 10 04:12:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XNE-0002oT-NW; Wed, 10 Jun 2015 04: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 1Z2XND-0002oF-Q9 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:19 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 25/30-32406-329B7755; Wed, 10 Jun 2015 04:12:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433909537!13504941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27074 invoked from network); 10 Jun 2015 04:12:18 -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; 10 Jun 2015 04:12:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNB-0001g8-JZ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNB-0007Bs-CC for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:17 +0000 Date: Wed, 10 Jun 2015 04:12:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16c1631e63a22e80dfc0d288a2115dad4a848370 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:54 2015 +0000 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 1a18dbb..dd14f90 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -873,7 +873,7 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = xen_pt_common_reg_init, .u.dw.read = xen_pt_long_reg_read, -- 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 Wed Jun 10 04:12:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04: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 1Z2XNE-0002oT-NW; Wed, 10 Jun 2015 04: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 1Z2XND-0002oF-Q9 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:19 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 25/30-32406-329B7755; Wed, 10 Jun 2015 04:12:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433909537!13504941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27074 invoked from network); 10 Jun 2015 04:12:18 -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; 10 Jun 2015 04:12:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNB-0001g8-JZ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNB-0007Bs-CC for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:17 +0000 Date: Wed, 10 Jun 2015 04:12:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16c1631e63a22e80dfc0d288a2115dad4a848370 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:28:54 2015 +0000 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 1a18dbb..dd14f90 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -873,7 +873,7 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = xen_pt_common_reg_init, .u.dw.read = xen_pt_long_reg_read, -- 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 Wed Jun 10 04:12:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XNP-0002pr-QU; Wed, 10 Jun 2015 04:12:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNO-0002pg-Fc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:30 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 77/DB-13047-D29B7755; Wed, 10 Jun 2015 04:12:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1433909548!21901047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22559 invoked from network); 10 Jun 2015 04:12:28 -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; 10 Jun 2015 04:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNL-0001gJ-Tg for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNL-0007D1-M6 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:27 +0000 Date: Wed, 10 Jun 2015 04:12:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b5d10627ab7f5b67cb784459fc004c0745c4746 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:29:01 2015 +0000 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/xen/xen_pt.h | 2 ++ hw/xen/xen_pt_config_init.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 8c9b6c2..f9795eb 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -101,6 +101,8 @@ struct XenPTRegInfo { uint32_t offset; uint32_t size; uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index dd14f90..50c682d 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -580,7 +580,7 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = xen_pt_common_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -605,7 +605,8 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = xen_pt_status_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -982,7 +983,8 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = xen_pt_common_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -1270,7 +1272,8 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .offset = PCI_MSI_FLAGS, .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = xen_pt_msgctrl_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -1448,7 +1451,8 @@ static XenPTRegInfo xen_pt_emu_reg_msix[] = { .offset = PCI_MSI_FLAGS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = xen_pt_msixctrl_reg_init, .u.w.read = xen_pt_word_reg_read, -- 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 Wed Jun 10 04:12:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XNP-0002pr-QU; Wed, 10 Jun 2015 04:12:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNO-0002pg-Fc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:30 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 77/DB-13047-D29B7755; Wed, 10 Jun 2015 04:12:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1433909548!21901047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22559 invoked from network); 10 Jun 2015 04:12:28 -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; 10 Jun 2015 04:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNL-0001gJ-Tg for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNL-0007D1-M6 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:27 +0000 Date: Wed, 10 Jun 2015 04:12:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b5d10627ab7f5b67cb784459fc004c0745c4746 Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:29:01 2015 +0000 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/xen/xen_pt.h | 2 ++ hw/xen/xen_pt_config_init.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 8c9b6c2..f9795eb 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -101,6 +101,8 @@ struct XenPTRegInfo { uint32_t offset; uint32_t size; uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index dd14f90..50c682d 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -580,7 +580,7 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = xen_pt_common_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -605,7 +605,8 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = xen_pt_status_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -982,7 +983,8 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = xen_pt_common_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -1270,7 +1272,8 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] = { .offset = PCI_MSI_FLAGS, .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = xen_pt_msgctrl_reg_init, .u.w.read = xen_pt_word_reg_read, @@ -1448,7 +1451,8 @@ static XenPTRegInfo xen_pt_emu_reg_msix[] = { .offset = PCI_MSI_FLAGS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = xen_pt_msixctrl_reg_init, .u.w.read = xen_pt_word_reg_read, -- 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 Wed Jun 10 04:12:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XNZ-0002rL-T5; Wed, 10 Jun 2015 04:12:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNY-0002r9-Iz for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:40 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id A8/60-32406-739B7755; Wed, 10 Jun 2015 04:12:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1433909558!14735254!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19704 invoked from network); 10 Jun 2015 04:12:39 -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; 10 Jun 2015 04:12:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNW-0001gP-1t for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNW-0007Db-0s for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:38 +0000 Date: Wed, 10 Jun 2015 04:12:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2caff9b5dfbfb7abdf420a52f177efc42675147d Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:29:07 2015 +0000 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/xen/xen_pt_config_init.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 50c682d..0a38dbb 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -756,6 +756,15 @@ static XenPTRegInfo xen_pt_emu_reg_vpd[] = { .u.b.write = xen_pt_byte_reg_write, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = xen_pt_common_reg_init, + .u.w.read = xen_pt_word_reg_read, + .u.w.write = xen_pt_word_reg_write, + }, + { .size = 0, }, }; @@ -891,6 +900,16 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_word_reg_write, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = xen_pt_common_reg_init, + .u.w.read = xen_pt_word_reg_read, + .u.w.write = xen_pt_word_reg_write, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -902,6 +921,15 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_word_reg_write, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = xen_pt_common_reg_init, + .u.w.read = xen_pt_word_reg_read, + .u.w.write = xen_pt_word_reg_write, + }, /* Device Control 2 reg */ { .offset = 0x28, -- 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 Wed Jun 10 04:12:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XNZ-0002rL-T5; Wed, 10 Jun 2015 04:12:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNY-0002r9-Iz for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:40 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id A8/60-32406-739B7755; Wed, 10 Jun 2015 04:12:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1433909558!14735254!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19704 invoked from network); 10 Jun 2015 04:12:39 -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; 10 Jun 2015 04:12:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNW-0001gP-1t for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNW-0007Db-0s for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:38 +0000 Date: Wed, 10 Jun 2015 04:12:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2caff9b5dfbfb7abdf420a52f177efc42675147d Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:29:07 2015 +0000 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/xen/xen_pt_config_init.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 50c682d..0a38dbb 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -756,6 +756,15 @@ static XenPTRegInfo xen_pt_emu_reg_vpd[] = { .u.b.write = xen_pt_byte_reg_write, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = xen_pt_common_reg_init, + .u.w.read = xen_pt_word_reg_read, + .u.w.write = xen_pt_word_reg_write, + }, + { .size = 0, }, }; @@ -891,6 +900,16 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_word_reg_write, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = xen_pt_common_reg_init, + .u.w.read = xen_pt_word_reg_read, + .u.w.write = xen_pt_word_reg_write, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -902,6 +921,15 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { .u.w.read = xen_pt_word_reg_read, .u.w.write = xen_pt_word_reg_write, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = xen_pt_common_reg_init, + .u.w.read = xen_pt_word_reg_read, + .u.w.write = xen_pt_word_reg_write, + }, /* Device Control 2 reg */ { .offset = 0x28, -- 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 Wed Jun 10 04:12:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XNk-0002sv-0T; Wed, 10 Jun 2015 04:12:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNi-0002sj-VH for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:51 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id BF/70-32406-249B7755; Wed, 10 Jun 2015 04:12:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433909568!13505002!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28945 invoked from network); 10 Jun 2015 04:12:49 -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; 10 Jun 2015 04:12:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNg-0001gV-9R for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNg-0007E2-5U for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:48 +0000 Date: Wed, 10 Jun 2015 04:12:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e15907a474fe03ca13fca067b7046b77122484cb Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:29:13 2015 +0000 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/xen/xen_pt.c | 32 +++++++++++++++++++++++++++++--- hw/xen/xen_pt.h | 2 ++ hw/xen/xen_pt_config_init.c | 4 ++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index da3953e..9d2b06b 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -239,6 +239,7 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, XenPTReg *reg_entry = NULL; uint32_t find_addr = addr; XenPTRegInfo *reg = NULL; + bool wp_flag = false; if (xen_pt_pci_config_access_check(d, addr, len)) { return; @@ -278,6 +279,10 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, /* pass directly to the real device for passthrough type register group */ if (reg_grp_entry == NULL) { + if (!s->permissive) { + wb_mask = 0; + wp_flag = true; + } goto out; } @@ -298,12 +303,15 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, uint32_t real_offset = reg_grp_entry->base_offset + reg->offset; uint32_t valid_mask = 0xFFFFFFFF >> ((4 - emul_len) << 3); uint8_t *ptr_val = NULL; + uint32_t wp_mask = reg->emu_mask | reg->ro_mask; valid_mask <<= (find_addr - real_offset) << 3; ptr_val = (uint8_t *)&val + (real_offset & 3); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + if (!s->permissive) { + wp_mask |= reg->res_mask; + } + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); } @@ -347,6 +355,16 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, } else { /* nothing to do with passthrough type register, * continue to find next byte */ + if (!s->permissive) { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) { + wp_flag = true; + } + } emul_len--; find_addr++; } @@ -358,6 +376,13 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, memory_region_transaction_commit(); out: + if (wp_flag && !s->permissive_warned) { + s->permissive_warned = true; + xen_pt_log(d, "Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + xen_pt_log(d, "If the device doesn't work, try enabling permissive mode\n"); + xen_pt_log(d, "(unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -824,6 +849,7 @@ static void xen_pt_unregister_device(PCIDevice *d) static Property xen_pci_passthrough_properties[] = { DEFINE_PROP_PCI_HOST_DEVADDR("hostaddr", XenPCIPassthroughState, hostaddr), + DEFINE_PROP_BOOL("permissive", XenPCIPassthroughState, permissive, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index f9795eb..4bba559 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -197,6 +197,8 @@ struct XenPCIPassthroughState { PCIHostDeviceAddress hostaddr; bool is_virtfn; + bool permissive; + bool permissive_warned; XenHostPCIDevice real_device; XenPTRegion bases[PCI_NUM_REGIONS]; /* Access regions */ QLIST_HEAD(, XenPTRegGroup) reg_grps; diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 0a38dbb..25f53d9 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -101,6 +101,10 @@ static uint32_t get_throughable_mask(const XenPCIPassthroughState *s, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!s->permissive) { + throughable_mask &= ~reg->res_mask; + } + return throughable_mask & valid_mask; } -- 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 Wed Jun 10 04:12:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 04:12: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 1Z2XNk-0002sv-0T; Wed, 10 Jun 2015 04:12:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNi-0002sj-VH for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:51 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id BF/70-32406-249B7755; Wed, 10 Jun 2015 04:12:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433909568!13505002!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28945 invoked from network); 10 Jun 2015 04:12:49 -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; 10 Jun 2015 04:12:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2XNg-0001gV-9R for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2XNg-0007E2-5U for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 04:12:48 +0000 Date: Wed, 10 Jun 2015 04:12:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e15907a474fe03ca13fca067b7046b77122484cb Author: Jan Beulich AuthorDate: Tue Jun 2 15:43:08 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 9 10:29:13 2015 +0000 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/xen/xen_pt.c | 32 +++++++++++++++++++++++++++++--- hw/xen/xen_pt.h | 2 ++ hw/xen/xen_pt_config_init.c | 4 ++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index da3953e..9d2b06b 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -239,6 +239,7 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, XenPTReg *reg_entry = NULL; uint32_t find_addr = addr; XenPTRegInfo *reg = NULL; + bool wp_flag = false; if (xen_pt_pci_config_access_check(d, addr, len)) { return; @@ -278,6 +279,10 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, /* pass directly to the real device for passthrough type register group */ if (reg_grp_entry == NULL) { + if (!s->permissive) { + wb_mask = 0; + wp_flag = true; + } goto out; } @@ -298,12 +303,15 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, uint32_t real_offset = reg_grp_entry->base_offset + reg->offset; uint32_t valid_mask = 0xFFFFFFFF >> ((4 - emul_len) << 3); uint8_t *ptr_val = NULL; + uint32_t wp_mask = reg->emu_mask | reg->ro_mask; valid_mask <<= (find_addr - real_offset) << 3; ptr_val = (uint8_t *)&val + (real_offset & 3); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + if (!s->permissive) { + wp_mask |= reg->res_mask; + } + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); } @@ -347,6 +355,16 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, } else { /* nothing to do with passthrough type register, * continue to find next byte */ + if (!s->permissive) { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) { + wp_flag = true; + } + } emul_len--; find_addr++; } @@ -358,6 +376,13 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, memory_region_transaction_commit(); out: + if (wp_flag && !s->permissive_warned) { + s->permissive_warned = true; + xen_pt_log(d, "Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + xen_pt_log(d, "If the device doesn't work, try enabling permissive mode\n"); + xen_pt_log(d, "(unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -824,6 +849,7 @@ static void xen_pt_unregister_device(PCIDevice *d) static Property xen_pci_passthrough_properties[] = { DEFINE_PROP_PCI_HOST_DEVADDR("hostaddr", XenPCIPassthroughState, hostaddr), + DEFINE_PROP_BOOL("permissive", XenPCIPassthroughState, permissive, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index f9795eb..4bba559 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -197,6 +197,8 @@ struct XenPCIPassthroughState { PCIHostDeviceAddress hostaddr; bool is_virtfn; + bool permissive; + bool permissive_warned; XenHostPCIDevice real_device; XenPTRegion bases[PCI_NUM_REGIONS]; /* Access regions */ QLIST_HEAD(, XenPTRegGroup) reg_grps; diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 0a38dbb..25f53d9 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -101,6 +101,10 @@ static uint32_t get_throughable_mask(const XenPCIPassthroughState *s, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!s->permissive) { + throughable_mask &= ~reg->res_mask; + } + return throughable_mask & valid_mask; } -- 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 Wed Jun 10 13:22:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxV-0001Rq-78; Wed, 10 Jun 2015 13:22:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxT-0001RR-Bc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:19 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id D5/DB-30658-A0A38755; Wed, 10 Jun 2015 13:22:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1433942536!21498062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15823 invoked from network); 10 Jun 2015 13:22:17 -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; 10 Jun 2015 13:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxQ-0000Ir-1f for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxP-00053Q-Q5 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:15 +0000 Date: Wed, 10 Jun 2015 13:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 823757bf23f491d56a2d8353ddc838b83a3f8962 Author: Jan Beulich AuthorDate: Wed Jun 10 14:13:56 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:13:56 2015 +0100 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- 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 Jun 10 13:22:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxV-0001Rl-4e; Wed, 10 Jun 2015 13:22:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxS-0001R0-Pr for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:19 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 35/9E-32733-40A38755; Wed, 10 Jun 2015 13:22:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433942529!22068994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9743 invoked from network); 10 Jun 2015 13:22:10 -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; 10 Jun 2015 13:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxE-0000Io-Mk for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxE-00052x-B3 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:04 +0000 Date: Wed, 10 Jun 2015 13:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 835bc3eeba2cc52cc54b53578d78a2a7e56c54b6 Author: Jan Beulich AuthorDate: Wed Jun 10 14:13:52 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:13:52 2015 +0100 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- 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 Jun 10 13:22:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxV-0001Rq-78; Wed, 10 Jun 2015 13:22:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxT-0001RR-Bc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:19 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id D5/DB-30658-A0A38755; Wed, 10 Jun 2015 13:22:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1433942536!21498062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15823 invoked from network); 10 Jun 2015 13:22:17 -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; 10 Jun 2015 13:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxQ-0000Ir-1f for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxP-00053Q-Q5 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:15 +0000 Date: Wed, 10 Jun 2015 13:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 823757bf23f491d56a2d8353ddc838b83a3f8962 Author: Jan Beulich AuthorDate: Wed Jun 10 14:13:56 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:13:56 2015 +0100 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- 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 Jun 10 13:22:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxV-0001Rl-4e; Wed, 10 Jun 2015 13:22:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxS-0001R0-Pr for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:19 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 35/9E-32733-40A38755; Wed, 10 Jun 2015 13:22:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433942529!22068994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9743 invoked from network); 10 Jun 2015 13:22:10 -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; 10 Jun 2015 13:22:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxE-0000Io-Mk for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxE-00052x-B3 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:04 +0000 Date: Wed, 10 Jun 2015 13:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 835bc3eeba2cc52cc54b53578d78a2a7e56c54b6 Author: Jan Beulich AuthorDate: Wed Jun 10 14:13:52 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:13:52 2015 +0100 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- 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 Jun 10 13:22:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxi-0001Tu-AB; Wed, 10 Jun 2015 13:22:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxh-0001TX-4g for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:33 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 54/4C-30658-71A38755; Wed, 10 Jun 2015 13:22:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1433942549!22114379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6929 invoked from network); 10 Jun 2015 13:22:30 -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; 10 Jun 2015 13:22:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxa-0000Iu-Ht for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxa-00054P-6O for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:26 +0000 Date: Wed, 10 Jun 2015 13:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/MSI-X: disable logging by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf53d1740edb05958c3e092e7c23cf9b1724cb06 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:05 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:05 2015 +0100 xen/MSI-X: disable logging by default ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- 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 Jun 10 13:22:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxi-0001Tu-AB; Wed, 10 Jun 2015 13:22:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxh-0001TX-4g for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:33 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 54/4C-30658-71A38755; Wed, 10 Jun 2015 13:22:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1433942549!22114379!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6929 invoked from network); 10 Jun 2015 13:22:30 -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; 10 Jun 2015 13:22:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxa-0000Iu-Ht for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxa-00054P-6O for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:26 +0000 Date: Wed, 10 Jun 2015 13:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/MSI-X: disable logging by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf53d1740edb05958c3e092e7c23cf9b1724cb06 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:05 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:05 2015 +0100 xen/MSI-X: disable logging by default ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- 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 Jun 10 13:22:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxp-0001V0-E2; Wed, 10 Jun 2015 13:22:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxo-0001Um-Gk for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:40 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 09/7F-32733-E1A38755; Wed, 10 Jun 2015 13:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1433942557!22116176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20888 invoked from network); 10 Jun 2015 13:22:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 13:22:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxk-0000J6-Uh for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxk-00054t-Lw for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:36 +0000 Date: Wed, 10 Jun 2015 13:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c8bd2b55744d18db7e3ff3084765ec30e1c0fd2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- 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 Jun 10 13:22:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxp-0001V0-E2; Wed, 10 Jun 2015 13:22:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxo-0001Um-Gk for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:40 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 09/7F-32733-E1A38755; Wed, 10 Jun 2015 13:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1433942557!22116176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20888 invoked from network); 10 Jun 2015 13:22:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 13:22:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxk-0000J6-Uh for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxk-00054t-Lw for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:36 +0000 Date: Wed, 10 Jun 2015 13:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c8bd2b55744d18db7e3ff3084765ec30e1c0fd2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- 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 Jun 10 13:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxz-0001Wj-HA; Wed, 10 Jun 2015 13:22:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxy-0001WV-1q for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:50 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 8C/9B-06457-92A38755; Wed, 10 Jun 2015 13:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1433942567!14956999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10800 invoked from network); 10 Jun 2015 13:22:48 -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; 10 Jun 2015 13:22:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxv-0000JE-54 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxv-00055F-3R for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:47 +0000 Date: Wed, 10 Jun 2015 13:22:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: consolidate PM capability emu_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 54e3720bca9873e6e903b9488758f3777f4d55ba Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- 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 Jun 10 13:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:22: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 1Z2fxz-0001Wj-HA; Wed, 10 Jun 2015 13:22:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxy-0001WV-1q for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:50 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 8C/9B-06457-92A38755; Wed, 10 Jun 2015 13:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1433942567!14956999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10800 invoked from network); 10 Jun 2015 13:22:48 -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; 10 Jun 2015 13:22:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fxv-0000JE-54 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fxv-00055F-3R for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:47 +0000 Date: Wed, 10 Jun 2015 13:22:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: consolidate PM capability emu_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 54e3720bca9873e6e903b9488758f3777f4d55ba Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- 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 Jun 10 13:23:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13: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 1Z2fyA-0001Yv-QA; Wed, 10 Jun 2015 13:23:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fy8-0001Yb-Tv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:01 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 42/1B-01469-43A38755; Wed, 10 Jun 2015 13:23:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433942577!22082337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27871 invoked from network); 10 Jun 2015 13:22:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 13:22:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fy5-0000JN-AZ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fy5-00055b-9Z for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:57 +0000 Date: Wed, 10 Jun 2015 13:22:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6bfd2cd948aa1bed3272bf41c838cb11b9175234 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- 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 Jun 10 13:23:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13: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 1Z2fyA-0001Yv-QA; Wed, 10 Jun 2015 13:23:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fy8-0001Yb-Tv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:01 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 42/1B-01469-43A38755; Wed, 10 Jun 2015 13:23:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433942577!22082337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27871 invoked from network); 10 Jun 2015 13:22:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 13:22:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fy5-0000JN-AZ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fy5-00055b-9Z for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:22:57 +0000 Date: Wed, 10 Jun 2015 13:22:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6bfd2cd948aa1bed3272bf41c838cb11b9175234 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- 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 Jun 10 13:23:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13: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 1Z2fyJ-0001ar-W3; Wed, 10 Jun 2015 13:23:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyJ-0001aZ-2Y for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:11 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 9B/9D-03895-E3A38755; Wed, 10 Jun 2015 13:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433942587!12532554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16785 invoked from network); 10 Jun 2015 13:23:08 -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; 10 Jun 2015 13:23:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyF-0000Jt-Op for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyF-00056B-E7 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:07 +0000 Date: Wed, 10 Jun 2015 13:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8599757a0a68333eca419e20561eaf49ab1f24e2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- 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 Jun 10 13:23:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13: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 1Z2fyJ-0001ar-W3; Wed, 10 Jun 2015 13:23:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyJ-0001aZ-2Y for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:11 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 9B/9D-03895-E3A38755; Wed, 10 Jun 2015 13:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1433942587!12532554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16785 invoked from network); 10 Jun 2015 13:23:08 -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; 10 Jun 2015 13:23:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyF-0000Jt-Op for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyF-00056B-E7 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:07 +0000 Date: Wed, 10 Jun 2015 13:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8599757a0a68333eca419e20561eaf49ab1f24e2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- 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 Jun 10 13:23:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fyT-0001cW-2n; Wed, 10 Jun 2015 13:23:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyS-0001cI-Gv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:20 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 41/8C-10593-74A38755; Wed, 10 Jun 2015 13:23:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1433942598!14957192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21155 invoked from network); 10 Jun 2015 13:23:19 -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; 10 Jun 2015 13:23:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyP-0000K0-To for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyP-00056Z-S9 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:17 +0000 Date: Wed, 10 Jun 2015 13:23:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fa54a8818979ce375fa830402b5897996bbcc1a Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- 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 Jun 10 13:23:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fyT-0001cW-2n; Wed, 10 Jun 2015 13:23:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyS-0001cI-Gv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:20 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 41/8C-10593-74A38755; Wed, 10 Jun 2015 13:23:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1433942598!14957192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21155 invoked from network); 10 Jun 2015 13:23:19 -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; 10 Jun 2015 13:23:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyP-0000K0-To for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyP-00056Z-S9 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:17 +0000 Date: Wed, 10 Jun 2015 13:23:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fa54a8818979ce375fa830402b5897996bbcc1a Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- 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 Jun 10 13:23:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fye-0001eH-5g; Wed, 10 Jun 2015 13:23:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyc-0001e3-Sv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:31 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 89/0A-13517-25A38755; Wed, 10 Jun 2015 13:23:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1433942608!14908316!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23948 invoked from network); 10 Jun 2015 13:23:29 -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 Jun 2015 13:23:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fya-0000KA-35 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fya-00057r-2D for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:28 +0000 Date: Wed, 10 Jun 2015 13:23:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d688f2be26717ff45cb960dcd6f2fa71461bfb4 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- 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 Jun 10 13:23:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fye-0001eH-5g; Wed, 10 Jun 2015 13:23:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyc-0001e3-Sv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:31 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 89/0A-13517-25A38755; Wed, 10 Jun 2015 13:23:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1433942608!14908316!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23948 invoked from network); 10 Jun 2015 13:23:29 -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 Jun 2015 13:23:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fya-0000KA-35 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fya-00057r-2D for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:28 +0000 Date: Wed, 10 Jun 2015 13:23:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d688f2be26717ff45cb960dcd6f2fa71461bfb4 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- 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 Jun 10 13:23:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fyo-0001gI-8E; Wed, 10 Jun 2015 13:23:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyn-0001g2-5V for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:41 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 16/BD-06457-C5A38755; Wed, 10 Jun 2015 13:23:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433942618!13708038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19929 invoked from network); 10 Jun 2015 13:23:39 -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; 10 Jun 2015 13:23:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyk-0000LF-CU for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyk-00058I-7Q for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:38 +0000 Date: Wed, 10 Jun 2015 13:23:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2ce1e99e4e16adb1b9abe5f720604a895134a70 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- 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 Jun 10 13:23:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fyo-0001gI-8E; Wed, 10 Jun 2015 13:23:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyn-0001g2-5V for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:41 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 16/BD-06457-C5A38755; Wed, 10 Jun 2015 13:23:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1433942618!13708038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19929 invoked from network); 10 Jun 2015 13:23:39 -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; 10 Jun 2015 13:23:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyk-0000LF-CU for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyk-00058I-7Q for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:38 +0000 Date: Wed, 10 Jun 2015 13:23:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2ce1e99e4e16adb1b9abe5f720604a895134a70 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- 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 Jun 10 13:23:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fyy-0001iy-Vb; Wed, 10 Jun 2015 13:23:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyx-0001iF-NX for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:51 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 63/2F-03895-76A38755; Wed, 10 Jun 2015 13:23:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433942628!15009465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11658 invoked from network); 10 Jun 2015 13:23:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 13:23:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyu-0000LT-IN for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyu-00058e-HC for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:48 +0000 Date: Wed, 10 Jun 2015 13:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8fcecdca2dd1e6b4e78114977388ff0ddb85db20 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- 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 Jun 10 13:23:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:23: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 1Z2fyy-0001iy-Vb; Wed, 10 Jun 2015 13:23:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyx-0001iF-NX for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:51 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 63/2F-03895-76A38755; Wed, 10 Jun 2015 13:23:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1433942628!15009465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11658 invoked from network); 10 Jun 2015 13:23:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 13:23:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fyu-0000LT-IN for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fyu-00058e-HC for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:23:48 +0000 Date: Wed, 10 Jun 2015 13:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8fcecdca2dd1e6b4e78114977388ff0ddb85db20 Author: Jan Beulich AuthorDate: Wed Jun 10 14:14:25 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:25 2015 +0100 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- 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 Jun 10 13:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13: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 1Z2fzQ-0001oF-2u; Wed, 10 Jun 2015 13: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 1Z2fzN-0001nl-N1 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:18 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 80/F6-31258-08A38755; Wed, 10 Jun 2015 13:24:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433942641!22082708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20642 invoked from network); 10 Jun 2015 13:24:15 -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; 10 Jun 2015 13:24:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fz7-0000Lj-Dd for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fz7-0005Ae-BW for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:01 +0000 Date: Wed, 10 Jun 2015 13:24:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0101be92c03396ace3de93b974fd527b2ff2779 Author: Jan Beulich AuthorDate: Wed Jun 10 14:11:34 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:11:34 2015 +0100 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- 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 Jun 10 13:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13: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 1Z2fzQ-0001oF-2u; Wed, 10 Jun 2015 13: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 1Z2fzN-0001nl-N1 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:18 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 80/F6-31258-08A38755; Wed, 10 Jun 2015 13:24:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1433942641!22082708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20642 invoked from network); 10 Jun 2015 13:24:15 -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; 10 Jun 2015 13:24:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fz7-0000Lj-Dd for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fz7-0005Ae-BW for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:01 +0000 Date: Wed, 10 Jun 2015 13:24:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0101be92c03396ace3de93b974fd527b2ff2779 Author: Jan Beulich AuthorDate: Wed Jun 10 14:11:34 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:11:34 2015 +0100 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index eb2704b..6157afe 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- 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 Jun 10 13:24:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzV-0001pX-5G; Wed, 10 Jun 2015 13:24:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzS-0001op-M7 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:23 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id EE/41-13047-58A38755; Wed, 10 Jun 2015 13:24:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1433942652!22041446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7580 invoked from network); 10 Jun 2015 13:24:19 -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; 10 Jun 2015 13:24:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzH-0000MF-Lv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzH-0005BQ-IO for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:11 +0000 Date: Wed, 10 Jun 2015 13:24:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e2a2be008a15bc6f8ab19db400a076f8f598b12 Author: Jan Beulich AuthorDate: Wed Jun 10 14:11:47 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:11:47 2015 +0100 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- 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 Jun 10 13:24:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzV-0001pX-5G; Wed, 10 Jun 2015 13:24:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzS-0001op-M7 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:23 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id EE/41-13047-58A38755; Wed, 10 Jun 2015 13:24:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1433942652!22041446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7580 invoked from network); 10 Jun 2015 13:24:19 -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; 10 Jun 2015 13:24:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzH-0000MF-Lv for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzH-0005BQ-IO for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:11 +0000 Date: Wed, 10 Jun 2015 13:24:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e2a2be008a15bc6f8ab19db400a076f8f598b12 Author: Jan Beulich AuthorDate: Wed Jun 10 14:11:47 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:11:47 2015 +0100 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 6157afe..2e18a21 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- 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 Jun 10 13:24:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzY-0001qd-7Z; Wed, 10 Jun 2015 13:24:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzX-0001q9-Ar for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:27 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 49/BD-01469-A8A38755; Wed, 10 Jun 2015 13:24:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433942662!22115490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23487 invoked from network); 10 Jun 2015 13:24:25 -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; 10 Jun 2015 13:24:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzS-0000MI-4M for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzR-0005Ch-PY for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:21 +0000 Date: Wed, 10 Jun 2015 13:24:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/MSI-X: disable logging by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d7cdb148912a320a1d329552a3db788ac24157c Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:00 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:00 2015 +0100 xen/MSI-X: disable logging by default ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- 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 Jun 10 13:24:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzY-0001qd-7Z; Wed, 10 Jun 2015 13:24:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzX-0001q9-Ar for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:27 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 49/BD-01469-A8A38755; Wed, 10 Jun 2015 13:24:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1433942662!22115490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23487 invoked from network); 10 Jun 2015 13:24:25 -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; 10 Jun 2015 13:24:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzS-0000MI-4M for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzR-0005Ch-PY for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:21 +0000 Date: Wed, 10 Jun 2015 13:24:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/MSI-X: disable logging by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d7cdb148912a320a1d329552a3db788ac24157c Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:00 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:00 2015 +0100 xen/MSI-X: disable logging by default ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- 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 Jun 10 13:24:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzg-0001sc-AD; Wed, 10 Jun 2015 13:24:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzf-0001sD-3v for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:35 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id F7/69-05081-29A38755; Wed, 10 Jun 2015 13:24:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1433942672!7936581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18901 invoked from network); 10 Jun 2015 13:24:33 -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; 10 Jun 2015 13:24:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzc-0000MZ-DC for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzc-0005D5-8N for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:32 +0000 Date: Wed, 10 Jun 2015 13:24:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2736dd507ab8dee5abb8f046a36420c8c12638bf Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- 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 Jun 10 13:24:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzg-0001sc-AD; Wed, 10 Jun 2015 13:24:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzf-0001sD-3v for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:35 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id F7/69-05081-29A38755; Wed, 10 Jun 2015 13:24:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1433942672!7936581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18901 invoked from network); 10 Jun 2015 13:24:33 -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; 10 Jun 2015 13:24:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzc-0000MZ-DC for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzc-0005D5-8N for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:32 +0000 Date: Wed, 10 Jun 2015 13:24:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2736dd507ab8dee5abb8f046a36420c8c12638bf Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e18a21..8c63b8a 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3950,12 +3956,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, } } - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- 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 Jun 10 13:24:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzu-0001vq-IR; Wed, 10 Jun 2015 13:24:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzs-0001vK-VV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:49 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B2/E4-27764-F9A38755; Wed, 10 Jun 2015 13:24:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433942682!22069916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 502 invoked from network); 10 Jun 2015 13:24:46 -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; 10 Jun 2015 13:24:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzm-0000Mi-IV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzm-0005DU-Hc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:42 +0000 Date: Wed, 10 Jun 2015 13:24:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: consolidate PM capability emu_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 cdad723c1e4bd517c1898825b9eb35509a6d0393 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- 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 Jun 10 13:24:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2fzu-0001vq-IR; Wed, 10 Jun 2015 13:24:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzs-0001vK-VV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:49 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B2/E4-27764-F9A38755; Wed, 10 Jun 2015 13:24:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1433942682!22069916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 502 invoked from network); 10 Jun 2015 13:24:46 -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; 10 Jun 2015 13:24:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzm-0000Mi-IV for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzm-0005DU-Hc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:42 +0000 Date: Wed, 10 Jun 2015 13:24:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: consolidate PM capability emu_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 cdad723c1e4bd517c1898825b9eb35509a6d0393 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 8c63b8a..d73a137 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- 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 Jun 10 13:24:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2g00-0001xR-Ls; Wed, 10 Jun 2015 13:24:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzz-0001wv-3L for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:55 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id D2/5E-13517-6AA38755; Wed, 10 Jun 2015 13:24:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1433942692!14970620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18819 invoked from network); 10 Jun 2015 13:24:53 -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; 10 Jun 2015 13:24:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzw-0000Mm-Nc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzw-0005Dq-Mo for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:52 +0000 Date: Wed, 10 Jun 2015 13:24:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 903ee0042f24cde0c2079aafa1b31e0b4dd2ad34 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- 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 Jun 10 13:24:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:24: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 1Z2g00-0001xR-Ls; Wed, 10 Jun 2015 13:24:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzz-0001wv-3L for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:55 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id D2/5E-13517-6AA38755; Wed, 10 Jun 2015 13:24:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1433942692!14970620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18819 invoked from network); 10 Jun 2015 13:24:53 -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; 10 Jun 2015 13:24:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2fzw-0000Mm-Nc for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2fzw-0005Dq-Mo for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:24:52 +0000 Date: Wed, 10 Jun 2015 13:24:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 903ee0042f24cde0c2079aafa1b31e0b4dd2ad34 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index d73a137..7d4ef0e 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- 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 Jun 10 13:25:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0B-0001zt-QF; Wed, 10 Jun 2015 13:25:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0A-0001zU-L8 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:06 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id AB/E0-10437-1BA38755; Wed, 10 Jun 2015 13:25:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433942703!15017919!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23441 invoked from network); 10 Jun 2015 13:25: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; 10 Jun 2015 13:25:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g07-0000NT-0U for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g06-0005ES-Rz for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:02 +0000 Date: Wed, 10 Jun 2015 13:25:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd37ad776c7ea026b7b9f34b240f5714aee6819d Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- 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 Jun 10 13:25:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0B-0001zt-QF; Wed, 10 Jun 2015 13:25:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0A-0001zU-L8 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:06 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id AB/E0-10437-1BA38755; Wed, 10 Jun 2015 13:25:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1433942703!15017919!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23441 invoked from network); 10 Jun 2015 13:25: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; 10 Jun 2015 13:25:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g07-0000NT-0U for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g06-0005ES-Rz for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:02 +0000 Date: Wed, 10 Jun 2015 13:25:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd37ad776c7ea026b7b9f34b240f5714aee6819d Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 7d4ef0e..9ec9211 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3970,7 +3966,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3980,8 +3975,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4000,7 +3994,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4018,8 +4011,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4039,7 +4031,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4060,8 +4051,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4080,7 +4070,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4088,7 +4078,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- 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 Jun 10 13:25:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0K-000226-TT; Wed, 10 Jun 2015 13:25:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0J-00021f-JZ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:15 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 93/D1-21325-ABA38755; Wed, 10 Jun 2015 13:25:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1433942713!13225792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27441 invoked from network); 10 Jun 2015 13:25: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; 10 Jun 2015 13:25:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0H-0000NZ-6Z for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0H-0005Eo-5C for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:13 +0000 Date: Wed, 10 Jun 2015 13:25:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65e39c802e62d2427f5c3df2c597e0c3780d50f0 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- 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 Jun 10 13:25:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0K-000226-TT; Wed, 10 Jun 2015 13:25:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0J-00021f-JZ for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:15 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 93/D1-21325-ABA38755; Wed, 10 Jun 2015 13:25:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1433942713!13225792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27441 invoked from network); 10 Jun 2015 13:25: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; 10 Jun 2015 13:25:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0H-0000NZ-6Z for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0H-0005Eo-5C for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:13 +0000 Date: Wed, 10 Jun 2015 13:25:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65e39c802e62d2427f5c3df2c597e0c3780d50f0 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 9ec9211..67c0fd0 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- 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 Jun 10 13:25:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0U-00024M-WB; Wed, 10 Jun 2015 13:25:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0T-000241-St for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:25 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 99/F3-19215-5CA38755; Wed, 10 Jun 2015 13:25:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433942723!9105874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12361 invoked from network); 10 Jun 2015 13:25:24 -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; 10 Jun 2015 13:25:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0R-0000Ni-Au for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0R-0005Ft-9r for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:23 +0000 Date: Wed, 10 Jun 2015 13:25:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c74b777c1860ba8d1394ab9676fab527f5ed714 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- 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 Jun 10 13:25:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0U-00024M-WB; Wed, 10 Jun 2015 13:25:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0T-000241-St for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:25 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 99/F3-19215-5CA38755; Wed, 10 Jun 2015 13:25:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1433942723!9105874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12361 invoked from network); 10 Jun 2015 13:25:24 -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; 10 Jun 2015 13:25:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0R-0000Ni-Au for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0R-0005Ft-9r for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:23 +0000 Date: Wed, 10 Jun 2015 13:25:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c74b777c1860ba8d1394ab9676fab527f5ed714 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 67c0fd0..095d5a6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- 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 Jun 10 13:25:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0g-000275-4k; Wed, 10 Jun 2015 13:25:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0e-00026i-9m for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:36 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 8F/B5-01139-FCA38755; Wed, 10 Jun 2015 13:25:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1433942733!13220156!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17268 invoked from network); 10 Jun 2015 13:25:34 -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; 10 Jun 2015 13:25:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0b-0000Nt-IP for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0b-0005GQ-E0 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:33 +0000 Date: Wed, 10 Jun 2015 13:25:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 755f99f9fe4529d4349079565c8935be6974ec87 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- 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 Jun 10 13:25:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0g-000275-4k; Wed, 10 Jun 2015 13:25:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0e-00026i-9m for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:36 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 8F/B5-01139-FCA38755; Wed, 10 Jun 2015 13:25:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1433942733!13220156!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17268 invoked from network); 10 Jun 2015 13:25:34 -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; 10 Jun 2015 13:25:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0b-0000Nt-IP for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0b-0005GQ-E0 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:33 +0000 Date: Wed, 10 Jun 2015 13:25:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 755f99f9fe4529d4349079565c8935be6974ec87 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 095d5a6..653c122 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- 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 Jun 10 13:25:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0q-000297-7a; Wed, 10 Jun 2015 13:25:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0o-00028r-KX for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:46 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 26/28-15949-9DA38755; Wed, 10 Jun 2015 13:25:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433942744!13206123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7024 invoked from network); 10 Jun 2015 13:25: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; 10 Jun 2015 13:25:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0l-0000Nz-O5 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0l-0005Gn-Mi for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:43 +0000 Date: Wed, 10 Jun 2015 13:25:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fabc183544e966ddb9147e218246c26d2561157 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- 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 Jun 10 13:25:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 13:25: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 1Z2g0q-000297-7a; Wed, 10 Jun 2015 13:25:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0o-00028r-KX for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:46 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 26/28-15949-9DA38755; Wed, 10 Jun 2015 13:25:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433942744!13206123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7024 invoked from network); 10 Jun 2015 13:25: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; 10 Jun 2015 13:25:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2g0l-0000Nz-O5 for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2g0l-0005Gn-Mi for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 13:25:43 +0000 Date: Wed, 10 Jun 2015 13:25:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fabc183544e966ddb9147e218246c26d2561157 Author: Jan Beulich AuthorDate: Wed Jun 10 14:12:16 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:16 2015 +0100 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 653c122..0b76585 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4320,7 +4350,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4364,6 +4394,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4401,6 +4433,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- 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 Jun 10 15:33:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 15:33: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 1Z2i03-0006Sh-5t; Wed, 10 Jun 2015 15: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 1Z2i02-0006SV-CO for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 15:33:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id FA/90-19853-1B858755; Wed, 10 Jun 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433950384!13248189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29685 invoked from network); 10 Jun 2015 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2hzz-00020A-UW for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2hzy-0002cD-My for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 15:33:03 +0000 Date: Wed, 10 Jun 2015 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 5af278695f5c8b9e01f21803ec3afe40495e1716 Author: Ian Jackson AuthorDate: Tue Jun 9 16:33:00 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:33:00 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 7c1670f..8217417 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc2 -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TRADITIONAL_REVISION ?= afaa35b4bc975b2b89ad44c481d0d7623e3d1c49 +# Tue Jun 9 16:32:24 2015 +0100 +# ... by default. Add a per-device "permissive" mode similar to pciback's # 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. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 10 15:33:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jun 2015 15:33: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 1Z2i03-0006Sh-5t; Wed, 10 Jun 2015 15: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 1Z2i02-0006SV-CO for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 15:33:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id FA/90-19853-1B858755; Wed, 10 Jun 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1433950384!13248189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29685 invoked from network); 10 Jun 2015 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jun 2015 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z2hzz-00020A-UW for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z2hzy-0002cD-My for xen-changelog@lists.xensource.com; Wed, 10 Jun 2015 15:33:03 +0000 Date: Wed, 10 Jun 2015 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 5af278695f5c8b9e01f21803ec3afe40495e1716 Author: Ian Jackson AuthorDate: Tue Jun 9 16:33:00 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:33:00 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 7c1670f..8217417 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc2 -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TRADITIONAL_REVISION ?= afaa35b4bc975b2b89ad44c481d0d7623e3d1c49 +# Tue Jun 9 16:32:24 2015 +0100 +# ... by default. Add a per-device "permissive" mode similar to pciback's # 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. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34p1-0000vE-Pb; Thu, 11 Jun 2015 15:55:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34p0-0000v3-6F for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:14 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 06/8F-23832-16FA9755; Thu, 11 Jun 2015 15:55:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1434038111!15448057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8313 invoked from network); 11 Jun 2015 15:55:12 -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 Jun 2015 15:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34ox-000254-1q for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34ow-0003Ty-SP for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:10 +0000 Date: Thu, 11 Jun 2015 15:55:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b85a1e9cdef8de686780a6e3506448ceca37572 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:22 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:22 2015 +0100 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 1e06aba..ada7697 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34p1-0000vE-Pb; Thu, 11 Jun 2015 15:55:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34p0-0000v3-6F for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:14 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 06/8F-23832-16FA9755; Thu, 11 Jun 2015 15:55:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1434038111!15448057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8313 invoked from network); 11 Jun 2015 15:55:12 -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 Jun 2015 15:55:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34ox-000254-1q for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34ow-0003Ty-SP for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:10 +0000 Date: Thu, 11 Jun 2015 15:55:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen: properly gate host writes of modified PCI CFG contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b85a1e9cdef8de686780a6e3506448ceca37572 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:22 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:22 2015 +0100 xen: properly gate host writes of modified PCI CFG contents The old logic didn't work as intended when an access spanned multiple fields (for example a 32-bit access to the location of the MSI Message Data field with the high 16 bits not being covered by any known field). Remove it and derive which fields not to write to from the accessed fields' emulation masks: When they're all ones, there's no point in doing any host write. This fixes a secondary issue at once: We obviously shouldn't make any host write attempt when already the host read failed. This is XSA-128. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 31 +++++++++++++++++++++++-------- hw/pass-through.h | 2 -- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 1e06aba..ada7697 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_INTEL_OPREGION, .size = 4, .init_val = 0, - .no_wb = 1, + .emu_mask = 0xFFFFFFFF, .u.dw.read = pt_intel_opregion_read, .u.dw.write = pt_intel_opregion_write, .u.dw.restore = NULL, @@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000003, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr32_reg_write, @@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x00000000, .ro_mask = 0x00000000, .emu_mask = 0xFFFFFFFF, - .no_wb = 1, .init = pt_msgaddr64_reg_init, .u.dw.read = pt_long_reg_read, .u.dw.write = pt_msgaddr64_reg_write, @@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .init_val = 0x0000, .ro_mask = 0x0000, .emu_mask = 0xFFFF, - .no_wb = 1, .init = pt_msgdata_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgdata_reg_write, @@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0; + uint32_t read_val = 0, wb_mask; uint8_t *ptr_val = NULL; int emul_len = 0; int index = 0; @@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, { PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); memset((uint8_t *)&read_val, 0xff, len); + wb_mask = 0; } + else + wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) @@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); + if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { + wb_mask &= ~((reg->emu_mask + >> ((find_addr - real_offset) << 3)) + << ((len - emul_len) << 3)); + } /* do emulation depend on register size */ switch (reg->size) { @@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: - if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ - ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); + for (index = 0; wb_mask; index += len) { + /* unknown regs are passed through */ + while (!(wb_mask & 0xff)) { + index++; + wb_mask >>= 8; + } + len = 0; + do { + len++; + wb_mask >>= 8; + } while (wb_mask & 0xff); + ret = pci_write_block(pci_dev, address + index, + (uint8_t *)&val + index, len); if (!ret) PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); diff --git a/hw/pass-through.h b/hw/pass-through.h index d7d837c..2f11a80 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -372,8 +372,6 @@ struct pt_reg_info_tbl { uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ uint32_t emu_mask; - /* no write back allowed */ - uint32_t no_wb; /* emul reg initialize method */ conf_reg_init init; union { -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34pB-0000wU-Uk; Thu, 11 Jun 2015 15:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pA-0000wH-4C for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:24 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 71/DD-10437-B6FA9755; Thu, 11 Jun 2015 15:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1434038121!11685866!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27263 invoked from network); 11 Jun 2015 15:55:22 -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; 11 Jun 2015 15:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34p7-000257-9K for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34p7-0003V6-6N for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:21 +0000 Date: Thu, 11 Jun 2015 15:55:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bea6adbd1e446c4504c75ed11f3557ab742b87b8 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:24 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:24 2015 +0100 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index ada7697..2e210a3 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34pB-0000wU-Uk; Thu, 11 Jun 2015 15:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pA-0000wH-4C for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:24 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 71/DD-10437-B6FA9755; Thu, 11 Jun 2015 15:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1434038121!11685866!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27263 invoked from network); 11 Jun 2015 15:55:22 -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; 11 Jun 2015 15:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34p7-000257-9K for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34p7-0003V6-6N for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:21 +0000 Date: Thu, 11 Jun 2015 15:55:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen: don't allow guest to control MSI mask register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bea6adbd1e446c4504c75ed11f3557ab742b87b8 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:24 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:24 2015 +0100 xen: don't allow guest to control MSI mask register It's being used by the hypervisor. For now simply mimic a device not capable of masking, and fully emulate any accesses a guest may issue nevertheless as simple reads/writes without side effects. This is XSA-129. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/pass-through.h | 6 ++++ 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index ada7697..2e210a3 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset); static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, @@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x007F, + .emu_mask = 0x017F, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .u.w.write = pt_msgdata_reg_write, .u.w.restore = NULL, }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0xFFFFFFFF, + .init = pt_mask_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ + { + .offset = PCI_MSI_MASK_32 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, + /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ + { + .offset = PCI_MSI_MASK_64 + 4, + .size = 4, + .init_val = 0x00000000, + .ro_mask = 0xFFFFFFFF, + .emu_mask = 0x00000000, + .init = pt_pending_reg_init, + .u.dw.read = pt_long_reg_read, + .u.dw.write = pt_long_reg_write, + }, { .size = 0, }, @@ -3021,6 +3069,42 @@ static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, return PT_INVALID_REG; } +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Mask register */ +static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) + return reg->init_val; + + return PT_INVALID_REG; +} + +/* this function will be called twice (for 32 bit and 64 bit type) */ +/* initialize Pending register */ +static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, + struct pt_reg_info_tbl *reg, uint32_t real_offset) +{ + uint32_t flags = ptdev->msi->flags; + uint32_t offset = reg->offset; + + if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) + return PT_INVALID_REG; + + if (offset == (flags & PCI_MSI_FLAGS_64BIT ? + PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) + return reg->init_val; + + return PT_INVALID_REG; +} + /* initialize Message Control register for MSI-X */ static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) diff --git a/hw/pass-through.h b/hw/pass-through.h index 2f11a80..bcb6684 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -84,6 +84,12 @@ #define PCI_MSI_FLAGS_MASK_BIT 0x0100 #endif +#ifndef PCI_MSI_MASK_32 +/* interrupt masking register */ +#define PCI_MSI_MASK_32 12 +#define PCI_MSI_MASK_64 16 +#endif + #ifndef PCI_EXP_TYPE_PCIE_BRIDGE /* PCI/PCI-X to PCIE Bridge */ #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34pM-0000y2-20; Thu, 11 Jun 2015 15:55:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pK-0000xk-74 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:34 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id B9/EC-21325-57FA9755; Thu, 11 Jun 2015 15:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1434038132!13593986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2830 invoked from network); 11 Jun 2015 15:55:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:55:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pH-00025L-OG for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pH-0003Va-E3 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:31 +0000 Date: Thu, 11 Jun 2015 15:55:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/MSI-X: disable logging by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5f7efbbf46d5d2405d3012e10ea510346bb5e88 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:26 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:26 2015 +0100 xen/MSI-X: disable logging by default ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34pM-0000y2-20; Thu, 11 Jun 2015 15:55:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pK-0000xk-74 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:34 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id B9/EC-21325-57FA9755; Thu, 11 Jun 2015 15:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1434038132!13593986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2830 invoked from network); 11 Jun 2015 15:55:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:55:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pH-00025L-OG for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pH-0003Va-E3 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:31 +0000 Date: Thu, 11 Jun 2015 15:55:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/MSI-X: disable logging by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5f7efbbf46d5d2405d3012e10ea510346bb5e88 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:26 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:26 2015 +0100 xen/MSI-X: disable logging by default ... to avoid allowing the guest to cause the control domain's disk to fill. This is XSA-130. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.h b/hw/pass-through.h index bcb6684..5adc12d 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -27,7 +27,7 @@ #include "qemu-timer.h" /* Log acesss */ -#define PT_LOGGING_ENABLED +/* #define PT_LOGGING_ENABLED */ /* Print errors even if logging is disabled */ #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34pW-0000zd-51; Thu, 11 Jun 2015 15:55:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pU-0000zM-I6 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:44 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 18/33-10593-F7FA9755; Thu, 11 Jun 2015 15:55:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434038142!12970663!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27806 invoked from network); 11 Jun 2015 15:55:43 -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; 11 Jun 2015 15:55:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pS-00025R-22 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pR-0003W6-SU for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:41 +0000 Date: Thu, 11 Jun 2015 15:55:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7307e1523ae7deb9ea206a75a23ecc8e60524575 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:45 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:45 2015 +0100 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e210a3..81a8de2 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3946,12 +3952,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, else ptdev->msi->flags &= ~PCI_MSI_FLAGS_ENABLE; - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34pW-0000zd-51; Thu, 11 Jun 2015 15:55:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pU-0000zM-I6 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:44 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 18/33-10593-F7FA9755; Thu, 11 Jun 2015 15:55:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434038142!12970663!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27806 invoked from network); 11 Jun 2015 15:55:43 -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; 11 Jun 2015 15:55:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pS-00025R-22 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pR-0003W6-SU for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:41 +0000 Date: Thu, 11 Jun 2015 15:55:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/MSI: don't open-code pass-through of enable bit modifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7307e1523ae7deb9ea206a75a23ecc8e60524575 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:45 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:45 2015 +0100 xen/MSI: don't open-code pass-through of enable bit modifications Without this the actual XSA-131 fix would cause the enable bit to not get set anymore (due to the write back getting suppressed there based on the OR of emu_mask, ro_mask, and res_mask). Note that the fiddling with the enable bit shouldn't really be done by qemu, but making this work right (via libxc and the hypervisor) will require more extensive changes, which can be postponed until after the security issue got addressed. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- hw/pass-through.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 2e210a3..81a8de2 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xFF8E, - .emu_mask = 0x017F, + .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, .u.w.write = pt_msgctrl_reg_write, @@ -3899,6 +3899,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; + /* also emulate MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3907,6 +3910,9 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; throughable_mask = ~reg->emu_mask & valid_mask; + /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ + if (ptdev->msi_trans_en) + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3946,12 +3952,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, else ptdev->msi->flags &= ~PCI_MSI_FLAGS_ENABLE; - /* pass through MSI_ENABLE bit when no MSI-INTx translation */ - if (!ptdev->msi_trans_en) { - *value &= ~PCI_MSI_FLAGS_ENABLE; - *value |= val & PCI_MSI_FLAGS_ENABLE; - } - return 0; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34ph-00011S-8W; Thu, 11 Jun 2015 15:55:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pf-00011G-6w for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:55 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 5E/6D-32733-A8FA9755; Thu, 11 Jun 2015 15:55:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434038152!22524832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24614 invoked from network); 11 Jun 2015 15:55:53 -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; 11 Jun 2015 15:55:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pc-00025a-8T for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pc-0003WX-6e for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:52 +0000 Date: Thu, 11 Jun 2015 15:55:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: consolidate PM capability emu_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 8c245fa40cd01527dac57292e5497e0fc1515e25 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:54 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:54 2015 +0100 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 81a8de2..98a7df6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:55:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:55: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 1Z34ph-00011S-8W; Thu, 11 Jun 2015 15:55:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pf-00011G-6w for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:55 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 5E/6D-32733-A8FA9755; Thu, 11 Jun 2015 15:55:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434038152!22524832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24614 invoked from network); 11 Jun 2015 15:55:53 -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; 11 Jun 2015 15:55:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pc-00025a-8T for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pc-0003WX-6e for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:55:52 +0000 Date: Thu, 11 Jun 2015 15:55:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: consolidate PM capability emu_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 8c245fa40cd01527dac57292e5497e0fc1515e25 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:54 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:54 2015 +0100 xen/pt: consolidate PM capability emu_mask There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local emu_mask variable - we can have the same effect by setting the field descriptor's emu_mask member suitably right away. Note that xen_pt_pmcsr_reg_write() is being retained in order to allow later patches to be less intrusive. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 65 +++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 81a8de2..98a7df6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint8_t *value, uint8_t dev_value, uint8_t valid_mask); @@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = NULL, }, - /* PCI Power Management Control/Status reg */ + /* PCI Power Management Control/Status reg (->power_mgmt on) */ { .offset = PCI_PM_CTRL, .size = 2, @@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .ro_mask = 0xE1FC, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, - .u.w.read = pt_pmcsr_reg_read, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_pmcsr_reg_write, + .u.w.restore = pt_pmcsr_reg_restore, + }, + /* PCI Power Management Control/Status reg (->power_mgmt off) */ + { + .offset = PCI_PM_CTRL, + .size = 2, + .init_val = 0x0008, + .ro_mask = 0xE1FC, + .emu_mask = 0x810B, + .init = pt_pmcsr_reg_init, + .u.w.read = pt_word_reg_read, .u.w.write = pt_pmcsr_reg_write, .u.w.restore = pt_pmcsr_reg_restore, }, @@ -2917,6 +2926,7 @@ static uint32_t pt_pmc_reg_init(struct pt_dev *ptdev, return reg->init_val; } +/* this function will be called twice (for ->power_mgmt on and off cases) */ /* initialize PCI Power Management Control/Status register */ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg, uint32_t real_offset) @@ -2924,8 +2934,23 @@ static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, PCIDevice *d = &ptdev->dev; uint16_t cap_ver = 0; - if (!ptdev->power_mgmt) - return reg->init_val; + switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | + PCI_PM_CTRL_NO_SOFT_RESET)) + { + case 0: + if (!ptdev->power_mgmt) + return PT_INVALID_REG; + break; + case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: + if (!ptdev->power_mgmt) + return reg->init_val; + return PT_INVALID_REG; + default: + /* exit I/O emulator */ + PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." + " I/O emulator exit.\n", reg->emu_mask); + exit(1); + } /* check PCI Power Management support version */ cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; @@ -3415,24 +3440,6 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } -/* read Power Management Control/Status register */ -static int pt_pmcsr_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = reg->emu_mask; - - if (!ptdev->power_mgmt) - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - - valid_emu_mask = valid_emu_mask & valid_mask ; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - - /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3766,21 +3773,17 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; - uint16_t emu_mask = reg->emu_mask; uint16_t writable_mask = 0; uint16_t throughable_mask = 0; struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; - if (!ptdev->power_mgmt) - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; - /* modify emulate register */ - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); if (!ptdev->power_mgmt) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pt-000149-JP; Thu, 11 Jun 2015 15:56:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pr-00013N-K9 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:07 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 60/44-11201-69FA9755; Thu, 11 Jun 2015 15:56:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434038165!13564934!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16712 invoked from network); 11 Jun 2015 15:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pm-00026C-IQ for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pm-0003XC-CI for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:02 +0000 Date: Thu, 11 Jun 2015 15:56:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c6e4c043793bee997cd396de544bc9bcf5e74d2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 98a7df6..34aa154 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pt-000149-JP; Thu, 11 Jun 2015 15:56:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pr-00013N-K9 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:07 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 60/44-11201-69FA9755; Thu, 11 Jun 2015 15:56:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434038165!13564934!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16712 invoked from network); 11 Jun 2015 15:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pm-00026C-IQ for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pm-0003XC-CI for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:02 +0000 Date: Thu, 11 Jun 2015 15:56:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: correctly handle PM status bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c6e4c043793bee997cd396de544bc9bcf5e74d2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: correctly handle PM status bit xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 98a7df6..34aa154 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3784,7 +3784,8 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, + throughable_mask); if (!ptdev->power_mgmt) return 0; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34q3-00017A-My; Thu, 11 Jun 2015 15:56:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34q2-00016w-Fo for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:18 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D8/6C-21074-1AFA9755; Thu, 11 Jun 2015 15:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1434038175!13551239!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 564 invoked from network); 11 Jun 2015 15:56:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pz-00026I-EE for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pz-0003Xv-C2 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:15 +0000 Date: Thu, 11 Jun 2015 15:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9f70510a5731a8ed7527fcbf0c92df0054e5386 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 34aa154..139c3f5 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3966,7 +3962,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3976,8 +3971,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -3996,7 +3990,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4014,8 +4007,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4035,7 +4027,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4056,8 +4047,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4076,7 +4066,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4084,7 +4074,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34q3-00017A-My; Thu, 11 Jun 2015 15:56:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34q2-00016w-Fo for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:18 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D8/6C-21074-1AFA9755; Thu, 11 Jun 2015 15:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1434038175!13551239!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 564 invoked from network); 11 Jun 2015 15:56:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34pz-00026I-EE for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34pz-0003Xv-C2 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:15 +0000 Date: Thu, 11 Jun 2015 15:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: split out calculation of throughable mask in PCI config space handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9f70510a5731a8ed7527fcbf0c92df0054e5386 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: split out calculation of throughable mask in PCI config space handling This is just to avoid having to adjust that calculation later in multiple places. Note that including ->ro_mask in get_throughable_mask()'s calculation is only an apparent (i.e. benign) behavioral change: For r/o fields it doesn't matter > whether they get passed through - either the same flag is also set in emu_mask (then there's no change at all) or the field is r/o in hardware (and hence a write won't change it anyway). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- hw/pass-through.c | 59 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 34aa154..139c3f5 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -3440,6 +3440,15 @@ static int pt_bar_reg_read(struct pt_dev *ptdev, } +static uint32_t get_throughable_mask(const struct pt_dev *ptdev, + const struct pt_reg_info_tbl *reg, + uint32_t valid_mask) +{ + uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + + return throughable_mask & valid_mask; +} + /* write byte size emulate register */ static int pt_byte_reg_write(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3447,14 +3456,13 @@ static int pt_byte_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint8_t writable_mask = 0; - uint8_t throughable_mask = 0; + uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3467,14 +3475,13 @@ static int pt_word_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3487,14 +3494,13 @@ static int pt_long_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); return 0; @@ -3507,7 +3513,7 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t wr_value = *value; /* modify emulate register */ @@ -3515,8 +3521,6 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - if (*value & PCI_COMMAND_DISABLE_INTx) { if (ptdev->msi_trans_en) @@ -3562,7 +3566,6 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; uint32_t new_addr, last_addr; @@ -3689,8 +3692,7 @@ static int pt_bar_reg_write(struct pt_dev *ptdev, exit: /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* After BAR reg update, we need to remap BAR*/ reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); @@ -3717,9 +3719,8 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PCIDevice *d = (PCIDevice *)&ptdev->dev; PCIIORegion *r; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; + uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint32_t r_size = 0; - uint32_t bar_emu_mask = 0; uint32_t bar_ro_mask = 0; r = &d->io_regions[PCI_ROM_SLOT]; @@ -3729,7 +3730,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, PT_GET_EMUL_SIZE(base->bar_flag, r_size); /* set emulate mask and read-only mask */ - bar_emu_mask = reg->emu_mask; bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; /* modify emulate register */ @@ -3749,7 +3749,6 @@ static int pt_exp_rom_bar_reg_write(struct pt_dev *ptdev, r->addr = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~bar_emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* After BAR reg update, we need to remap BAR*/ @@ -3774,7 +3773,7 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, struct pt_reg_info_tbl *reg = cfg_entry->reg; PCIDevice *d = &ptdev->dev; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); struct pt_pm_info *pm_state = ptdev->pm_state; uint16_t read_val = 0; @@ -3783,7 +3782,6 @@ static int pt_pmcsr_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, throughable_mask); @@ -3892,7 +3890,7 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; PCIDevice *pd = (PCIDevice *)ptdev; uint16_t val; @@ -3904,8 +3902,10 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; /* also emulate MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) + if (ptdev->msi_trans_en) { writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; + throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; + } cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* update the msi_info too */ ptdev->msi->flags |= cfg_entry->data & @@ -3913,10 +3913,6 @@ static int pt_msgctrl_reg_write(struct pt_dev *ptdev, /* create value for writing to I/O device register */ val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; - /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ - if (ptdev->msi_trans_en) - throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI */ @@ -3966,7 +3962,6 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* modify emulate register */ @@ -3976,8 +3971,7 @@ static int pt_msgaddr32_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_lo = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -3996,7 +3990,6 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t throughable_mask = 0; uint32_t old_addr = cfg_entry->data; /* check whether the type is 64 bit or not */ @@ -4014,8 +4007,7 @@ static int pt_msgaddr64_reg_write(struct pt_dev *ptdev, ptdev->msi->addr_hi = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_addr) @@ -4035,7 +4027,6 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; uint16_t old_data = cfg_entry->data; uint32_t flags = ptdev->msi->flags; uint32_t offset = reg->offset; @@ -4056,8 +4047,7 @@ static int pt_msgdata_reg_write(struct pt_dev *ptdev, ptdev->msi->data = cfg_entry->data; /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); + *value = PT_MERGE_VALUE(*value, dev_value, 0); /* update MSI */ if (cfg_entry->data != old_data) @@ -4076,7 +4066,7 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, { struct pt_reg_info_tbl *reg = cfg_entry->reg; uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; + uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); uint16_t old_ctrl = cfg_entry->data; /* modify emulate register */ @@ -4084,7 +4074,6 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev, cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); /* update MSI-X */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34qD-0001A9-Sg; Thu, 11 Jun 2015 15:56:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qC-00019I-Vo for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:29 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id CD/EE-05081-CAFA9755; Thu, 11 Jun 2015 15:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1434038185!8280711!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17800 invoked from network); 11 Jun 2015 15:56:26 -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; 11 Jun 2015 15:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34q9-00026P-Jj for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34q9-0003Yq-II for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:25 +0000 Date: Thu, 11 Jun 2015 15:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f43df9842e00898151a8689914f6d4e9cbc37bd2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 139c3f5..5d0dd39 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34qD-0001A9-Sg; Thu, 11 Jun 2015 15:56:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qC-00019I-Vo for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:29 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id CD/EE-05081-CAFA9755; Thu, 11 Jun 2015 15:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1434038185!8280711!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17800 invoked from network); 11 Jun 2015 15:56:26 -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; 11 Jun 2015 15:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34q9-00026P-Jj for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34q9-0003Yq-II for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:25 +0000 Date: Thu, 11 Jun 2015 15:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: mark all PCIe capability bits read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f43df9842e00898151a8689914f6d4e9cbc37bd2 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: mark all PCIe capability bits read-only xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- only to avoid unintended write-back (just a precaution, the field ought to be read-only in hardware). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/pass-through.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 139c3f5..5d0dd39 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .offset = PCI_EXP_DEVCAP, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x1FFCFFFF, + .ro_mask = 0xFFFFFFFF, .emu_mask = 0x10000000, .init = pt_common_reg_init, .u.dw.read = pt_long_reg_read, -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34qN-0001Dt-05; Thu, 11 Jun 2015 15:56:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qM-0001DZ-Ba for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:38 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 5D/E6-15949-5BFA9755; Thu, 11 Jun 2015 15:56:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1434038195!13560667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19413 invoked from network); 11 Jun 2015 15:56:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qJ-00026Z-PC for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34qJ-0003ZO-O6 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:35 +0000 Date: Thu, 11 Jun 2015 15:56:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd6d2d0599832a90f7265b13aa8bb8c3c4d3f7ce Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 5d0dd39..3bec1ef 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34qN-0001Dt-05; Thu, 11 Jun 2015 15:56:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qM-0001DZ-Ba for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:38 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 5D/E6-15949-5BFA9755; Thu, 11 Jun 2015 15:56:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1434038195!13560667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19413 invoked from network); 11 Jun 2015 15:56:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qJ-00026Z-PC for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34qJ-0003ZO-O6 for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:35 +0000 Date: Thu, 11 Jun 2015 15:56:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: mark reserved bits in PCI config space fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd6d2d0599832a90f7265b13aa8bb8c3c4d3f7ce Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: mark reserved bits in PCI config space fields The adjustments are solely to make the subsequent patches work right (and hence make the patch set consistent), namely if permissive mode (introduced by the last patch) gets used (as both reserved registers and reserved fields must be similarly protected from guest access in default mode, but the guest should be allowed access to them in permissive mode). This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 17 +++++++++++------ hw/pass-through.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 5d0dd39..3bec1ef 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_COMMAND, .size = 2, .init_val = 0x0000, - .ro_mask = 0xF880, + .res_mask = 0xF880, .emu_mask = 0x0743, .init = pt_common_reg_init, .u.w.read = pt_word_reg_read, @@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .offset = PCI_STATUS, .size = 2, .init_val = 0x0000, - .ro_mask = 0x06FF, + .res_mask = 0x0007, + .ro_mask = 0x06F8, .emu_mask = 0x0010, .init = pt_status_reg_init, .u.w.read = pt_word_reg_read, @@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x8100, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg_pm_tbl[] = { .offset = PCI_PM_CTRL, .size = 2, .init_val = 0x0008, - .ro_mask = 0xE1FC, + .res_mask = 0x00F0, + .ro_mask = 0xE10C, .emu_mask = 0x810B, .init = pt_pmcsr_reg_init, .u.w.read = pt_word_reg_read, @@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msi_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0xFF8E, + .res_mask = 0xFE00, + .ro_mask = 0x018E, .emu_mask = 0x017E, .init = pt_msgctrl_reg_init, .u.w.read = pt_word_reg_read, @@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg_msix_tbl[] = { .offset = PCI_MSI_FLAGS, // 2 .size = 2, .init_val = 0x0000, - .ro_mask = 0x3FFF, + .res_mask = 0x3800, + .ro_mask = 0x07FF, .emu_mask = 0x0000, .init = pt_msixctrl_reg_init, .u.w.read = pt_word_reg_read, diff --git a/hw/pass-through.h b/hw/pass-through.h index 5adc12d..ab27725 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -374,6 +374,8 @@ struct pt_reg_info_tbl { uint32_t size; /* reg initial value */ uint32_t init_val; + /* reg reserved field mask (ON:reserved, OFF:defined) */ + uint32_t res_mask; /* reg read only field mask (ON:RO/ROS, OFF:other) */ uint32_t ro_mask; /* reg emulate field mask (ON:emu, OFF:passthrough) */ -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34qa-0001J6-37; Thu, 11 Jun 2015 15:56:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qY-0001IF-If for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:50 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id BD/9D-21074-0CFA9755; Thu, 11 Jun 2015 15:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434038206!13565102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21555 invoked from network); 11 Jun 2015 15:56:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qT-00026h-UE for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34qT-0003Zs-Ss for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:45 +0000 Date: Thu, 11 Jun 2015 15:56:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1ea61a5a1e5eac3184b80b4441a9ae6227a5241 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 3bec1ef..152f8a1 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:56:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:56: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 1Z34qa-0001J6-37; Thu, 11 Jun 2015 15:56:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qY-0001IF-If for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:50 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id BD/9D-21074-0CFA9755; Thu, 11 Jun 2015 15:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434038206!13565102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21555 invoked from network); 11 Jun 2015 15:56:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jun 2015 15:56:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qT-00026h-UE for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34qT-0003Zs-Ss for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:45 +0000 Date: Thu, 11 Jun 2015 15:56:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: add a few PCI config space field descriptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1ea61a5a1e5eac3184b80b4441a9ae6227a5241 Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: add a few PCI config space field descriptions Since the next patch will turn all not explicitly described fields read-only by default, those fields that have guest writable bits need to be given explicit descriptors. This is a preparatory patch for XSA-131. Signed-off-by: Jan Beulich --- hw/pass-through.c | 31 +++++++++++++++++++++++++++++++ hw/pass-through.h | 8 ++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 3bec1ef..152f8a1 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg_vpd_tbl[] = { .u.b.restore = NULL, }, { + .offset = PCI_VPD_ADDR, + .size = 2, + .ro_mask = 0x0003, + .emu_mask = 0x0003, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, + { .size = 0, }, }; @@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Device Status reg */ + { + .offset = PCI_EXP_DEVSTA, + .size = 2, + .res_mask = 0xFFC0, + .ro_mask = 0x0030, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Link Control reg */ { .offset = PCI_EXP_LNKCTL, @@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg_pcie_tbl[] = { .u.w.write = pt_word_reg_write, .u.w.restore = pt_word_reg_restore, }, + /* Link Status reg */ + { + .offset = PCI_EXP_LNKSTA, + .size = 2, + .ro_mask = 0x3FFF, + .init = pt_common_reg_init, + .u.w.read = pt_word_reg_read, + .u.w.write = pt_word_reg_write, + .u.w.restore = pt_word_reg_restore, + }, /* Device Control 2 reg */ { .offset = 0x28, diff --git a/hw/pass-through.h b/hw/pass-through.h index ab27725..95d033b 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -105,6 +105,14 @@ #define PCI_EXP_TYPE_ROOT_EC 0xa #endif +#ifndef PCI_VPD_ADDR +/* Vital Product Data */ +#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ +#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ +#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ +#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ +#endif + #ifndef PCI_ERR_UNCOR_MASK /* Uncorrectable Error Mask */ #define PCI_ERR_UNCOR_MASK 8 -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:57:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:57: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 1Z34qi-0001MH-DP; Thu, 11 Jun 2015 15:57:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qh-0001LZ-0E for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:59 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 3F/2F-32733-ACFA9755; Thu, 11 Jun 2015 15:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434038216!22523669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12153 invoked from network); 11 Jun 2015 15:56:57 -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; 11 Jun 2015 15:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qe-00026q-3y for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34qe-0003aE-2Y for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:56 +0000 Date: Thu, 11 Jun 2015 15:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1259e092ee27f444f683f0d76a13a8a72d3f26cb Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 152f8a1..9725ecd 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4314,7 +4344,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4358,6 +4388,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4395,6 +4427,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 11 15:57:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jun 2015 15:57: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 1Z34qi-0001MH-DP; Thu, 11 Jun 2015 15:57:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qh-0001LZ-0E for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:59 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 3F/2F-32733-ACFA9755; Thu, 11 Jun 2015 15:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434038216!22523669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12153 invoked from network); 11 Jun 2015 15:56:57 -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; 11 Jun 2015 15:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34qe-00026q-3y for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z34qe-0003aE-2Y for xen-changelog@lists.xensource.com; Thu, 11 Jun 2015 15:56:56 +0000 Date: Thu, 11 Jun 2015 15:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen/pt: unknown PCI config space fields should be read-only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1259e092ee27f444f683f0d76a13a8a72d3f26cb Author: Jan Beulich AuthorDate: Wed Jun 10 14:17:55 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:17:55 2015 +0100 xen/pt: unknown PCI config space fields should be read-only ... by default. Add a per-device "permissive" mode similar to pciback's to allow restoring previous behavior (and hence break security again, i.e. should be used only for trusted guests). This is part of XSA-131. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD ) --- hw/pass-through.c | 47 ++++++++++++++++++++++++++++++++++++++++------- hw/pass-through.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 152f8a1..9725ecd 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, uint32_t find_addr = address; uint32_t real_offset = 0; uint32_t valid_mask = 0xFFFFFFFF; - uint32_t read_val = 0, wb_mask; + uint32_t read_val = 0, wb_mask, wp_mask; uint8_t *ptr_val = NULL; int emul_len = 0; - int index = 0; + int index = 0, wp_flag = 0; int ret = 0; #ifdef PT_DEBUG_PCI_CONFIG_ACCESS @@ -1693,7 +1693,14 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* pass directly to libpci for passthrough type register group */ if (reg_grp_entry == NULL) + { + if (!assigned_device->permissive) + { + wb_mask = 0; + wp_flag = 1; + } goto out; + } /* adjust the read and write value to appropriate CFC-CFF window */ read_val <<= ((address & 3) << 3); @@ -1712,11 +1719,12 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); valid_mask <<= ((find_addr - real_offset) << 3); ptr_val = ((uint8_t *)&val + (real_offset & 3)); - if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { - wb_mask &= ~((reg->emu_mask - >> ((find_addr - real_offset) << 3)) + wp_mask = reg->emu_mask | reg->ro_mask; + if (!assigned_device->permissive) + wp_mask |= reg->res_mask; + if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) + wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) << ((len - emul_len) << 3)); - } /* do emulation depend on register size */ switch (reg->size) { @@ -1765,6 +1773,16 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, /* nothing to do with passthrough type register, * continue to find next byte */ + if (!assigned_device->permissive) + { + wb_mask &= ~(0xff << ((len - emul_len) << 3)); + /* Unused BARs will make it here, but we don't want to issue + * warnings for writes to them (bogus writes get dealt with + * above). + */ + if (index < 0) + wp_flag = 1; + } emul_len--; find_addr++; } @@ -1774,6 +1792,15 @@ static void pt_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, val >>= ((address & 3) << 3); out: + if (wp_flag && !assigned_device->permissive_warned) + { + assigned_device->permissive_warned = 1; + PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", + addr, len * 2, wb_mask); + PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", + pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); + } for (index = 0; wb_mask; index += len) { /* unknown regs are passed through */ while (!(wb_mask & 0xff)) { @@ -3482,6 +3509,9 @@ static uint32_t get_throughable_mask(const struct pt_dev *ptdev, { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); + if (!ptdev->permissive) + throughable_mask &= ~reg->res_mask; + return throughable_mask & valid_mask; } @@ -4314,7 +4344,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, uint8_t e_device, e_intx; uint16_t cmd = 0; char *key, *val; - int msi_translate, power_mgmt; + int msi_translate, power_mgmt, permissive = 0; PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", r_bus, r_dev, r_func); @@ -4358,6 +4388,8 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, else PT_LOG("Error: unrecognized value for msitranslate=\n"); } + else if (strcmp(key, "permissive") == 0) + permissive = 1; else if (strcmp(key, "power_mgmt") == 0) { if (strcmp(val, "0") == 0) @@ -4395,6 +4427,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->msi_trans_cap = msi_translate; assigned_device->power_mgmt = power_mgmt; assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); + assigned_device->permissive = permissive; pt_iomul_init(assigned_device, r_bus, r_dev, r_func); /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ diff --git a/hw/pass-through.h b/hw/pass-through.h index 95d033b..bb6ddce 100644 --- a/hw/pass-through.h +++ b/hw/pass-through.h @@ -248,6 +248,8 @@ struct pt_dev { unsigned power_mgmt:1; struct pt_pm_info *pm_state; /* PM virtualization */ unsigned is_virtfn:1; + unsigned permissive:1; + unsigned permissive_warned:1; /* io port multiplexing */ #define PCI_IOMUL_INVALID_FD (-1) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-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 Jun 12 02:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:22: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 1Z3Ebf-0004DL-8X; Fri, 12 Jun 2015 02:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebd-0004DF-PO for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:05 +0000 Content-Length: 1701 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 10/FE-03895-D424A755; Fri, 12 Jun 2015 02:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434075723!13075518!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15724 invoked from network); 12 Jun 2015 02:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jun 2015 02:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebb-00008r-7T for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ebb-0003Zb-2l for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:03 +0000 Date: Fri, 12 Jun 2015 02:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arinc653: don't leak hypervisor stack contents through XEN_SYSCTL_SCHEDOP_getinfo X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3487493979895812040==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3487493979895812040== Content-Length: 1280 Content-Transfer-Encoding: quoted-printable commit e0e3b8f64730f3ee167d29aa5ab18902fba4f416 Author: Jan Beulich AuthorDate: Tue Jun 9 15:54:53 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:54:53 2015 +0200 arinc653: don't leak hypervisor stack contents through XEN_SYSCTL_SCHEDOP_getinfo Note that due to XSA-77 this is not a security issue. Reported-by: "=E6=A0=BE=E5=B0=9A=E8=81=AA(=E5=A5=BD=E9=A3=8E)" Signed-off-by: Jan Beulich Acked-by Robert VanVossen --- xen/common/sched_arinc653.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 819b869..cff5da9 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -705,6 +705,7 @@ a653sched_adjust_global(const struct scheduler *ops, rc =3D arinc653_sched_set(ops, &local_sched); break; case XEN_SYSCTL_SCHEDOP_getinfo: + memset(&local_sched, -1, sizeof(local_sched)); rc =3D arinc653_sched_get(ops, &local_sched); if ( rc ) break; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3487493979895812040== 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 --===============3487493979895812040==-- From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:22: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 1Z3Ebf-0004DL-8X; Fri, 12 Jun 2015 02:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebd-0004DF-PO for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:05 +0000 Content-Length: 1701 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 10/FE-03895-D424A755; Fri, 12 Jun 2015 02:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434075723!13075518!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15724 invoked from network); 12 Jun 2015 02:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jun 2015 02:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebb-00008r-7T for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ebb-0003Zb-2l for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:03 +0000 Date: Fri, 12 Jun 2015 02:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arinc653: don't leak hypervisor stack contents through XEN_SYSCTL_SCHEDOP_getinfo X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3487493979895812040==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3487493979895812040== Content-Length: 1280 Content-Transfer-Encoding: quoted-printable commit e0e3b8f64730f3ee167d29aa5ab18902fba4f416 Author: Jan Beulich AuthorDate: Tue Jun 9 15:54:53 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:54:53 2015 +0200 arinc653: don't leak hypervisor stack contents through XEN_SYSCTL_SCHEDOP_getinfo Note that due to XSA-77 this is not a security issue. Reported-by: "=E6=A0=BE=E5=B0=9A=E8=81=AA(=E5=A5=BD=E9=A3=8E)" Signed-off-by: Jan Beulich Acked-by Robert VanVossen --- xen/common/sched_arinc653.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 819b869..cff5da9 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -705,6 +705,7 @@ a653sched_adjust_global(const struct scheduler *ops, rc =3D arinc653_sched_set(ops, &local_sched); break; case XEN_SYSCTL_SCHEDOP_getinfo: + memset(&local_sched, -1, sizeof(local_sched)); rc =3D arinc653_sched_get(ops, &local_sched); if ( rc ) break; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3487493979895812040== 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 --===============3487493979895812040==-- From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ebq-0004EN-BQ; Fri, 12 Jun 2015 02:22:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebo-0004ED-Gq for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D5/7C-32733-7524A755; Fri, 12 Jun 2015 02:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1434075734!22582654!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5442 invoked from network); 12 Jun 2015 02:22:14 -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; 12 Jun 2015 02:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebl-00008v-Pi for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ebl-0003am-HO for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:13 +0000 Date: Fri, 12 Jun 2015 02:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make do_sched_op_compat() x86-specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6041a60e162b6e8ad9687aa8932dabc332df1897 Author: Jan Beulich AuthorDate: Tue Jun 9 15:56:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:56:03 2015 +0200 make do_sched_op_compat() x86-specific Being a pre-3.1 compatibility hypercall handler only, it's not needed on ARM or any future architectures Xen may get ported to. Also the function shouldn't really be used internally - its use should be limited to its purpose (and hence there's also no need for a prototype). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/compat.c | 25 ++++++++++++++++++++++++- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/hvm/svm/svm.c | 4 ++-- xen/arch/x86/hvm/viridian.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/common/schedule.c | 33 --------------------------------- xen/include/xen/hypercall.h | 5 ----- 7 files changed, 31 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/compat.c b/xen/arch/x86/compat.c index 2d05867..2d4be2e 100644 --- a/xen/arch/x86/compat.c +++ b/xen/arch/x86/compat.c @@ -5,9 +5,10 @@ * hypercall after doing necessary argument munging. */ -#include #include #include +#include +#include #ifndef COMPAT typedef long ret_t; @@ -26,6 +27,28 @@ ret_t do_physdev_op_compat(XEN_GUEST_HANDLE(physdev_op_t) uop) #ifndef COMPAT +/* Legacy hypercall (as of 0x00030101). */ +long do_sched_op_compat(int cmd, unsigned long arg) +{ + switch ( cmd ) + { + case SCHEDOP_yield: + case SCHEDOP_block: + return do_sched_op(cmd, guest_handle_from_ptr(NULL, void)); + + case SCHEDOP_shutdown: + TRACE_3D(TRC_SCHED_SHUTDOWN, + current->domain->domain_id, current->vcpu_id, arg); + domain_shutdown(current->domain, (u8)arg); + break; + + default: + return -ENOSYS; + } + + return 0; +} + /* Legacy hypercall (as of 0x00030202). */ long do_event_channel_op_compat(XEN_GUEST_HANDLE_PARAM(evtchn_op_t) uop) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f354cb7..1c3e75a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2705,7 +2705,7 @@ void hvm_hlt(unsigned long rflags) if ( unlikely(!(rflags & X86_EFLAGS_IF)) ) return hvm_vcpu_down(curr); - do_sched_op_compat(SCHEDOP_block, 0); + do_sched_op(SCHEDOP_block, guest_handle_from_ptr(NULL, void)); HVMTRACE_1D(HLT, /* pending = */ vcpu_runnable(curr)); } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 6734fb6..a02f983 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -1988,7 +1988,7 @@ static void svm_vmexit_do_pause(struct cpu_user_regs *regs) * Do something useful, like reschedule the guest */ perfc_incr(pauseloop_exits); - do_sched_op_compat(SCHEDOP_yield, 0); + do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); } static void diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 1e5a570..2f22783 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -561,7 +562,7 @@ int viridian_hypercall(struct cpu_user_regs *regs) { case HvNotifyLongSpinWait: perfc_incr(mshv_call_long_wait); - do_sched_op_compat(SCHEDOP_yield, 0); + do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); status = HV_STATUS_SUCCESS; break; default: diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index af257db..0837627 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -3198,7 +3198,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_PAUSE_INSTRUCTION: perfc_incr(pauseloop_exits); - do_sched_op_compat(SCHEDOP_yield, 0); + do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); break; case EXIT_REASON_XSETBV: diff --git a/xen/common/schedule.c b/xen/common/schedule.c index f5a2e55..6b02f98 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -882,39 +882,6 @@ void watchdog_domain_destroy(struct domain *d) kill_timer(&d->watchdog_timer[i]); } -long do_sched_op_compat(int cmd, unsigned long arg) -{ - long ret = 0; - - switch ( cmd ) - { - case SCHEDOP_yield: - { - ret = vcpu_yield(); - break; - } - - case SCHEDOP_block: - { - vcpu_block_enable_events(); - break; - } - - case SCHEDOP_shutdown: - { - TRACE_3D(TRC_SCHED_SHUTDOWN, - current->domain->domain_id, current->vcpu_id, arg); - domain_shutdown(current->domain, (u8)arg); - break; - } - - default: - ret = -ENOSYS; - } - - return ret; -} - typedef long ret_t; #endif /* !COMPAT */ diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index eda8a36..79fe114 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -22,11 +22,6 @@ do_ni_hypercall( void); extern long -do_sched_op_compat( - int cmd, - unsigned long arg); - -extern long do_sched_op( int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ebq-0004EN-BQ; Fri, 12 Jun 2015 02:22:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebo-0004ED-Gq for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D5/7C-32733-7524A755; Fri, 12 Jun 2015 02:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1434075734!22582654!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5442 invoked from network); 12 Jun 2015 02:22:14 -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; 12 Jun 2015 02:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebl-00008v-Pi for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ebl-0003am-HO for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:13 +0000 Date: Fri, 12 Jun 2015 02:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make do_sched_op_compat() x86-specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6041a60e162b6e8ad9687aa8932dabc332df1897 Author: Jan Beulich AuthorDate: Tue Jun 9 15:56:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:56:03 2015 +0200 make do_sched_op_compat() x86-specific Being a pre-3.1 compatibility hypercall handler only, it's not needed on ARM or any future architectures Xen may get ported to. Also the function shouldn't really be used internally - its use should be limited to its purpose (and hence there's also no need for a prototype). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/compat.c | 25 ++++++++++++++++++++++++- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/hvm/svm/svm.c | 4 ++-- xen/arch/x86/hvm/viridian.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/common/schedule.c | 33 --------------------------------- xen/include/xen/hypercall.h | 5 ----- 7 files changed, 31 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/compat.c b/xen/arch/x86/compat.c index 2d05867..2d4be2e 100644 --- a/xen/arch/x86/compat.c +++ b/xen/arch/x86/compat.c @@ -5,9 +5,10 @@ * hypercall after doing necessary argument munging. */ -#include #include #include +#include +#include #ifndef COMPAT typedef long ret_t; @@ -26,6 +27,28 @@ ret_t do_physdev_op_compat(XEN_GUEST_HANDLE(physdev_op_t) uop) #ifndef COMPAT +/* Legacy hypercall (as of 0x00030101). */ +long do_sched_op_compat(int cmd, unsigned long arg) +{ + switch ( cmd ) + { + case SCHEDOP_yield: + case SCHEDOP_block: + return do_sched_op(cmd, guest_handle_from_ptr(NULL, void)); + + case SCHEDOP_shutdown: + TRACE_3D(TRC_SCHED_SHUTDOWN, + current->domain->domain_id, current->vcpu_id, arg); + domain_shutdown(current->domain, (u8)arg); + break; + + default: + return -ENOSYS; + } + + return 0; +} + /* Legacy hypercall (as of 0x00030202). */ long do_event_channel_op_compat(XEN_GUEST_HANDLE_PARAM(evtchn_op_t) uop) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f354cb7..1c3e75a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2705,7 +2705,7 @@ void hvm_hlt(unsigned long rflags) if ( unlikely(!(rflags & X86_EFLAGS_IF)) ) return hvm_vcpu_down(curr); - do_sched_op_compat(SCHEDOP_block, 0); + do_sched_op(SCHEDOP_block, guest_handle_from_ptr(NULL, void)); HVMTRACE_1D(HLT, /* pending = */ vcpu_runnable(curr)); } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 6734fb6..a02f983 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -1988,7 +1988,7 @@ static void svm_vmexit_do_pause(struct cpu_user_regs *regs) * Do something useful, like reschedule the guest */ perfc_incr(pauseloop_exits); - do_sched_op_compat(SCHEDOP_yield, 0); + do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); } static void diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 1e5a570..2f22783 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -561,7 +562,7 @@ int viridian_hypercall(struct cpu_user_regs *regs) { case HvNotifyLongSpinWait: perfc_incr(mshv_call_long_wait); - do_sched_op_compat(SCHEDOP_yield, 0); + do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); status = HV_STATUS_SUCCESS; break; default: diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index af257db..0837627 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -3198,7 +3198,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_PAUSE_INSTRUCTION: perfc_incr(pauseloop_exits); - do_sched_op_compat(SCHEDOP_yield, 0); + do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); break; case EXIT_REASON_XSETBV: diff --git a/xen/common/schedule.c b/xen/common/schedule.c index f5a2e55..6b02f98 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -882,39 +882,6 @@ void watchdog_domain_destroy(struct domain *d) kill_timer(&d->watchdog_timer[i]); } -long do_sched_op_compat(int cmd, unsigned long arg) -{ - long ret = 0; - - switch ( cmd ) - { - case SCHEDOP_yield: - { - ret = vcpu_yield(); - break; - } - - case SCHEDOP_block: - { - vcpu_block_enable_events(); - break; - } - - case SCHEDOP_shutdown: - { - TRACE_3D(TRC_SCHED_SHUTDOWN, - current->domain->domain_id, current->vcpu_id, arg); - domain_shutdown(current->domain, (u8)arg); - break; - } - - default: - ret = -ENOSYS; - } - - return ret; -} - typedef long ret_t; #endif /* !COMPAT */ diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index eda8a36..79fe114 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -22,11 +22,6 @@ do_ni_hypercall( void); extern long -do_sched_op_compat( - int cmd, - unsigned long arg); - -extern long do_sched_op( int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:22:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:22: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 1Z3Ec3-0004Fn-EW; Fri, 12 Jun 2015 02:22:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ec1-0004Fc-UP for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:30 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 79/31-21074-5624A755; Fri, 12 Jun 2015 02:22:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1434075744!10295508!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7711 invoked from network); 12 Jun 2015 02:22:25 -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; 12 Jun 2015 02:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebw-000093-4I for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ebw-0003bJ-1A for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:24 +0000 Date: Fri, 12 Jun 2015 02:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rangeset: "has" and "is" functions return boolean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c44d96190f2e9ec6306ae0327955fdf9b730730d Author: Jan Beulich AuthorDate: Tue Jun 9 15:57:26 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:57:26 2015 +0200 rangeset: "has" and "is" functions return boolean Additionally rangeset_is_empty()'s sole parameter can be const. Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- xen/common/rangeset.c | 14 +++++++------- xen/include/xen/rangeset.h | 12 +++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/xen/common/rangeset.c b/xen/common/rangeset.c index 116d5dc..3148ab7 100644 --- a/xen/common/rangeset.c +++ b/xen/common/rangeset.c @@ -248,11 +248,11 @@ int rangeset_remove_range( return rc; } -int rangeset_contains_range( +bool_t rangeset_contains_range( struct rangeset *r, unsigned long s, unsigned long e) { struct range *x; - int contains; + bool_t contains; ASSERT(s <= e); @@ -264,11 +264,11 @@ int rangeset_contains_range( return contains; } -int rangeset_overlaps_range( +bool_t rangeset_overlaps_range( struct rangeset *r, unsigned long s, unsigned long e) { struct range *x; - int overlaps; + bool_t overlaps; ASSERT(s <= e); @@ -310,14 +310,14 @@ int rangeset_remove_singleton( return rangeset_remove_range(r, s, s); } -int rangeset_contains_singleton( +bool_t rangeset_contains_singleton( struct rangeset *r, unsigned long s) { return rangeset_contains_range(r, s, s); } -int rangeset_is_empty( - struct rangeset *r) +bool_t rangeset_is_empty( + const struct rangeset *r) { return ((r == NULL) || list_empty(&r->range_list)); } diff --git a/xen/include/xen/rangeset.h b/xen/include/xen/rangeset.h index 5ed6817..aa64082 100644 --- a/xen/include/xen/rangeset.h +++ b/xen/include/xen/rangeset.h @@ -10,6 +10,8 @@ #ifndef __XEN_RANGESET_H__ #define __XEN_RANGESET_H__ +#include + struct domain; struct rangeset; @@ -50,17 +52,17 @@ void rangeset_limit( #define _RANGESETF_prettyprint_hex 0 #define RANGESETF_prettyprint_hex (1U << _RANGESETF_prettyprint_hex) -int __must_check rangeset_is_empty( - struct rangeset *r); +bool_t __must_check rangeset_is_empty( + const struct rangeset *r); /* Add/remove/query a numeric range. */ int __must_check rangeset_add_range( struct rangeset *r, unsigned long s, unsigned long e); int __must_check rangeset_remove_range( struct rangeset *r, unsigned long s, unsigned long e); -int __must_check rangeset_contains_range( +bool_t __must_check rangeset_contains_range( struct rangeset *r, unsigned long s, unsigned long e); -int __must_check rangeset_overlaps_range( +bool_t __must_check rangeset_overlaps_range( struct rangeset *r, unsigned long s, unsigned long e); int rangeset_report_ranges( struct rangeset *r, unsigned long s, unsigned long e, @@ -71,7 +73,7 @@ int __must_check rangeset_add_singleton( struct rangeset *r, unsigned long s); int __must_check rangeset_remove_singleton( struct rangeset *r, unsigned long s); -int __must_check rangeset_contains_singleton( +bool_t __must_check rangeset_contains_singleton( struct rangeset *r, unsigned long s); /* swap contents */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:22:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:22: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 1Z3Ec3-0004Fn-EW; Fri, 12 Jun 2015 02:22:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ec1-0004Fc-UP for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:30 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 79/31-21074-5624A755; Fri, 12 Jun 2015 02:22:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1434075744!10295508!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7711 invoked from network); 12 Jun 2015 02:22:25 -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; 12 Jun 2015 02:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ebw-000093-4I for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ebw-0003bJ-1A for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:24 +0000 Date: Fri, 12 Jun 2015 02:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rangeset: "has" and "is" functions return boolean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c44d96190f2e9ec6306ae0327955fdf9b730730d Author: Jan Beulich AuthorDate: Tue Jun 9 15:57:26 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:57:26 2015 +0200 rangeset: "has" and "is" functions return boolean Additionally rangeset_is_empty()'s sole parameter can be const. Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- xen/common/rangeset.c | 14 +++++++------- xen/include/xen/rangeset.h | 12 +++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/xen/common/rangeset.c b/xen/common/rangeset.c index 116d5dc..3148ab7 100644 --- a/xen/common/rangeset.c +++ b/xen/common/rangeset.c @@ -248,11 +248,11 @@ int rangeset_remove_range( return rc; } -int rangeset_contains_range( +bool_t rangeset_contains_range( struct rangeset *r, unsigned long s, unsigned long e) { struct range *x; - int contains; + bool_t contains; ASSERT(s <= e); @@ -264,11 +264,11 @@ int rangeset_contains_range( return contains; } -int rangeset_overlaps_range( +bool_t rangeset_overlaps_range( struct rangeset *r, unsigned long s, unsigned long e) { struct range *x; - int overlaps; + bool_t overlaps; ASSERT(s <= e); @@ -310,14 +310,14 @@ int rangeset_remove_singleton( return rangeset_remove_range(r, s, s); } -int rangeset_contains_singleton( +bool_t rangeset_contains_singleton( struct rangeset *r, unsigned long s) { return rangeset_contains_range(r, s, s); } -int rangeset_is_empty( - struct rangeset *r) +bool_t rangeset_is_empty( + const struct rangeset *r) { return ((r == NULL) || list_empty(&r->range_list)); } diff --git a/xen/include/xen/rangeset.h b/xen/include/xen/rangeset.h index 5ed6817..aa64082 100644 --- a/xen/include/xen/rangeset.h +++ b/xen/include/xen/rangeset.h @@ -10,6 +10,8 @@ #ifndef __XEN_RANGESET_H__ #define __XEN_RANGESET_H__ +#include + struct domain; struct rangeset; @@ -50,17 +52,17 @@ void rangeset_limit( #define _RANGESETF_prettyprint_hex 0 #define RANGESETF_prettyprint_hex (1U << _RANGESETF_prettyprint_hex) -int __must_check rangeset_is_empty( - struct rangeset *r); +bool_t __must_check rangeset_is_empty( + const struct rangeset *r); /* Add/remove/query a numeric range. */ int __must_check rangeset_add_range( struct rangeset *r, unsigned long s, unsigned long e); int __must_check rangeset_remove_range( struct rangeset *r, unsigned long s, unsigned long e); -int __must_check rangeset_contains_range( +bool_t __must_check rangeset_contains_range( struct rangeset *r, unsigned long s, unsigned long e); -int __must_check rangeset_overlaps_range( +bool_t __must_check rangeset_overlaps_range( struct rangeset *r, unsigned long s, unsigned long e); int rangeset_report_ranges( struct rangeset *r, unsigned long s, unsigned long e, @@ -71,7 +73,7 @@ int __must_check rangeset_add_singleton( struct rangeset *r, unsigned long s); int __must_check rangeset_remove_singleton( struct rangeset *r, unsigned long s); -int __must_check rangeset_contains_singleton( +bool_t __must_check rangeset_contains_singleton( struct rangeset *r, unsigned long s); /* swap contents */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3EcB-0004H1-Hd; Fri, 12 Jun 2015 02:22:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ec9-0004Go-UO for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:38 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 9D/79-13047-D624A755; Fri, 12 Jun 2015 02:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434075755!16486929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5498 invoked from network); 12 Jun 2015 02:22:35 -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; 12 Jun 2015 02:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ec6-00009B-NR for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ec6-0003bl-MI for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:34 +0000 Date: Fri, 12 Jun 2015 02:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: adjust PV I/O emulation functions' 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 85baced14dec2fafa9fe560969dba2ae28e8bebb Author: Jan Beulich AuthorDate: Tue Jun 9 15:59:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:59:31 2015 +0200 x86: adjust PV I/O emulation functions' types admin_io_okay(), guest_io_read(), and guest_io_write() all don't need their current "regs" parameter at all, and they don't use the vCPU passed to them for other than obtaining its domain. Drop the former and replace the latter by a struct domain pointer. pci_cfg_okay() returns a boolean type, and its "write" parameter is of boolean kind too. All of them get called for the current vCPU (and hence current domain) only, so name the domain parameters accordingly except in the admin_io_okay() case, which a subsequent patch will use for simplifying setup_io_bitmap(). Latch current->domain into a local variable in emulate_privileged_op(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 7 +-- xen/arch/x86/traps.c | 112 ++++++++++++++++++++---------------------- xen/include/asm-x86/traps.h | 4 +- 3 files changed, 58 insertions(+), 65 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1c3e75a..2736802 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -599,13 +599,12 @@ static int hvm_access_cf8( static int handle_pvh_io( int dir, uint32_t port, uint32_t bytes, uint32_t *val) { - struct vcpu *curr = current; - struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct domain *currd = current->domain; if ( dir == IOREQ_WRITE ) - guest_io_write(port, bytes, *val, curr, regs); + guest_io_write(port, bytes, *val, currd); else - *val = guest_io_read(port, bytes, curr, regs); + *val = guest_io_read(port, bytes, currd); return X86EMUL_OKAY; } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 080c0c1..bfa46ee 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1753,9 +1753,8 @@ static int guest_io_okay( } /* Has the administrator granted sufficient permission for this I/O access? */ -static int admin_io_okay( - unsigned int port, unsigned int bytes, - struct vcpu *v, struct cpu_user_regs *regs) +static bool_t admin_io_okay(unsigned int port, unsigned int bytes, + const struct domain *d) { /* * Port 0xcf8 (CONFIG_ADDRESS) is only visible for DWORD accesses. @@ -1768,17 +1767,18 @@ static int admin_io_okay( if ( ((port & ~1) == RTC_PORT(0)) ) return 0; - return ioports_access_permitted(v->domain, port, port + bytes - 1); + return ioports_access_permitted(d, port, port + bytes - 1); } -static int pci_cfg_ok(struct domain *d, int write, int size) +static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) { uint32_t machine_bdf; - uint16_t start, end; - if (!is_hardware_domain(d)) + unsigned int start; + + if ( !is_hardware_domain(currd) ) return 0; - machine_bdf = (d->arch.pci_cf8 >> 8) & 0xFFFF; + machine_bdf = (currd->arch.pci_cf8 >> 8) & 0xFFFF; if ( write ) { const unsigned long *ro_map = pci_get_ro_map(0); @@ -1786,9 +1786,9 @@ static int pci_cfg_ok(struct domain *d, int write, int size) if ( ro_map && test_bit(machine_bdf, ro_map) ) return 0; } - start = d->arch.pci_cf8 & 0xFF; + start = currd->arch.pci_cf8 & 0xFF; /* AMD extended configuration space access? */ - if ( (d->arch.pci_cf8 & 0x0F000000) && + if ( (currd->arch.pci_cf8 & 0x0F000000) && boot_cpu_data.x86_vendor == X86_VENDOR_AMD && boot_cpu_data.x86 >= 0x10 && boot_cpu_data.x86 <= 0x17 ) { @@ -1797,22 +1797,20 @@ static int pci_cfg_ok(struct domain *d, int write, int size) if ( rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) ) return 0; if ( msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT) ) - start |= (d->arch.pci_cf8 >> 16) & 0xF00; + start |= (currd->arch.pci_cf8 >> 16) & 0xF00; } - end = start + size - 1; - if (xsm_pci_config_permission(XSM_HOOK, d, machine_bdf, start, end, write)) - return 0; - return 1; + + return !xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, + start, start + size - 1, write); } -uint32_t guest_io_read( - unsigned int port, unsigned int bytes, - struct vcpu *v, struct cpu_user_regs *regs) +uint32_t guest_io_read(unsigned int port, unsigned int bytes, + struct domain *currd) { uint32_t data = 0; unsigned int shift = 0; - if ( admin_io_okay(port, bytes, v, regs) ) + if ( admin_io_okay(port, bytes, currd) ) { switch ( bytes ) { @@ -1833,31 +1831,30 @@ uint32_t guest_io_read( } else if ( (port == RTC_PORT(0)) ) { - sub_data = v->domain->arch.cmos_idx; + sub_data = currd->arch.cmos_idx; } else if ( (port == RTC_PORT(1)) && - ioports_access_permitted(v->domain, RTC_PORT(0), - RTC_PORT(1)) ) + ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { unsigned long flags; spin_lock_irqsave(&rtc_lock, flags); - outb(v->domain->arch.cmos_idx & 0x7f, RTC_PORT(0)); + outb(currd->arch.cmos_idx & 0x7f, RTC_PORT(0)); sub_data = inb(RTC_PORT(1)); spin_unlock_irqrestore(&rtc_lock, flags); } else if ( (port == 0xcf8) && (bytes == 4) ) { size = 4; - sub_data = v->domain->arch.pci_cf8; + sub_data = currd->arch.pci_cf8; } else if ( (port & 0xfffc) == 0xcfc ) { size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(v->domain, 0, size) ) - sub_data = pci_conf_read(v->domain->arch.pci_cf8, port & 3, size); + if ( pci_cfg_ok(currd, 0, size) ) + sub_data = pci_conf_read(currd->arch.pci_cf8, port & 3, size); } if ( size == 4 ) @@ -1872,11 +1869,10 @@ uint32_t guest_io_read( return data; } -void guest_io_write( - unsigned int port, unsigned int bytes, uint32_t data, - struct vcpu *v, struct cpu_user_regs *regs) +void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, + struct domain *currd) { - if ( admin_io_okay(port, bytes, v, regs) ) + if ( admin_io_okay(port, bytes, currd) ) { switch ( bytes ) { case 1: @@ -1904,33 +1900,32 @@ void guest_io_write( } else if ( (port == RTC_PORT(0)) ) { - v->domain->arch.cmos_idx = data; + currd->arch.cmos_idx = data; } else if ( (port == RTC_PORT(1)) && - ioports_access_permitted(v->domain, RTC_PORT(0), - RTC_PORT(1)) ) + ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { unsigned long flags; if ( pv_rtc_handler ) - pv_rtc_handler(v->domain->arch.cmos_idx & 0x7f, data); + pv_rtc_handler(currd->arch.cmos_idx & 0x7f, data); spin_lock_irqsave(&rtc_lock, flags); - outb(v->domain->arch.cmos_idx & 0x7f, RTC_PORT(0)); + outb(currd->arch.cmos_idx & 0x7f, RTC_PORT(0)); outb(data, RTC_PORT(1)); spin_unlock_irqrestore(&rtc_lock, flags); } else if ( (port == 0xcf8) && (bytes == 4) ) { size = 4; - v->domain->arch.pci_cf8 = data; + currd->arch.pci_cf8 = data; } else if ( (port & 0xfffc) == 0xcfc ) { size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(v->domain, 1, size) ) - pci_conf_write(v->domain->arch.pci_cf8, port & 3, size, data); + if ( pci_cfg_ok(currd, 1, size) ) + pci_conf_write(currd->arch.pci_cf8, port & 3, size, data); } if ( size == 4 ) @@ -1988,6 +1983,7 @@ static int is_cpufreq_controller(struct domain *d) static int emulate_privileged_op(struct cpu_user_regs *regs) { struct vcpu *v = current; + struct domain *currd = v->domain; unsigned long *reg, eip = regs->eip; u8 opcode, modrm_reg = 0, modrm_rm = 0, rep_prefix = 0, lock = 0, rex = 0; enum { lm_seg_none, lm_seg_fs, lm_seg_gs } lm_ovr = lm_seg_none; @@ -2144,7 +2140,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) (rd_ad(edi) > (data_limit - (op_bytes - 1))) || !guest_io_okay(port, op_bytes, v, regs) ) goto fail; - data = guest_io_read(port, op_bytes, v, regs); + data = guest_io_read(port, op_bytes, currd); if ( (rc = copy_to_user((void *)data_base + rd_ad(edi), &data, op_bytes)) != 0 ) { @@ -2170,7 +2166,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) + op_bytes - rc, 0); return EXCRET_fault_fixed; } - guest_io_write(port, op_bytes, data, v, regs); + guest_io_write(port, op_bytes, data, currd); wr_ad(esi, regs->esi + (int)((regs->eflags & X86_EFLAGS_DF) ? -op_bytes : op_bytes)); break; @@ -2231,7 +2227,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) exec_in: if ( !guest_io_okay(port, op_bytes, v, regs) ) goto fail; - if ( admin_io_okay(port, op_bytes, v, regs) ) + if ( admin_io_okay(port, op_bytes, currd) ) { mark_regs_dirty(regs); io_emul(regs); @@ -2242,7 +2238,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) regs->eax = 0; else regs->eax &= ~((1 << (op_bytes * 8)) - 1); - regs->eax |= guest_io_read(port, op_bytes, v, regs); + regs->eax |= guest_io_read(port, op_bytes, currd); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); goto done; @@ -2261,7 +2257,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) exec_out: if ( !guest_io_okay(port, op_bytes, v, regs) ) goto fail; - if ( admin_io_okay(port, op_bytes, v, regs) ) + if ( admin_io_okay(port, op_bytes, currd) ) { mark_regs_dirty(regs); io_emul(regs); @@ -2270,7 +2266,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) } else { - guest_io_write(port, op_bytes, regs->eax, v, regs); + guest_io_write(port, op_bytes, regs->eax, currd); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); goto done; @@ -2352,7 +2348,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case 0x09: /* WBINVD */ /* Ignore the instruction if unprivileged. */ - if ( !cache_flush_permitted(v->domain) ) + if ( !cache_flush_permitted(currd) ) /* Non-physdev domain attempted WBINVD; ignore for now since newer linux uses this in some start-of-day timing loops */ ; @@ -2385,8 +2381,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( !is_pv_32on64_vcpu(v) ) { mfn = pagetable_get_pfn(v->arch.guest_table); - *reg = xen_pfn_to_cr3(mfn_to_gmfn( - v->domain, mfn)); + *reg = xen_pfn_to_cr3(mfn_to_gmfn(currd, mfn)); } else { @@ -2395,8 +2390,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) mfn = l4e_get_pfn(*pl4e); unmap_domain_page(pl4e); - *reg = compat_pfn_to_cr3(mfn_to_gmfn( - v->domain, mfn)); + *reg = compat_pfn_to_cr3(mfn_to_gmfn(currd, mfn)); } /* PTs should not be shared */ BUG_ON(page_get_owner(mfn_to_page(mfn)) == dom_cow); @@ -2456,7 +2450,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) gfn = !is_pv_32on64_vcpu(v) ? xen_cr3_to_pfn(*reg) : compat_cr3_to_pfn(*reg); - page = get_page_from_gfn(v->domain, gfn, NULL, P2M_ALLOC); + page = get_page_from_gfn(currd, gfn, NULL, P2M_ALLOC); if ( page ) { rc = new_guest_cr3(page_to_mfn(page)); @@ -2540,7 +2534,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_K8_HWCR: if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) break; if ( wrmsr_safe(regs->ecx, msr_content) != 0 ) goto fail; @@ -2549,7 +2543,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD || boot_cpu_data.x86 < 0x10 || boot_cpu_data.x86 > 0x17 ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( (rdmsr_safe(MSR_AMD64_NB_CFG, val) != 0) || (eax != (uint32_t)val) || @@ -2562,7 +2556,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD || boot_cpu_data.x86 < 0x10 || boot_cpu_data.x86 > 0x17 ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( (rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, val) != 0) ) goto fail; @@ -2582,7 +2576,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_IA32_UCODE_REV: if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( rdmsr_safe(regs->ecx, val) ) goto fail; @@ -2601,7 +2595,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if (( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) && ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) break; if ( wrmsr_safe(regs->ecx, msr_content ) != 0 ) goto fail; @@ -2609,7 +2603,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_IA32_PERF_CTL: if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) break; if ( wrmsr_safe(regs->ecx, msr_content) != 0 ) goto fail; @@ -2618,7 +2612,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_IA32_ENERGY_PERF_BIAS: if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( wrmsr_safe(regs->ecx, msr_content) != 0 ) goto fail; @@ -2664,7 +2658,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( (v->arch.pv_vcpu.ctrlreg[4] & X86_CR4_TSD) && !guest_kernel_mode(v, regs) ) goto fail; - if ( v->domain->arch.vtsc ) + if ( currd->arch.vtsc ) pv_soft_rdtsc(v, regs, 0); else { @@ -2707,7 +2701,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_K8_PSTATE7: if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) { regs->eax = regs->edx = 0; break; diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h index ebb6378..035114d 100644 --- a/xen/include/asm-x86/traps.h +++ b/xen/include/asm-x86/traps.h @@ -48,8 +48,8 @@ extern int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr); uint32_t guest_io_read(unsigned int port, unsigned int bytes, - struct vcpu *, struct cpu_user_regs *); + struct domain *); void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, - struct vcpu *, struct cpu_user_regs *); + struct domain *); #endif /* ASM_TRAP_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3EcB-0004H1-Hd; Fri, 12 Jun 2015 02:22:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ec9-0004Go-UO for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:38 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 9D/79-13047-D624A755; Fri, 12 Jun 2015 02:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434075755!16486929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5498 invoked from network); 12 Jun 2015 02:22:35 -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; 12 Jun 2015 02:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ec6-00009B-NR for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ec6-0003bl-MI for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:34 +0000 Date: Fri, 12 Jun 2015 02:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: adjust PV I/O emulation functions' 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 85baced14dec2fafa9fe560969dba2ae28e8bebb Author: Jan Beulich AuthorDate: Tue Jun 9 15:59:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 15:59:31 2015 +0200 x86: adjust PV I/O emulation functions' types admin_io_okay(), guest_io_read(), and guest_io_write() all don't need their current "regs" parameter at all, and they don't use the vCPU passed to them for other than obtaining its domain. Drop the former and replace the latter by a struct domain pointer. pci_cfg_okay() returns a boolean type, and its "write" parameter is of boolean kind too. All of them get called for the current vCPU (and hence current domain) only, so name the domain parameters accordingly except in the admin_io_okay() case, which a subsequent patch will use for simplifying setup_io_bitmap(). Latch current->domain into a local variable in emulate_privileged_op(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 7 +-- xen/arch/x86/traps.c | 112 ++++++++++++++++++++---------------------- xen/include/asm-x86/traps.h | 4 +- 3 files changed, 58 insertions(+), 65 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1c3e75a..2736802 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -599,13 +599,12 @@ static int hvm_access_cf8( static int handle_pvh_io( int dir, uint32_t port, uint32_t bytes, uint32_t *val) { - struct vcpu *curr = current; - struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct domain *currd = current->domain; if ( dir == IOREQ_WRITE ) - guest_io_write(port, bytes, *val, curr, regs); + guest_io_write(port, bytes, *val, currd); else - *val = guest_io_read(port, bytes, curr, regs); + *val = guest_io_read(port, bytes, currd); return X86EMUL_OKAY; } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 080c0c1..bfa46ee 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1753,9 +1753,8 @@ static int guest_io_okay( } /* Has the administrator granted sufficient permission for this I/O access? */ -static int admin_io_okay( - unsigned int port, unsigned int bytes, - struct vcpu *v, struct cpu_user_regs *regs) +static bool_t admin_io_okay(unsigned int port, unsigned int bytes, + const struct domain *d) { /* * Port 0xcf8 (CONFIG_ADDRESS) is only visible for DWORD accesses. @@ -1768,17 +1767,18 @@ static int admin_io_okay( if ( ((port & ~1) == RTC_PORT(0)) ) return 0; - return ioports_access_permitted(v->domain, port, port + bytes - 1); + return ioports_access_permitted(d, port, port + bytes - 1); } -static int pci_cfg_ok(struct domain *d, int write, int size) +static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) { uint32_t machine_bdf; - uint16_t start, end; - if (!is_hardware_domain(d)) + unsigned int start; + + if ( !is_hardware_domain(currd) ) return 0; - machine_bdf = (d->arch.pci_cf8 >> 8) & 0xFFFF; + machine_bdf = (currd->arch.pci_cf8 >> 8) & 0xFFFF; if ( write ) { const unsigned long *ro_map = pci_get_ro_map(0); @@ -1786,9 +1786,9 @@ static int pci_cfg_ok(struct domain *d, int write, int size) if ( ro_map && test_bit(machine_bdf, ro_map) ) return 0; } - start = d->arch.pci_cf8 & 0xFF; + start = currd->arch.pci_cf8 & 0xFF; /* AMD extended configuration space access? */ - if ( (d->arch.pci_cf8 & 0x0F000000) && + if ( (currd->arch.pci_cf8 & 0x0F000000) && boot_cpu_data.x86_vendor == X86_VENDOR_AMD && boot_cpu_data.x86 >= 0x10 && boot_cpu_data.x86 <= 0x17 ) { @@ -1797,22 +1797,20 @@ static int pci_cfg_ok(struct domain *d, int write, int size) if ( rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) ) return 0; if ( msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT) ) - start |= (d->arch.pci_cf8 >> 16) & 0xF00; + start |= (currd->arch.pci_cf8 >> 16) & 0xF00; } - end = start + size - 1; - if (xsm_pci_config_permission(XSM_HOOK, d, machine_bdf, start, end, write)) - return 0; - return 1; + + return !xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, + start, start + size - 1, write); } -uint32_t guest_io_read( - unsigned int port, unsigned int bytes, - struct vcpu *v, struct cpu_user_regs *regs) +uint32_t guest_io_read(unsigned int port, unsigned int bytes, + struct domain *currd) { uint32_t data = 0; unsigned int shift = 0; - if ( admin_io_okay(port, bytes, v, regs) ) + if ( admin_io_okay(port, bytes, currd) ) { switch ( bytes ) { @@ -1833,31 +1831,30 @@ uint32_t guest_io_read( } else if ( (port == RTC_PORT(0)) ) { - sub_data = v->domain->arch.cmos_idx; + sub_data = currd->arch.cmos_idx; } else if ( (port == RTC_PORT(1)) && - ioports_access_permitted(v->domain, RTC_PORT(0), - RTC_PORT(1)) ) + ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { unsigned long flags; spin_lock_irqsave(&rtc_lock, flags); - outb(v->domain->arch.cmos_idx & 0x7f, RTC_PORT(0)); + outb(currd->arch.cmos_idx & 0x7f, RTC_PORT(0)); sub_data = inb(RTC_PORT(1)); spin_unlock_irqrestore(&rtc_lock, flags); } else if ( (port == 0xcf8) && (bytes == 4) ) { size = 4; - sub_data = v->domain->arch.pci_cf8; + sub_data = currd->arch.pci_cf8; } else if ( (port & 0xfffc) == 0xcfc ) { size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(v->domain, 0, size) ) - sub_data = pci_conf_read(v->domain->arch.pci_cf8, port & 3, size); + if ( pci_cfg_ok(currd, 0, size) ) + sub_data = pci_conf_read(currd->arch.pci_cf8, port & 3, size); } if ( size == 4 ) @@ -1872,11 +1869,10 @@ uint32_t guest_io_read( return data; } -void guest_io_write( - unsigned int port, unsigned int bytes, uint32_t data, - struct vcpu *v, struct cpu_user_regs *regs) +void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, + struct domain *currd) { - if ( admin_io_okay(port, bytes, v, regs) ) + if ( admin_io_okay(port, bytes, currd) ) { switch ( bytes ) { case 1: @@ -1904,33 +1900,32 @@ void guest_io_write( } else if ( (port == RTC_PORT(0)) ) { - v->domain->arch.cmos_idx = data; + currd->arch.cmos_idx = data; } else if ( (port == RTC_PORT(1)) && - ioports_access_permitted(v->domain, RTC_PORT(0), - RTC_PORT(1)) ) + ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { unsigned long flags; if ( pv_rtc_handler ) - pv_rtc_handler(v->domain->arch.cmos_idx & 0x7f, data); + pv_rtc_handler(currd->arch.cmos_idx & 0x7f, data); spin_lock_irqsave(&rtc_lock, flags); - outb(v->domain->arch.cmos_idx & 0x7f, RTC_PORT(0)); + outb(currd->arch.cmos_idx & 0x7f, RTC_PORT(0)); outb(data, RTC_PORT(1)); spin_unlock_irqrestore(&rtc_lock, flags); } else if ( (port == 0xcf8) && (bytes == 4) ) { size = 4; - v->domain->arch.pci_cf8 = data; + currd->arch.pci_cf8 = data; } else if ( (port & 0xfffc) == 0xcfc ) { size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(v->domain, 1, size) ) - pci_conf_write(v->domain->arch.pci_cf8, port & 3, size, data); + if ( pci_cfg_ok(currd, 1, size) ) + pci_conf_write(currd->arch.pci_cf8, port & 3, size, data); } if ( size == 4 ) @@ -1988,6 +1983,7 @@ static int is_cpufreq_controller(struct domain *d) static int emulate_privileged_op(struct cpu_user_regs *regs) { struct vcpu *v = current; + struct domain *currd = v->domain; unsigned long *reg, eip = regs->eip; u8 opcode, modrm_reg = 0, modrm_rm = 0, rep_prefix = 0, lock = 0, rex = 0; enum { lm_seg_none, lm_seg_fs, lm_seg_gs } lm_ovr = lm_seg_none; @@ -2144,7 +2140,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) (rd_ad(edi) > (data_limit - (op_bytes - 1))) || !guest_io_okay(port, op_bytes, v, regs) ) goto fail; - data = guest_io_read(port, op_bytes, v, regs); + data = guest_io_read(port, op_bytes, currd); if ( (rc = copy_to_user((void *)data_base + rd_ad(edi), &data, op_bytes)) != 0 ) { @@ -2170,7 +2166,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) + op_bytes - rc, 0); return EXCRET_fault_fixed; } - guest_io_write(port, op_bytes, data, v, regs); + guest_io_write(port, op_bytes, data, currd); wr_ad(esi, regs->esi + (int)((regs->eflags & X86_EFLAGS_DF) ? -op_bytes : op_bytes)); break; @@ -2231,7 +2227,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) exec_in: if ( !guest_io_okay(port, op_bytes, v, regs) ) goto fail; - if ( admin_io_okay(port, op_bytes, v, regs) ) + if ( admin_io_okay(port, op_bytes, currd) ) { mark_regs_dirty(regs); io_emul(regs); @@ -2242,7 +2238,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) regs->eax = 0; else regs->eax &= ~((1 << (op_bytes * 8)) - 1); - regs->eax |= guest_io_read(port, op_bytes, v, regs); + regs->eax |= guest_io_read(port, op_bytes, currd); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); goto done; @@ -2261,7 +2257,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) exec_out: if ( !guest_io_okay(port, op_bytes, v, regs) ) goto fail; - if ( admin_io_okay(port, op_bytes, v, regs) ) + if ( admin_io_okay(port, op_bytes, currd) ) { mark_regs_dirty(regs); io_emul(regs); @@ -2270,7 +2266,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) } else { - guest_io_write(port, op_bytes, regs->eax, v, regs); + guest_io_write(port, op_bytes, regs->eax, currd); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); goto done; @@ -2352,7 +2348,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case 0x09: /* WBINVD */ /* Ignore the instruction if unprivileged. */ - if ( !cache_flush_permitted(v->domain) ) + if ( !cache_flush_permitted(currd) ) /* Non-physdev domain attempted WBINVD; ignore for now since newer linux uses this in some start-of-day timing loops */ ; @@ -2385,8 +2381,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( !is_pv_32on64_vcpu(v) ) { mfn = pagetable_get_pfn(v->arch.guest_table); - *reg = xen_pfn_to_cr3(mfn_to_gmfn( - v->domain, mfn)); + *reg = xen_pfn_to_cr3(mfn_to_gmfn(currd, mfn)); } else { @@ -2395,8 +2390,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) mfn = l4e_get_pfn(*pl4e); unmap_domain_page(pl4e); - *reg = compat_pfn_to_cr3(mfn_to_gmfn( - v->domain, mfn)); + *reg = compat_pfn_to_cr3(mfn_to_gmfn(currd, mfn)); } /* PTs should not be shared */ BUG_ON(page_get_owner(mfn_to_page(mfn)) == dom_cow); @@ -2456,7 +2450,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) gfn = !is_pv_32on64_vcpu(v) ? xen_cr3_to_pfn(*reg) : compat_cr3_to_pfn(*reg); - page = get_page_from_gfn(v->domain, gfn, NULL, P2M_ALLOC); + page = get_page_from_gfn(currd, gfn, NULL, P2M_ALLOC); if ( page ) { rc = new_guest_cr3(page_to_mfn(page)); @@ -2540,7 +2534,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_K8_HWCR: if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) break; if ( wrmsr_safe(regs->ecx, msr_content) != 0 ) goto fail; @@ -2549,7 +2543,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD || boot_cpu_data.x86 < 0x10 || boot_cpu_data.x86 > 0x17 ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( (rdmsr_safe(MSR_AMD64_NB_CFG, val) != 0) || (eax != (uint32_t)val) || @@ -2562,7 +2556,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD || boot_cpu_data.x86 < 0x10 || boot_cpu_data.x86 > 0x17 ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( (rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, val) != 0) ) goto fail; @@ -2582,7 +2576,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_IA32_UCODE_REV: if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( rdmsr_safe(regs->ecx, val) ) goto fail; @@ -2601,7 +2595,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if (( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) && ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) break; if ( wrmsr_safe(regs->ecx, msr_content ) != 0 ) goto fail; @@ -2609,7 +2603,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_IA32_PERF_CTL: if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) break; if ( wrmsr_safe(regs->ecx, msr_content) != 0 ) goto fail; @@ -2618,7 +2612,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_IA32_ENERGY_PERF_BIAS: if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) goto fail; - if ( !is_hardware_domain(v->domain) || !is_pinned_vcpu(v) ) + if ( !is_hardware_domain(currd) || !is_pinned_vcpu(v) ) break; if ( wrmsr_safe(regs->ecx, msr_content) != 0 ) goto fail; @@ -2664,7 +2658,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( (v->arch.pv_vcpu.ctrlreg[4] & X86_CR4_TSD) && !guest_kernel_mode(v, regs) ) goto fail; - if ( v->domain->arch.vtsc ) + if ( currd->arch.vtsc ) pv_soft_rdtsc(v, regs, 0); else { @@ -2707,7 +2701,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_K8_PSTATE7: if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) goto fail; - if ( !is_cpufreq_controller(v->domain) ) + if ( !is_cpufreq_controller(currd) ) { regs->eax = regs->edx = 0; break; diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h index ebb6378..035114d 100644 --- a/xen/include/asm-x86/traps.h +++ b/xen/include/asm-x86/traps.h @@ -48,8 +48,8 @@ extern int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr); uint32_t guest_io_read(unsigned int port, unsigned int bytes, - struct vcpu *, struct cpu_user_regs *); + struct domain *); void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, - struct vcpu *, struct cpu_user_regs *); + struct domain *); #endif /* ASM_TRAP_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3EcL-0004J0-OY; Fri, 12 Jun 2015 02: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 1Z3EcJ-0004Ie-IX for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:47 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id C9/39-21300-6724A755; Fri, 12 Jun 2015 02:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1434075765!22582723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7153 invoked from network); 12 Jun 2015 02:22:46 -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; 12 Jun 2015 02:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EcH-00009H-0O for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EcG-0003cF-V3 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:44 +0000 Date: Fri, 12 Jun 2015 02:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: add more pages to v1 environment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cb57f4bddee1f11079e69bf43c193a8b104c476 Author: Jan Beulich AuthorDate: Tue Jun 9 16:00:24 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 16:00:24 2015 +0200 kexec: add more pages to v1 environment Destination pages need mappings to be added to the page tables in the v1 case (where nothing else calls machine_kexec_add_page() for them). Further, without the tools mapping the low 1Mb (expected by at least some Linux version), we need to do so in the hypervisor in the v1 case. Suggested-by: David Vrabel Signed-off-by: Jan Beulich Tested-by: Alan Robinson Reviewed-by: David Vrabel Reviewed-by: Andrew Cooper --- xen/common/kexec.c | 18 ++++++++++++++++++ xen/common/kimage.c | 5 +++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 3b4275e..1e4a667 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -1003,6 +1003,24 @@ static int kexec_do_load_v1(xen_kexec_load_v1_t *load, int compat) if ( ret < 0 ) goto error; + if ( arch == EM_386 || arch == EM_X86_64 ) + { + /* + * Ensure 0 - 1 MiB is mapped and accessible by the image. + * + * This allows access to VGA memory and the region purgatory copies + * in the crash case. + */ + unsigned long addr; + + for ( addr = 0; addr < MB(1); addr += PAGE_SIZE ) + { + ret = machine_kexec_add_page(kimage, addr, addr); + if ( ret < 0 ) + goto error; + } + } + ret = kexec_load_slot(kimage); if ( ret < 0 ) goto error; diff --git a/xen/common/kimage.c b/xen/common/kimage.c index 9b79a5e..8c4854d 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -923,6 +923,11 @@ int kimage_build_ind(struct kexec_image *image, unsigned long ind_mfn, ret = kimage_add_page(image, page_to_maddr(xen_page)); if ( ret < 0 ) goto done; + + ret = machine_kexec_add_page(image, dest, dest); + if ( ret < 0 ) + goto done; + dest += PAGE_SIZE; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3EcL-0004J0-OY; Fri, 12 Jun 2015 02: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 1Z3EcJ-0004Ie-IX for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:47 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id C9/39-21300-6724A755; Fri, 12 Jun 2015 02:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1434075765!22582723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7153 invoked from network); 12 Jun 2015 02:22:46 -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; 12 Jun 2015 02:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EcH-00009H-0O for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EcG-0003cF-V3 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:44 +0000 Date: Fri, 12 Jun 2015 02:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: add more pages to v1 environment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cb57f4bddee1f11079e69bf43c193a8b104c476 Author: Jan Beulich AuthorDate: Tue Jun 9 16:00:24 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 9 16:00:24 2015 +0200 kexec: add more pages to v1 environment Destination pages need mappings to be added to the page tables in the v1 case (where nothing else calls machine_kexec_add_page() for them). Further, without the tools mapping the low 1Mb (expected by at least some Linux version), we need to do so in the hypervisor in the v1 case. Suggested-by: David Vrabel Signed-off-by: Jan Beulich Tested-by: Alan Robinson Reviewed-by: David Vrabel Reviewed-by: Andrew Cooper --- xen/common/kexec.c | 18 ++++++++++++++++++ xen/common/kimage.c | 5 +++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 3b4275e..1e4a667 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -1003,6 +1003,24 @@ static int kexec_do_load_v1(xen_kexec_load_v1_t *load, int compat) if ( ret < 0 ) goto error; + if ( arch == EM_386 || arch == EM_X86_64 ) + { + /* + * Ensure 0 - 1 MiB is mapped and accessible by the image. + * + * This allows access to VGA memory and the region purgatory copies + * in the crash case. + */ + unsigned long addr; + + for ( addr = 0; addr < MB(1); addr += PAGE_SIZE ) + { + ret = machine_kexec_add_page(kimage, addr, addr); + if ( ret < 0 ) + goto error; + } + } + ret = kexec_load_slot(kimage); if ( ret < 0 ) goto error; diff --git a/xen/common/kimage.c b/xen/common/kimage.c index 9b79a5e..8c4854d 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -923,6 +923,11 @@ int kimage_build_ind(struct kexec_image *image, unsigned long ind_mfn, ret = kimage_add_page(image, page_to_maddr(xen_page)); if ( ret < 0 ) goto done; + + ret = machine_kexec_add_page(image, dest, dest); + if ( ret < 0 ) + goto done; + dest += PAGE_SIZE; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:22: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 1Z3EcU-0004KS-Ro; Fri, 12 Jun 2015 02:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EcU-0004KD-13 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:58 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 09/CB-01469-1824A755; Fri, 12 Jun 2015 02:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1434075775!22553834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13202 invoked from network); 12 Jun 2015 02:22:56 -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; 12 Jun 2015 02:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EcR-00009Q-BS for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EcR-0003cb-AP for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:55 +0000 Date: Fri, 12 Jun 2015 02:22:55 +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 7c9a93a013783a3344032445469d6b87e496aca4 Author: Ian Jackson AuthorDate: Tue Jun 9 16:21:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:21:43 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 052e17c..081a599 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 4de1422ea306832b6ef2cba34e9febb73dd139a7 -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TRADITIONAL_REVISION ?= 38609ae72b0a9e09b42be94f469fef928a1049fa +# Tue Jun 9 16:13:11 2015 +0100 +# ... by default. Add a per-device "permissive" mode similar to pciback's # 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. -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:22: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 1Z3EcU-0004KS-Ro; Fri, 12 Jun 2015 02:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EcU-0004KD-13 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:58 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 09/CB-01469-1824A755; Fri, 12 Jun 2015 02:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1434075775!22553834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13202 invoked from network); 12 Jun 2015 02:22:56 -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; 12 Jun 2015 02:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EcR-00009Q-BS for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EcR-0003cb-AP for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:22:55 +0000 Date: Fri, 12 Jun 2015 02:22:55 +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 7c9a93a013783a3344032445469d6b87e496aca4 Author: Ian Jackson AuthorDate: Tue Jun 9 16:21:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 9 16:21:43 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 052e17c..081a599 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 4de1422ea306832b6ef2cba34e9febb73dd139a7 -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TRADITIONAL_REVISION ?= 38609ae72b0a9e09b42be94f469fef928a1049fa +# Tue Jun 9 16:13:11 2015 +0100 +# ... by default. Add a per-device "permissive" mode similar to pciback's # 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. -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ecf-0004MH-Ud; Fri, 12 Jun 2015 02:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecf-0004M8-Ck for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:09 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 5A/BC-32733-C824A755; Fri, 12 Jun 2015 02:23:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434075786!22628510!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11568 invoked from network); 12 Jun 2015 02:23:06 -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; 12 Jun 2015 02:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecb-00009w-O1 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ecb-0003dA-LV for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:05 +0000 Date: Fri, 12 Jun 2015 02:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] efi: avoid calling boot services after ExitBootServices() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4300db3a03a0cd999745135d7879fc4b6b5aa61 Author: Ross Lagerwall AuthorDate: Wed Jun 10 11:57:18 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:00:10 2015 +0200 efi: avoid calling boot services after ExitBootServices() After the first call to ExitBootServices(), avoid calling any boot services (except GetMemoryMap() and ExitBootServices()) by setting setting efi_bs to NULL and halting in blexit(). Only GetMemoryMap() and ExitBootServices() are explicitly allowed to be called after the first call to ExitBootServices() and so are are called via SystemTable->BootServices. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 6 ++++++ xen/arch/x86/efi/efi-boot.h | 7 +++++++ xen/common/efi/boot.c | 13 ++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 3297f27..2a7aa13 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -6,6 +6,7 @@ #include #include #include +#include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); @@ -522,6 +523,11 @@ static void __init efi_arch_blexit(void) efi_bs->FreePool(memmap); } +static void __init efi_arch_halt(void) +{ + stop_cpu(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { if ( (unsigned long)loaded_image->ImageBase & ((1 << 12) - 1) ) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index cd14c19..9f41793 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -614,6 +614,13 @@ static void __init efi_arch_blexit(void) efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size)); } +static void __init efi_arch_halt(void) +{ + local_irq_disable(); + for ( ; ; ) + halt(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { xen_phys_start = (UINTN)loaded_image->ImageBase; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 60c1b8d..4b816f2 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -216,6 +216,9 @@ static void __init noreturn blexit(const CHAR16 *str) PrintStr((CHAR16 *)str); PrintStr(newline); + if ( !efi_bs ) + efi_arch_halt(); + if ( cfg.addr ) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); if ( kernel.addr ) @@ -1063,8 +1066,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for ( retry = 0; ; retry = 1 ) { efi_memmap_size = map_alloc_size; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); + status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, + efi_memmap, &map_key, + &efi_mdesc_size, + &mdesc_ver); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot obtain memory map", status); @@ -1073,7 +1078,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_pre_exit_boot(); - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = SystemTable->BootServices->ExitBootServices(ImageHandle, + map_key); + efi_bs = NULL; if ( status != EFI_INVALID_PARAMETER || retry ) break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ecf-0004MH-Ud; Fri, 12 Jun 2015 02:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecf-0004M8-Ck for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:09 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 5A/BC-32733-C824A755; Fri, 12 Jun 2015 02:23:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434075786!22628510!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11568 invoked from network); 12 Jun 2015 02:23:06 -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; 12 Jun 2015 02:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecb-00009w-O1 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ecb-0003dA-LV for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:05 +0000 Date: Fri, 12 Jun 2015 02:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] efi: avoid calling boot services after ExitBootServices() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4300db3a03a0cd999745135d7879fc4b6b5aa61 Author: Ross Lagerwall AuthorDate: Wed Jun 10 11:57:18 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:00:10 2015 +0200 efi: avoid calling boot services after ExitBootServices() After the first call to ExitBootServices(), avoid calling any boot services (except GetMemoryMap() and ExitBootServices()) by setting setting efi_bs to NULL and halting in blexit(). Only GetMemoryMap() and ExitBootServices() are explicitly allowed to be called after the first call to ExitBootServices() and so are are called via SystemTable->BootServices. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 6 ++++++ xen/arch/x86/efi/efi-boot.h | 7 +++++++ xen/common/efi/boot.c | 13 ++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 3297f27..2a7aa13 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -6,6 +6,7 @@ #include #include #include +#include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); @@ -522,6 +523,11 @@ static void __init efi_arch_blexit(void) efi_bs->FreePool(memmap); } +static void __init efi_arch_halt(void) +{ + stop_cpu(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { if ( (unsigned long)loaded_image->ImageBase & ((1 << 12) - 1) ) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index cd14c19..9f41793 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -614,6 +614,13 @@ static void __init efi_arch_blexit(void) efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size)); } +static void __init efi_arch_halt(void) +{ + local_irq_disable(); + for ( ; ; ) + halt(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { xen_phys_start = (UINTN)loaded_image->ImageBase; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 60c1b8d..4b816f2 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -216,6 +216,9 @@ static void __init noreturn blexit(const CHAR16 *str) PrintStr((CHAR16 *)str); PrintStr(newline); + if ( !efi_bs ) + efi_arch_halt(); + if ( cfg.addr ) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); if ( kernel.addr ) @@ -1063,8 +1066,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for ( retry = 0; ; retry = 1 ) { efi_memmap_size = map_alloc_size; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); + status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, + efi_memmap, &map_key, + &efi_mdesc_size, + &mdesc_ver); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot obtain memory map", status); @@ -1073,7 +1078,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_pre_exit_boot(); - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = SystemTable->BootServices->ExitBootServices(ImageHandle, + map_key); + efi_bs = NULL; if ( status != EFI_INVALID_PARAMETER || retry ) break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 12 02:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ecq-0004Nh-17; Fri, 12 Jun 2015 02: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 1Z3Eco-0004NT-Mw for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:18 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 46/B9-13047-6924A755; Fri, 12 Jun 2015 02:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434075796!22627933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11494 invoked from network); 12 Jun 2015 02:23:17 -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; 12 Jun 2015 02:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecm-0000A5-1n for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ecl-0003eA-Ti for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:15 +0000 Date: Fri, 12 Jun 2015 02:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: fix EFI_MEMORY_WP handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af23e79f46583abc18e8cffdec0b69297cfbdff0 Author: Jan Beulich AuthorDate: Wed Jun 10 12:01:35 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:01:35 2015 +0200 x86/EFI: fix EFI_MEMORY_WP handling Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/common/efi/boot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 4b816f2..130166e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1202,7 +1202,7 @@ void __init efi_init_memory(void) } if ( desc->Attribute & EFI_MEMORY_WP ) - prot &= _PAGE_RW; + prot &= ~_PAGE_RW; if ( desc->Attribute & EFI_MEMORY_XP ) prot |= _PAGE_NX; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ecq-0004Nh-17; Fri, 12 Jun 2015 02: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 1Z3Eco-0004NT-Mw for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:18 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 46/B9-13047-6924A755; Fri, 12 Jun 2015 02:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434075796!22627933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11494 invoked from network); 12 Jun 2015 02:23:17 -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; 12 Jun 2015 02:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecm-0000A5-1n for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ecl-0003eA-Ti for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:15 +0000 Date: Fri, 12 Jun 2015 02:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: fix EFI_MEMORY_WP handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af23e79f46583abc18e8cffdec0b69297cfbdff0 Author: Jan Beulich AuthorDate: Wed Jun 10 12:01:35 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:01:35 2015 +0200 x86/EFI: fix EFI_MEMORY_WP handling Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/common/efi/boot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 4b816f2..130166e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1202,7 +1202,7 @@ void __init efi_init_memory(void) } if ( desc->Attribute & EFI_MEMORY_WP ) - prot &= _PAGE_RW; + prot &= ~_PAGE_RW; if ( desc->Attribute & EFI_MEMORY_XP ) prot |= _PAGE_NX; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ed0-0004PD-3u; Fri, 12 Jun 2015 02:23:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecz-0004P3-94 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:29 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id A2/87-08244-0A24A755; Fri, 12 Jun 2015 02:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434075806!13642563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31424 invoked from network); 12 Jun 2015 02:23:27 -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; 12 Jun 2015 02:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecw-0000AB-Lg for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ecw-0003fs-Gg for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:26 +0000 Date: Fri, 12 Jun 2015 02:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI/early: add /mapbs to map EfiBootServices{Code, Data} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f36886bdf48ca2968379e3a0aa607044537ecf76 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 10 12:02:43 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:02:43 2015 +0200 EFI/early: add /mapbs to map EfiBootServices{Code,Data} From: Konrad Rzeszutek Wilk To help on certain platforms to run. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich --- xen/arch/x86/efi/efi-boot.h | 12 ++++++++---- xen/common/efi/boot.c | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 9f41793..2dd69f6 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -148,12 +148,16 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, switch ( desc->Type ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: case EfiBootServicesCode: case EfiBootServicesData: + if ( map_bs ) + { + default: + type = E820_RESERVED; + break; + } + /* fall through */ + case EfiConventionalMemory: if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 130166e..6ce554d 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -84,6 +84,7 @@ static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; +static bool_t __initdata map_bs; static struct file __initdata cfg; static struct file __initdata kernel; @@ -756,6 +757,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) base_video = 1; + else if ( wstrcmp(ptr + 1, L"mapbs") == 0 ) + map_bs = 1; else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) cfg_file_name = ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) @@ -765,6 +768,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { PrintStr(L"Xen EFI Loader options:\r\n"); PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-mapbs map EfiBootServices{Code,Data}\r\n"); PrintStr(L"-cfg= specify configuration file\r\n"); PrintStr(L"-help, -? display this help\r\n"); blexit(NULL); @@ -1165,7 +1169,8 @@ void __init efi_init_memory(void) } *extra, *extra_head = NULL; #endif - printk(XENLOG_INFO "EFI memory map:\n"); + printk(XENLOG_INFO "EFI memory map:%s\n", + map_bs ? " (mapping BootServices)" : ""); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; @@ -1178,7 +1183,11 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || + (!(desc->Attribute & EFI_MEMORY_RUNTIME) && + (!map_bs || + (desc->Type != EfiBootServicesCode && + desc->Type != EfiBootServicesData))) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1264,7 +1273,10 @@ void __init efi_init_memory(void) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + if ( ((desc->Attribute & EFI_MEMORY_RUNTIME) || + (map_bs && + (desc->Type == EfiBootServicesCode || + desc->Type == EfiBootServicesData))) && desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && desc->VirtualStart != desc->PhysicalStart ) copy_mapping(PFN_DOWN(desc->PhysicalStart), -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ed0-0004PD-3u; Fri, 12 Jun 2015 02:23:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecz-0004P3-94 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:29 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id A2/87-08244-0A24A755; Fri, 12 Jun 2015 02:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434075806!13642563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31424 invoked from network); 12 Jun 2015 02:23:27 -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; 12 Jun 2015 02:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ecw-0000AB-Lg for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ecw-0003fs-Gg for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:26 +0000 Date: Fri, 12 Jun 2015 02:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI/early: add /mapbs to map EfiBootServices{Code, Data} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f36886bdf48ca2968379e3a0aa607044537ecf76 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 10 12:02:43 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:02:43 2015 +0200 EFI/early: add /mapbs to map EfiBootServices{Code,Data} From: Konrad Rzeszutek Wilk To help on certain platforms to run. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich --- xen/arch/x86/efi/efi-boot.h | 12 ++++++++---- xen/common/efi/boot.c | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 9f41793..2dd69f6 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -148,12 +148,16 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, switch ( desc->Type ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: case EfiBootServicesCode: case EfiBootServicesData: + if ( map_bs ) + { + default: + type = E820_RESERVED; + break; + } + /* fall through */ + case EfiConventionalMemory: if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 130166e..6ce554d 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -84,6 +84,7 @@ static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; +static bool_t __initdata map_bs; static struct file __initdata cfg; static struct file __initdata kernel; @@ -756,6 +757,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) base_video = 1; + else if ( wstrcmp(ptr + 1, L"mapbs") == 0 ) + map_bs = 1; else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) cfg_file_name = ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) @@ -765,6 +768,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { PrintStr(L"Xen EFI Loader options:\r\n"); PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-mapbs map EfiBootServices{Code,Data}\r\n"); PrintStr(L"-cfg= specify configuration file\r\n"); PrintStr(L"-help, -? display this help\r\n"); blexit(NULL); @@ -1165,7 +1169,8 @@ void __init efi_init_memory(void) } *extra, *extra_head = NULL; #endif - printk(XENLOG_INFO "EFI memory map:\n"); + printk(XENLOG_INFO "EFI memory map:%s\n", + map_bs ? " (mapping BootServices)" : ""); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; @@ -1178,7 +1183,11 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || + (!(desc->Attribute & EFI_MEMORY_RUNTIME) && + (!map_bs || + (desc->Type != EfiBootServicesCode && + desc->Type != EfiBootServicesData))) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1264,7 +1273,10 @@ void __init efi_init_memory(void) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + if ( ((desc->Attribute & EFI_MEMORY_RUNTIME) || + (map_bs && + (desc->Type == EfiBootServicesCode || + desc->Type == EfiBootServicesData))) && desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && desc->VirtualStart != desc->PhysicalStart ) copy_mapping(PFN_DOWN(desc->PhysicalStart), -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:23: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 1Z3EdB-0004Qk-6Y; Fri, 12 Jun 2015 02:23:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdA-0004QX-3b for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:40 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 37/CF-21325-BA24A755; Fri, 12 Jun 2015 02:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1434075817!8358284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27721 invoked from network); 12 Jun 2015 02:23:38 -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; 12 Jun 2015 02:23:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ed6-0000AJ-Qb for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ed6-0003gJ-Pd for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:36 +0000 Date: Fri, 12 Jun 2015 02:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: support default attributes to map Runtime service areas with none given X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74cdad5dae72c78af4f6b343f38fd55e6a526ab1 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 10 12:04:07 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:04:07 2015 +0200 EFI: support default attributes to map Runtime service areas with none given From: Konrad Rzeszutek Wilk For example on Dell machines we see: (XEN) 00000fed18000-00000fed19fff type=11 attr=8000000000000000 (XEN) Unknown cachability for MFNs 0xfed18-0xfed19 Let's allow them to be mapped as UC. We also alter the 'efi-rs' to be 'efi=rs' or 'efi=no-rs'. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- docs/misc/xen-command-line.markdown | 18 +++++++++++++++--- xen/common/efi/boot.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 4889e27..aa684c0 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -617,12 +617,24 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. -### efi-rs -> `= ` +### efi +> `= List of [ rs | attr ]` + +All options are of boolean kind and can be prefixed with `no-` to +effect the inverse meaning. + +> `rs` > Default: `true` -Force or disable use of EFI runtime services. +>> Force or disable use of EFI runtime services. + +> `attr=uc` + +> Default: `off` + +>> Allows mapping of RuntimeServices which have no cachability attribute +>> set as UC. ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 6ce554d..bba4345 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1107,7 +1107,31 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) #ifndef CONFIG_ARM /* TODO - runtime service support */ static bool_t __initdata efi_rs_enable = 1; -boolean_param("efi-rs", efi_rs_enable); +static bool_t __initdata efi_map_uc; + +static void __init parse_efi_param(char *s) +{ + char *ss; + + do { + bool_t val = !!strncmp(s, "no-", 3); + + if ( !val ) + s += 3; + + ss = strchr(s, ','); + if ( ss ) + *ss = '\0'; + + if ( !strcmp(s, "rs") ) + efi_rs_enable = val; + else if ( !strcmp(s, "attr=uc") ) + efi_map_uc = val; + + s = ss + 1; + } while ( ss ); +} +custom_param("efi", parse_efi_param); #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, @@ -1205,9 +1229,11 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; else { - printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx\n", - smfn, emfn - 1); - continue; + printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", + smfn, emfn - 1, efi_map_uc ? ", assuming UC" : ""); + if ( !efi_map_uc ) + continue; + prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } if ( desc->Attribute & EFI_MEMORY_WP ) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:23: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 1Z3EdB-0004Qk-6Y; Fri, 12 Jun 2015 02:23:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdA-0004QX-3b for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:40 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 37/CF-21325-BA24A755; Fri, 12 Jun 2015 02:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1434075817!8358284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27721 invoked from network); 12 Jun 2015 02:23:38 -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; 12 Jun 2015 02:23:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Ed6-0000AJ-Qb for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Ed6-0003gJ-Pd for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:36 +0000 Date: Fri, 12 Jun 2015 02:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: support default attributes to map Runtime service areas with none given X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74cdad5dae72c78af4f6b343f38fd55e6a526ab1 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 10 12:04:07 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:04:07 2015 +0200 EFI: support default attributes to map Runtime service areas with none given From: Konrad Rzeszutek Wilk For example on Dell machines we see: (XEN) 00000fed18000-00000fed19fff type=11 attr=8000000000000000 (XEN) Unknown cachability for MFNs 0xfed18-0xfed19 Let's allow them to be mapped as UC. We also alter the 'efi-rs' to be 'efi=rs' or 'efi=no-rs'. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- docs/misc/xen-command-line.markdown | 18 +++++++++++++++--- xen/common/efi/boot.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 4889e27..aa684c0 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -617,12 +617,24 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. -### efi-rs -> `= ` +### efi +> `= List of [ rs | attr ]` + +All options are of boolean kind and can be prefixed with `no-` to +effect the inverse meaning. + +> `rs` > Default: `true` -Force or disable use of EFI runtime services. +>> Force or disable use of EFI runtime services. + +> `attr=uc` + +> Default: `off` + +>> Allows mapping of RuntimeServices which have no cachability attribute +>> set as UC. ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 6ce554d..bba4345 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1107,7 +1107,31 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) #ifndef CONFIG_ARM /* TODO - runtime service support */ static bool_t __initdata efi_rs_enable = 1; -boolean_param("efi-rs", efi_rs_enable); +static bool_t __initdata efi_map_uc; + +static void __init parse_efi_param(char *s) +{ + char *ss; + + do { + bool_t val = !!strncmp(s, "no-", 3); + + if ( !val ) + s += 3; + + ss = strchr(s, ','); + if ( ss ) + *ss = '\0'; + + if ( !strcmp(s, "rs") ) + efi_rs_enable = val; + else if ( !strcmp(s, "attr=uc") ) + efi_map_uc = val; + + s = ss + 1; + } while ( ss ); +} +custom_param("efi", parse_efi_param); #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, @@ -1205,9 +1229,11 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; else { - printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx\n", - smfn, emfn - 1); - continue; + printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", + smfn, emfn - 1, efi_map_uc ? ", assuming UC" : ""); + if ( !efi_map_uc ) + continue; + prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } if ( desc->Attribute & EFI_MEMORY_WP ) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:23: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 1Z3EdL-0004S8-9C; Fri, 12 Jun 2015 02:23:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdJ-0004Rv-TL for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:50 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 67/F1-29123-5B24A755; Fri, 12 Jun 2015 02:23:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1434075827!15014764!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4308 invoked from network); 12 Jun 2015 02:23:48 -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; 12 Jun 2015 02:23:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdH-0000BC-27 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EdG-0003gf-UI for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:46 +0000 Date: Fri, 12 Jun 2015 02:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: adjust EFI_MEMORY_WP handling for spec version 2.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 860313f0411d2dcc6b2fd78bfb834b39d05373a6 Author: Jan Beulich AuthorDate: Wed Jun 10 12:05:21 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:05:21 2015 +0200 x86/EFI: adjust EFI_MEMORY_WP handling for spec version 2.5 That flag now means cachability rather than protection, and a new flag EFI_MEMORY_RO got added in its place. Along with EFI_MEMORY_RO also add the two other new EFI_MEMORY_* definitions, even if we don't need them right away. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Konrad Rzeszutek Wilk --- xen/common/efi/boot.c | 10 +++++++++- xen/include/efi/efidef.h | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index bba4345..22f4841 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -32,6 +32,8 @@ /* Using SetVirtualAddressMap() is incompatible with kexec: */ #undef USE_SET_VIRTUAL_ADDRESS_MAP +#define EFI_REVISION(major, minor) (((major) << 16) | (minor)) + #define SMBIOS3_TABLE_GUID \ { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} } #define SHIM_LOCK_PROTOCOL_GUID \ @@ -78,6 +80,7 @@ static int set_color(u32 mask, int bpp, u8 *pos, u8 *sz); static bool_t match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2); static const EFI_BOOT_SERVICES *__initdata efi_bs; +static UINT32 __initdata efi_bs_revision; static EFI_HANDLE __initdata efi_ih; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; @@ -716,6 +719,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; + efi_bs_revision = efi_bs->Hdr.Revision; efi_rs = SystemTable->RuntimeServices; efi_ct = SystemTable->ConfigurationTable; efi_num_ct = SystemTable->NumberOfTableEntries; @@ -1227,6 +1231,9 @@ void __init efi_init_memory(void) prot |= _PAGE_PAT | MAP_SMALL_PAGES; else if ( desc->Attribute & (EFI_MEMORY_UC | EFI_MEMORY_UCE) ) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; + else if ( efi_bs_revision >= EFI_REVISION(2, 5) && + (desc->Attribute & EFI_MEMORY_WP) ) + prot |= _PAGE_PAT | _PAGE_PWT | MAP_SMALL_PAGES; else { printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", @@ -1236,7 +1243,8 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } - if ( desc->Attribute & EFI_MEMORY_WP ) + if ( desc->Attribute & (efi_bs_revision < EFI_REVISION(2, 5) + ? EFI_MEMORY_WP : EFI_MEMORY_RO) ) prot &= ~_PAGE_RW; if ( desc->Attribute & EFI_MEMORY_XP ) prot |= _PAGE_NX; diff --git a/xen/include/efi/efidef.h b/xen/include/efi/efidef.h index 07fdf0d..86a7e11 100644 --- a/xen/include/efi/efidef.h +++ b/xen/include/efi/efidef.h @@ -156,11 +156,15 @@ typedef enum { #define EFI_MEMORY_WT 0x0000000000000004 #define EFI_MEMORY_WB 0x0000000000000008 #define EFI_MEMORY_UCE 0x0000000000000010 +#define EFI_MEMORY_WP 0x0000000000001000 // physical memory protection on range -#define EFI_MEMORY_WP 0x0000000000001000 #define EFI_MEMORY_RP 0x0000000000002000 #define EFI_MEMORY_XP 0x0000000000004000 +#define EFI_MEMORY_RO 0x0000000000020000 + +#define EFI_MEMORY_NV 0x0000000000008000 +#define EFI_MEMORY_MORE_RELIABLE 0x0000000000010000 // range requires a runtime mapping #define EFI_MEMORY_RUNTIME 0x8000000000000000 -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:23:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02:23: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 1Z3EdL-0004S8-9C; Fri, 12 Jun 2015 02:23:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdJ-0004Rv-TL for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:50 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 67/F1-29123-5B24A755; Fri, 12 Jun 2015 02:23:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1434075827!15014764!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4308 invoked from network); 12 Jun 2015 02:23:48 -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; 12 Jun 2015 02:23:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdH-0000BC-27 for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EdG-0003gf-UI for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:46 +0000 Date: Fri, 12 Jun 2015 02:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: adjust EFI_MEMORY_WP handling for spec version 2.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 860313f0411d2dcc6b2fd78bfb834b39d05373a6 Author: Jan Beulich AuthorDate: Wed Jun 10 12:05:21 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:05:21 2015 +0200 x86/EFI: adjust EFI_MEMORY_WP handling for spec version 2.5 That flag now means cachability rather than protection, and a new flag EFI_MEMORY_RO got added in its place. Along with EFI_MEMORY_RO also add the two other new EFI_MEMORY_* definitions, even if we don't need them right away. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Konrad Rzeszutek Wilk --- xen/common/efi/boot.c | 10 +++++++++- xen/include/efi/efidef.h | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index bba4345..22f4841 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -32,6 +32,8 @@ /* Using SetVirtualAddressMap() is incompatible with kexec: */ #undef USE_SET_VIRTUAL_ADDRESS_MAP +#define EFI_REVISION(major, minor) (((major) << 16) | (minor)) + #define SMBIOS3_TABLE_GUID \ { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} } #define SHIM_LOCK_PROTOCOL_GUID \ @@ -78,6 +80,7 @@ static int set_color(u32 mask, int bpp, u8 *pos, u8 *sz); static bool_t match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2); static const EFI_BOOT_SERVICES *__initdata efi_bs; +static UINT32 __initdata efi_bs_revision; static EFI_HANDLE __initdata efi_ih; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; @@ -716,6 +719,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; + efi_bs_revision = efi_bs->Hdr.Revision; efi_rs = SystemTable->RuntimeServices; efi_ct = SystemTable->ConfigurationTable; efi_num_ct = SystemTable->NumberOfTableEntries; @@ -1227,6 +1231,9 @@ void __init efi_init_memory(void) prot |= _PAGE_PAT | MAP_SMALL_PAGES; else if ( desc->Attribute & (EFI_MEMORY_UC | EFI_MEMORY_UCE) ) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; + else if ( efi_bs_revision >= EFI_REVISION(2, 5) && + (desc->Attribute & EFI_MEMORY_WP) ) + prot |= _PAGE_PAT | _PAGE_PWT | MAP_SMALL_PAGES; else { printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", @@ -1236,7 +1243,8 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } - if ( desc->Attribute & EFI_MEMORY_WP ) + if ( desc->Attribute & (efi_bs_revision < EFI_REVISION(2, 5) + ? EFI_MEMORY_WP : EFI_MEMORY_RO) ) prot &= ~_PAGE_RW; if ( desc->Attribute & EFI_MEMORY_XP ) prot |= _PAGE_NX; diff --git a/xen/include/efi/efidef.h b/xen/include/efi/efidef.h index 07fdf0d..86a7e11 100644 --- a/xen/include/efi/efidef.h +++ b/xen/include/efi/efidef.h @@ -156,11 +156,15 @@ typedef enum { #define EFI_MEMORY_WT 0x0000000000000004 #define EFI_MEMORY_WB 0x0000000000000008 #define EFI_MEMORY_UCE 0x0000000000000010 +#define EFI_MEMORY_WP 0x0000000000001000 // physical memory protection on range -#define EFI_MEMORY_WP 0x0000000000001000 #define EFI_MEMORY_RP 0x0000000000002000 #define EFI_MEMORY_XP 0x0000000000004000 +#define EFI_MEMORY_RO 0x0000000000020000 + +#define EFI_MEMORY_NV 0x0000000000008000 +#define EFI_MEMORY_MORE_RELIABLE 0x0000000000010000 // range requires a runtime mapping #define EFI_MEMORY_RUNTIME 0x8000000000000000 -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3EdU-0004Tp-Dv; Fri, 12 Jun 2015 02:24:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdT-0004Tf-Ni for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:59 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id D1/DD-30151-FB24A755; Fri, 12 Jun 2015 02:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1434075837!22629669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1488 invoked from network); 12 Jun 2015 02:23:58 -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; 12 Jun 2015 02:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdR-0000BM-8Y for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EdR-0003hR-4Y for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:57 +0000 Date: Fri, 12 Jun 2015 02:23:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: profile event channel lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3046cf809529f4fdd03850e084a94fa72cf78e9 Author: David Vrabel AuthorDate: Wed Jun 10 12:06:02 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:06:02 2015 +0200 evtchn: profile event channel lock The per-domain event channel lock may suffer from contention. Add it to the set of locks to be profiled when lock profiling is enabled. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index fae242d..bf9b2f8 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1251,7 +1251,7 @@ int evtchn_init(struct domain *d) if ( !d->evtchn ) return -ENOMEM; - spin_lock_init(&d->event_lock); + spin_lock_init_prof(d, event_lock); if ( get_free_port(d) != 0 ) { free_evtchn_bucket(d, d->evtchn); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3EdU-0004Tp-Dv; Fri, 12 Jun 2015 02:24:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdT-0004Tf-Ni for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:59 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id D1/DD-30151-FB24A755; Fri, 12 Jun 2015 02:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1434075837!22629669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1488 invoked from network); 12 Jun 2015 02:23:58 -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; 12 Jun 2015 02:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3EdR-0000BM-8Y for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3EdR-0003hR-4Y for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:23:57 +0000 Date: Fri, 12 Jun 2015 02:23:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: profile event channel lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3046cf809529f4fdd03850e084a94fa72cf78e9 Author: David Vrabel AuthorDate: Wed Jun 10 12:06:02 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 10 12:06:02 2015 +0200 evtchn: profile event channel lock The per-domain event channel lock may suffer from contention. Add it to the set of locks to be profiled when lock profiling is enabled. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index fae242d..bf9b2f8 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1251,7 +1251,7 @@ int evtchn_init(struct domain *d) if ( !d->evtchn ) return -ENOMEM; - spin_lock_init(&d->event_lock); + spin_lock_init_prof(d, event_lock); if ( get_free_port(d) != 0 ) { free_evtchn_bucket(d, d->evtchn); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ede-0004VL-GR; Fri, 12 Jun 2015 02:24:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Edd-0004VB-Pc for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:24:09 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 31/ED-30151-9C24A755; Fri, 12 Jun 2015 02:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434075847!22628034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23901 invoked from network); 12 Jun 2015 02:24:08 -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; 12 Jun 2015 02:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Edb-0000Bu-DW for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Edb-0003i4-Bu for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:24:07 +0000 Date: Fri, 12 Jun 2015 02:24:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12e817e281034f5881f46e0e4f1d127820101a78 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:07:03 2015 +0000 Commit: Ian Jackson CommitDate: Wed Jun 10 11:27:10 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Jackson --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 1ff6d0a..b0cb6e1 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2194,7 +2194,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 12 02:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jun 2015 02: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 1Z3Ede-0004VL-GR; Fri, 12 Jun 2015 02:24:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Edd-0004VB-Pc for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:24:09 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 31/ED-30151-9C24A755; Fri, 12 Jun 2015 02:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434075847!22628034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23901 invoked from network); 12 Jun 2015 02:24:08 -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; 12 Jun 2015 02:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3Edb-0000Bu-DW for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3Edb-0003i4-Bu for xen-changelog@lists.xensource.com; Fri, 12 Jun 2015 02:24:07 +0000 Date: Fri, 12 Jun 2015 02:24:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12e817e281034f5881f46e0e4f1d127820101a78 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:07:03 2015 +0000 Commit: Ian Jackson CommitDate: Wed Jun 10 11:27:10 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Jackson --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 1ff6d0a..b0cb6e1 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2194,7 +2194,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 13 05:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Jun 2015 05:44: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 1Z3eEh-0004k8-Rb; Sat, 13 Jun 2015 05:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3eEg-0004k0-Cu for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:06 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 71/6D-12923-523CB755; Sat, 13 Jun 2015 05:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1434174244!8518041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14244 invoked from network); 13 Jun 2015 05:44:05 -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 Jun 2015 05:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3eEd-0002JB-Va for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3eEd-00077V-F6 for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:03 +0000 Date: Sat, 13 Jun 2015 05:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38efe18898fb5d6b9253ad678407756922551fa1 Author: Jan Beulich AuthorDate: Thu Jun 11 15:03:58 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:03:58 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 07d80c1..a92aa10 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2372,6 +2372,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- 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 Jun 13 05:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Jun 2015 05:44: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 1Z3eEh-0004k8-Rb; Sat, 13 Jun 2015 05:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3eEg-0004k0-Cu for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:06 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 71/6D-12923-523CB755; Sat, 13 Jun 2015 05:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1434174244!8518041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14244 invoked from network); 13 Jun 2015 05:44:05 -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 Jun 2015 05:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3eEd-0002JB-Va for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3eEd-00077V-F6 for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:03 +0000 Date: Sat, 13 Jun 2015 05:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38efe18898fb5d6b9253ad678407756922551fa1 Author: Jan Beulich AuthorDate: Thu Jun 11 15:03:58 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:03:58 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 07d80c1..a92aa10 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2372,6 +2372,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- 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 Jun 13 05:44:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Jun 2015 05: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 1Z3eEr-0004ko-U1; Sat, 13 Jun 2015 05: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 1Z3eEq-0004kc-L7 for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:16 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C3/E2-21325-F23CB755; Sat, 13 Jun 2015 05:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1434174254!13915661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16673 invoked from network); 13 Jun 2015 05:44:15 -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; 13 Jun 2015 05:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3eEo-0002JF-5u for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3eEo-00079H-3t for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:14 +0000 Date: Sat, 13 Jun 2015 05:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21a8344ca38a2797a13b4bf57031b6f49ae12ccb Author: Andrew Cooper AuthorDate: Thu Jun 11 15:05:36 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:05:36 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 25f4d70..5ee61fe 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -114,7 +114,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- 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 Jun 13 05:44:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Jun 2015 05: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 1Z3eEr-0004ko-U1; Sat, 13 Jun 2015 05: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 1Z3eEq-0004kc-L7 for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:16 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C3/E2-21325-F23CB755; Sat, 13 Jun 2015 05:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1434174254!13915661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16673 invoked from network); 13 Jun 2015 05:44:15 -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; 13 Jun 2015 05:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3eEo-0002JF-5u for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3eEo-00079H-3t for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 05:44:14 +0000 Date: Sat, 13 Jun 2015 05:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21a8344ca38a2797a13b4bf57031b6f49ae12ccb Author: Andrew Cooper AuthorDate: Thu Jun 11 15:05:36 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:05:36 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 25f4d70..5ee61fe 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -114,7 +114,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- 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 Jun 13 07:55:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Jun 2015 07:55: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 1Z3gHY-0003uW-NH; Sat, 13 Jun 2015 07:55:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3gHX-0003uN-OB for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 07:55:11 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id B8/7A-08244-ED1EB755; Sat, 13 Jun 2015 07:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1434182109!13977700!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27278 invoked from network); 13 Jun 2015 07:55: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 Jun 2015 07:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3gHP-0003my-18 for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 07:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3gHO-0003Tt-SN for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 07:55:02 +0000 Date: Sat, 13 Jun 2015 07:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 579e90432e995d6cb6f8520aca557fa6646f94ec Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 10 11:40:43 2015 +0000 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/net/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index f409b92..f510932 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -1253,6 +1253,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- 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 Sat Jun 13 07:55:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Jun 2015 07:55: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 1Z3gHY-0003uW-NH; Sat, 13 Jun 2015 07:55:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3gHX-0003uN-OB for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 07:55:11 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id B8/7A-08244-ED1EB755; Sat, 13 Jun 2015 07:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1434182109!13977700!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27278 invoked from network); 13 Jun 2015 07:55: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 Jun 2015 07:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z3gHP-0003my-18 for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 07:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z3gHO-0003Tt-SN for xen-changelog@lists.xensource.com; Sat, 13 Jun 2015 07:55:02 +0000 Date: Sat, 13 Jun 2015 07:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 579e90432e995d6cb6f8520aca557fa6646f94ec Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 10 11:40:43 2015 +0000 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/net/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index f409b92..f510932 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -1253,6 +1253,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- 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 Jun 14 05:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 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 1Z40Xk-0000om-OL; Sun, 14 Jun 2015 05:33:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z40Xk-0000oh-Bf for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:16 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 8B/14-03371-B121D755; Sun, 14 Jun 2015 05:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434259994!23090727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32226 invoked from network); 14 Jun 2015 05:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 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 1Z40Xh-000135-QQ for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z40Xh-0008Vv-Iu for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:13 +0000 Date: Sun, 14 Jun 2015 05:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f56b032bc31fa663a104dd2bc51a1a4cbc6595d Author: Jan Beulich AuthorDate: Thu Jun 11 15:02:01 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:02:01 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 9182a44..fd25728 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2394,6 +2394,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- 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 Sun Jun 14 05:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 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 1Z40Xe-0000oZ-Lr; Sun, 14 Jun 2015 05:33:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z40Xc-0000oU-EG for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:08 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 66/67-31650-3121D755; Sun, 14 Jun 2015 05:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434259983!23125117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28325 invoked from network); 14 Jun 2015 05:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 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 1Z40XX-000131-Eq for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z40XX-0008VT-9V for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:03 +0000 Date: Sun, 14 Jun 2015 05:33:03 +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 9176955cb837ba0752ca7ca7a197c9c394468e9f Author: Ian Jackson AuthorDate: Wed Jun 10 14:14:50 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:50 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d82cdbc..4debb6d 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 ?= c545d0dfcc5ab5e69d0eabc14ec101293236055c -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TAG ?= 8fcecdca2dd1e6b4e78114977388ff0ddb85db20 +# Wed Jun 10 14:14:25 2015 +0100 +# xen/pt: unknown PCI config space fields should be read-only # 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 Sun Jun 14 05:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 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 1Z40Xk-0000om-OL; Sun, 14 Jun 2015 05:33:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z40Xk-0000oh-Bf for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:16 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 8B/14-03371-B121D755; Sun, 14 Jun 2015 05:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434259994!23090727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32226 invoked from network); 14 Jun 2015 05:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 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 1Z40Xh-000135-QQ for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z40Xh-0008Vv-Iu for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:13 +0000 Date: Sun, 14 Jun 2015 05:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f56b032bc31fa663a104dd2bc51a1a4cbc6595d Author: Jan Beulich AuthorDate: Thu Jun 11 15:02:01 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:02:01 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 9182a44..fd25728 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2394,6 +2394,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- 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 Sun Jun 14 05:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 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 1Z40Xe-0000oZ-Lr; Sun, 14 Jun 2015 05:33:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z40Xc-0000oU-EG for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:08 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 66/67-31650-3121D755; Sun, 14 Jun 2015 05:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434259983!23125117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28325 invoked from network); 14 Jun 2015 05:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 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 1Z40XX-000131-Eq for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z40XX-0008VT-9V for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:03 +0000 Date: Sun, 14 Jun 2015 05:33:03 +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 9176955cb837ba0752ca7ca7a197c9c394468e9f Author: Ian Jackson AuthorDate: Wed Jun 10 14:14:50 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:14:50 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d82cdbc..4debb6d 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 ?= c545d0dfcc5ab5e69d0eabc14ec101293236055c -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TAG ?= 8fcecdca2dd1e6b4e78114977388ff0ddb85db20 +# Wed Jun 10 14:14:25 2015 +0100 +# xen/pt: unknown PCI config space fields should be read-only # 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 Sun Jun 14 05:33:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 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 1Z40Xv-0000qL-R4; Sun, 14 Jun 2015 05:33:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z40Xu-0000qA-Pt for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:26 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 5B/77-31650-6221D755; Sun, 14 Jun 2015 05:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1434260004!23125481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13867 invoked from network); 14 Jun 2015 05:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 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 1Z40Xr-00013H-W0 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z40Xr-0008WH-Ti for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:23 +0000 Date: Sun, 14 Jun 2015 05:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 15e1ed9ae79f27a0901c71c5b35075f95f8fbfe7 Author: Andrew Cooper AuthorDate: Thu Jun 11 15:02:35 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:02:35 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 5f0ea0a..0b78445 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- 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 Sun Jun 14 05:33:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 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 1Z40Xv-0000qL-R4; Sun, 14 Jun 2015 05:33:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z40Xu-0000qA-Pt for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:26 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 5B/77-31650-6221D755; Sun, 14 Jun 2015 05:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1434260004!23125481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13867 invoked from network); 14 Jun 2015 05:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 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 1Z40Xr-00013H-W0 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z40Xr-0008WH-Ti for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 05:33:23 +0000 Date: Sun, 14 Jun 2015 05:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 15e1ed9ae79f27a0901c71c5b35075f95f8fbfe7 Author: Andrew Cooper AuthorDate: Thu Jun 11 15:02:35 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:02:35 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 5f0ea0a..0b78445 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- 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 Sun Jun 14 23:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HE9-0006jb-QW; Sun, 14 Jun 2015 23: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 1Z4HE8-0006jS-3t for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:08 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D1/5F-08467-F9C0E755; Sun, 14 Jun 2015 23:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1434324125!10744135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2915 invoked from network); 14 Jun 2015 23:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HE3-0005Ge-SP for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HE3-0005sj-EZ for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:03 +0000 Date: Sun, 14 Jun 2015 23:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcfbdb43336a8c1f1c9f34940eeb5fab4ef1760c Author: Jan Beulich AuthorDate: Thu Jun 11 14:56:38 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:56:38 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index fe52b63..935034c 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2449,6 +2449,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HE9-0006jb-QW; Sun, 14 Jun 2015 23: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 1Z4HE8-0006jS-3t for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:08 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D1/5F-08467-F9C0E755; Sun, 14 Jun 2015 23:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1434324125!10744135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2915 invoked from network); 14 Jun 2015 23:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HE3-0005Ge-SP for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HE3-0005sj-EZ for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:03 +0000 Date: Sun, 14 Jun 2015 23:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcfbdb43336a8c1f1c9f34940eeb5fab4ef1760c Author: Jan Beulich AuthorDate: Thu Jun 11 14:56:38 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:56:38 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index fe52b63..935034c 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2449,6 +2449,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEJ-0006kb-UB; Sun, 14 Jun 2015 23:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEI-0006kN-Gm for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:18 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id A0/F0-16276-9AC0E755; Sun, 14 Jun 2015 23:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1434324136!12408410!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25119 invoked from network); 14 Jun 2015 23:22:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEG-0005Gj-49 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEF-0005tB-QP for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:15 +0000 Date: Sun, 14 Jun 2015 23:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0bc9f98b0296932dd4ea611a9885354156ea9faf Author: Andrew Cooper AuthorDate: Thu Jun 11 14:57:38 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:57:38 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index b6c2563..875d82e 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEJ-0006kb-UB; Sun, 14 Jun 2015 23:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEI-0006kN-Gm for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:18 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id A0/F0-16276-9AC0E755; Sun, 14 Jun 2015 23:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1434324136!12408410!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25119 invoked from network); 14 Jun 2015 23:22:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEG-0005Gj-49 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEF-0005tB-QP for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:15 +0000 Date: Sun, 14 Jun 2015 23:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0bc9f98b0296932dd4ea611a9885354156ea9faf Author: Andrew Cooper AuthorDate: Thu Jun 11 14:57:38 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:57:38 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index b6c2563..875d82e 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEU-0006m1-0N; Sun, 14 Jun 2015 23:22:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HES-0006lq-TH for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:29 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id F2/FB-12923-4BC0E755; Sun, 14 Jun 2015 23:22:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1434324146!14075724!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10389 invoked from network); 14 Jun 2015 23:22:27 -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; 14 Jun 2015 23:22:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEQ-0005Gu-94 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEQ-0005uD-80 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:26 +0000 Date: Sun, 14 Jun 2015 23:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97051bd95298f1b8bfc4cb2bbf953a35c4b7538a Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 12 12:44:58 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 0d874d9..90ac033 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1772,19 +1772,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEU-0006m1-0N; Sun, 14 Jun 2015 23:22:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HES-0006lq-TH for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:29 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id F2/FB-12923-4BC0E755; Sun, 14 Jun 2015 23:22:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1434324146!14075724!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10389 invoked from network); 14 Jun 2015 23:22:27 -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; 14 Jun 2015 23:22:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEQ-0005Gu-94 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEQ-0005uD-80 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:26 +0000 Date: Sun, 14 Jun 2015 23:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97051bd95298f1b8bfc4cb2bbf953a35c4b7538a Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 12 12:44:58 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 0d874d9..90ac033 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1772,19 +1772,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEe-0006nY-2v; Sun, 14 Jun 2015 23:22:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEc-0006nO-V0 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:39 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 15/30-10437-EBC0E755; Sun, 14 Jun 2015 23:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1434324156!16143799!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8692 invoked from network); 14 Jun 2015 23:22:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEa-0005H4-Dh for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEa-0005ud-Cf for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:36 +0000 Date: Sun, 14 Jun 2015 23:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf06e40002f9ce08cad9037bad6bf02568ffce1d Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 12 12:45:03 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 90ac033..9a7c644 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1877,7 +1877,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEe-0006nY-2v; Sun, 14 Jun 2015 23:22:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEc-0006nO-V0 for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:39 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 15/30-10437-EBC0E755; Sun, 14 Jun 2015 23:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1434324156!16143799!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8692 invoked from network); 14 Jun 2015 23:22:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEa-0005H4-Dh for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEa-0005ud-Cf for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:36 +0000 Date: Sun, 14 Jun 2015 23:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf06e40002f9ce08cad9037bad6bf02568ffce1d Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 12 12:45:03 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 90ac033..9a7c644 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1877,7 +1877,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23:22: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 1Z4HEp-0006pO-5Q; Sun, 14 Jun 2015 23:22:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEn-0006pB-Oh for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:49 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id BB/70-28408-8CC0E755; Sun, 14 Jun 2015 23:22:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434324166!13692178!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4806 invoked from network); 14 Jun 2015 23:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEk-0005HC-Kq for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEk-0005v1-HW for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:46 +0000 Date: Sun, 14 Jun 2015 23:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d8cbcad03764e42ff2f0d224aff883c3734d782 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Fri Jun 12 13:00:00 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 56 ++++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1f4dce2..489d5f8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5487,25 +5487,19 @@ int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, } static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; char *dompath; xs_transaction_t t; int i, rc = ERROR_FAIL; - libxl_dominfo_init(&info); - - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - goto out; - } if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; retry_transaction: t = xs_transaction_start(CTX->xsh); - for (i = 0; i <= info.vcpu_max_id; i++) + for (i = 0; i <= info->vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); @@ -5515,24 +5509,16 @@ retry_transaction: } else rc = 0; out: - libxl_dominfo_dispose(&info); return rc; } static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; int i; - libxl_dominfo_init(&info); - - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - libxl_dominfo_dispose(&info); - return ERROR_FAIL; - } - for (i = 0; i <= info.vcpu_max_id; i++) { + for (i = 0; i <= info->vcpu_max_id; i++) { if (libxl_bitmap_test(cpumap, i)) { /* Return value is ignore because it does not tell anything useful * on the completion of the command. @@ -5542,33 +5528,53 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl__qmp_cpu_add(gc, domid, i); } } - libxl_dominfo_dispose(&info); return 0; } int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); - int rc; + int rc, maxcpus; + libxl_dominfo info; + + libxl_dominfo_init(&info); + + rc = libxl_domain_info(CTX, &info, domid); + if (rc < 0) { + LOGE(ERROR, "getting domain info list"); + goto out; + } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } break; case LIBXL_DOMAIN_TYPE_PV: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } +out: + libxl_dominfo_dispose(&info); GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23:22: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 1Z4HEp-0006pO-5Q; Sun, 14 Jun 2015 23:22:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEn-0006pB-Oh for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:49 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id BB/70-28408-8CC0E755; Sun, 14 Jun 2015 23:22:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434324166!13692178!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4806 invoked from network); 14 Jun 2015 23:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEk-0005HC-Kq for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEk-0005v1-HW for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:46 +0000 Date: Sun, 14 Jun 2015 23:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d8cbcad03764e42ff2f0d224aff883c3734d782 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Fri Jun 12 13:00:00 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 56 ++++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1f4dce2..489d5f8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5487,25 +5487,19 @@ int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, } static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; char *dompath; xs_transaction_t t; int i, rc = ERROR_FAIL; - libxl_dominfo_init(&info); - - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - goto out; - } if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; retry_transaction: t = xs_transaction_start(CTX->xsh); - for (i = 0; i <= info.vcpu_max_id; i++) + for (i = 0; i <= info->vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); @@ -5515,24 +5509,16 @@ retry_transaction: } else rc = 0; out: - libxl_dominfo_dispose(&info); return rc; } static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; int i; - libxl_dominfo_init(&info); - - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - libxl_dominfo_dispose(&info); - return ERROR_FAIL; - } - for (i = 0; i <= info.vcpu_max_id; i++) { + for (i = 0; i <= info->vcpu_max_id; i++) { if (libxl_bitmap_test(cpumap, i)) { /* Return value is ignore because it does not tell anything useful * on the completion of the command. @@ -5542,33 +5528,53 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl__qmp_cpu_add(gc, domid, i); } } - libxl_dominfo_dispose(&info); return 0; } int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); - int rc; + int rc, maxcpus; + libxl_dominfo info; + + libxl_dominfo_init(&info); + + rc = libxl_domain_info(CTX, &info, domid); + if (rc < 0) { + LOGE(ERROR, "getting domain info list"); + goto out; + } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } break; case LIBXL_DOMAIN_TYPE_PV: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } +out: + libxl_dominfo_dispose(&info); GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:23:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEz-0006r4-RL; Sun, 14 Jun 2015 23: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 1Z4HEx-0006qq-6T for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:59 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 54/50-10437-2DC0E755; Sun, 14 Jun 2015 23:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1434324176!14864812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17812 invoked from network); 14 Jun 2015 23:22:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEu-0005HN-Pk for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEu-0005vO-OH for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:56 +0000 Date: Sun, 14 Jun 2015 23:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d963f64ba322731bc73d71adb589f361c1f8123c Author: Andrew Cooper AuthorDate: Mon Apr 13 16:07:03 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 12 13:01:14 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 12e817e281034f5881f46e0e4f1d127820101a78) --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index eb88eee..96f0397 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2013,7 +2013,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 14 23:23:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Jun 2015 23: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 1Z4HEz-0006r4-RL; Sun, 14 Jun 2015 23: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 1Z4HEx-0006qq-6T for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:59 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 54/50-10437-2DC0E755; Sun, 14 Jun 2015 23:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1434324176!14864812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17812 invoked from network); 14 Jun 2015 23:22:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jun 2015 23:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4HEu-0005HN-Pk for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4HEu-0005vO-OH for xen-changelog@lists.xensource.com; Sun, 14 Jun 2015 23:22:56 +0000 Date: Sun, 14 Jun 2015 23:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d963f64ba322731bc73d71adb589f361c1f8123c Author: Andrew Cooper AuthorDate: Mon Apr 13 16:07:03 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 12 13:01:14 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 12e817e281034f5881f46e0e4f1d127820101a78) --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index eb88eee..96f0397 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2013,7 +2013,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 15 04:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jun 2015 04:55: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 1Z4MQN-0005ui-CA; Mon, 15 Jun 2015 04:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQL-0005ud-V0 for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:06 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 17/1A-32733-9AA5E755; Mon, 15 Jun 2015 04:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434344103!23250917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23783 invoked from network); 15 Jun 2015 04:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jun 2015 04:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQJ-0008FU-0M for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4MQI-0002Tz-KR for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:02 +0000 Date: Mon, 15 Jun 2015 04:55:02 +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 dc34ce4daf5d79eec71404e80a9ded847ad0afec Author: Ian Jackson AuthorDate: Wed Jun 10 14:12:57 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:57 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f7f9190..73cc769 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 ?= c8c6ba08684f2fb8600df479b49c5511d6fed41a -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TAG ?= 5fabc183544e966ddb9147e218246c26d2561157 +# Wed Jun 10 14:12:16 2015 +0100 +# xen/pt: unknown PCI config space fields should be read-only # 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 Mon Jun 15 04:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jun 2015 04:55: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 1Z4MQN-0005ui-CA; Mon, 15 Jun 2015 04:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQL-0005ud-V0 for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:06 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 17/1A-32733-9AA5E755; Mon, 15 Jun 2015 04:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434344103!23250917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23783 invoked from network); 15 Jun 2015 04:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jun 2015 04:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQJ-0008FU-0M for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4MQI-0002Tz-KR for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:02 +0000 Date: Mon, 15 Jun 2015 04:55:02 +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 dc34ce4daf5d79eec71404e80a9ded847ad0afec Author: Ian Jackson AuthorDate: Wed Jun 10 14:12:57 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jun 10 14:12:57 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f7f9190..73cc769 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 ?= c8c6ba08684f2fb8600df479b49c5511d6fed41a -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TAG ?= 5fabc183544e966ddb9147e218246c26d2561157 +# Wed Jun 10 14:12:16 2015 +0100 +# xen/pt: unknown PCI config space fields should be read-only # 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 Mon Jun 15 04:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jun 2015 04:55: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 1Z4MQZ-0005vj-Eg; Mon, 15 Jun 2015 04:55:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQX-0005va-U2 for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:18 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id EC/7B-01139-5BA5E755; Mon, 15 Jun 2015 04:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1434344113!14145059!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30897 invoked from network); 15 Jun 2015 04:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jun 2015 04:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQT-0008FY-DY for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4MQT-0002UT-5R for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:13 +0000 Date: Mon, 15 Jun 2015 04:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcfa8d6142daff0b37f4c4cf19c57062cb9ef25e Author: Jan Beulich AuthorDate: Thu Jun 11 14:59:27 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:59:27 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 107b000..34e1c25 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2393,6 +2393,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 15 04:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jun 2015 04:55: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 1Z4MQZ-0005vj-Eg; Mon, 15 Jun 2015 04:55:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQX-0005va-U2 for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:18 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id EC/7B-01139-5BA5E755; Mon, 15 Jun 2015 04:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1434344113!14145059!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30897 invoked from network); 15 Jun 2015 04:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jun 2015 04:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQT-0008FY-DY for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4MQT-0002UT-5R for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:13 +0000 Date: Mon, 15 Jun 2015 04:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcfa8d6142daff0b37f4c4cf19c57062cb9ef25e Author: Jan Beulich AuthorDate: Thu Jun 11 14:59:27 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:59:27 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5d5c09d853d3f212861f70c577c65d1703f752ae master date: 2015-06-11 14:44:12 +0200 --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 107b000..34e1c25 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2393,6 +2393,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 15 04:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jun 2015 04:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQh-0005xA-J5; Mon, 15 Jun 2015 04:55:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQg-0005ww-20 for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:26 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 76/1F-05081-DBA5E755; Mon, 15 Jun 2015 04:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434344123!14119163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4434 invoked from network); 15 Jun 2015 04:55:24 -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; 15 Jun 2015 04:55:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQd-0008Ge-LE for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4MQd-0002Us-Gg for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:23 +0000 Date: Mon, 15 Jun 2015 04:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 05ab7714ff84003b9b4542d7816b4651efb67679 Author: Andrew Cooper AuthorDate: Thu Jun 11 15:00:16 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:00:16 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 5f0ea0a..0b78445 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 15 04:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jun 2015 04:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQh-0005xA-J5; Mon, 15 Jun 2015 04:55:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQg-0005ww-20 for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:26 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 76/1F-05081-DBA5E755; Mon, 15 Jun 2015 04:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434344123!14119163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4434 invoked from network); 15 Jun 2015 04:55:24 -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; 15 Jun 2015 04:55:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4MQd-0008Ge-LE for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z4MQd-0002Us-Gg for xen-changelog@lists.xensource.com; Mon, 15 Jun 2015 04:55:23 +0000 Date: Mon, 15 Jun 2015 04:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 05ab7714ff84003b9b4542d7816b4651efb67679 Author: Andrew Cooper AuthorDate: Thu Jun 11 15:00:16 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 15:00:16 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 1f0721377952fc038b48f175d7061ec701359aac master date: 2015-06-11 14:44:47 +0200 --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 5f0ea0a..0b78445 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- 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 Jun 17 18:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5HyS-0004p6-7o; Wed, 17 Jun 2015 18:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HyR-0004oy-6N for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:07 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 79/21-29702-ECAB1855; Wed, 17 Jun 2015 18:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1434565324!14970564!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22254 invoked from network); 17 Jun 2015 18:22: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 Jun 2015 18:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HyO-00029j-AI for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HyN-0006n2-Ty for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:04 +0000 Date: Wed, 17 Jun 2015 18:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vMSI-X: support qword MMIO access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 284ffb4f9b0d5c3a33c4c5bd87645d0cc342ca96 Author: Jan Beulich AuthorDate: Thu Jun 11 11:52:18 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:52:18 2015 +0200 x86/vMSI-X: support qword MMIO access The specification explicitly provides for this, so we should have supported this from the beginning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmsi.c | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index cb87909..4968d39 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -223,7 +223,7 @@ static int msixtbl_read( unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - if ( len != 4 || (address & 3) ) + if ( (len != 4 && len != 8) || (address & (len - 1)) ) return r; rcu_read_lock(&msixtbl_rcu_lock); @@ -241,13 +241,25 @@ static int msixtbl_read( !acc_bit(test, entry, nr_entry, index) ) goto out; *pval = entry->gentries[nr_entry].msi_ad[index]; + if ( len == 8 ) + { + if ( index ) + offset = PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET; + else if ( acc_bit(test, entry, nr_entry, 1) ) + *pval |= (u64)entry->gentries[nr_entry].msi_ad[1] << 32; + else + goto out; + } } - else + if ( offset == PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { virt = msixtbl_addr_to_virt(entry, address); if ( !virt ) goto out; - *pval = readl(virt); + if ( len == 4 ) + *pval = readl(virt); + else + *pval |= (u64)readl(virt) << 32; } r = X86EMUL_OKAY; @@ -268,7 +280,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unsigned long flags, orig; struct irq_desc *desc; - if ( len != 4 || (address & 3) ) + if ( (len != 4 && len != 8) || (address & (len - 1)) ) return r; rcu_read_lock(&msixtbl_rcu_lock); @@ -279,16 +291,23 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); - if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET) + if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { + index = offset / sizeof(uint32_t); if ( nr_entry < MAX_MSIX_ACC_ENTRIES ) { - index = offset / sizeof(uint32_t); entry->gentries[nr_entry].msi_ad[index] = val; acc_bit(set, entry, nr_entry, index); + if ( len == 8 && !index ) + { + entry->gentries[nr_entry].msi_ad[1] = val >> 32; + acc_bit(set, entry, nr_entry, 1); + } } set_bit(nr_entry, &entry->table_flags); - goto out; + if ( len != 8 || !index ) + goto out; + val >>= 32; } /* Exit to device model when unmasking and address/data got modified. */ @@ -352,7 +371,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unlock: spin_unlock_irqrestore(&desc->lock, flags); - r = X86EMUL_OKAY; + if ( len == 4 ) + r = X86EMUL_OKAY; out: rcu_read_unlock(&msixtbl_rcu_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 Wed Jun 17 18:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5HyS-0004p6-7o; Wed, 17 Jun 2015 18:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HyR-0004oy-6N for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:07 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 79/21-29702-ECAB1855; Wed, 17 Jun 2015 18:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1434565324!14970564!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22254 invoked from network); 17 Jun 2015 18:22: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 Jun 2015 18:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HyO-00029j-AI for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HyN-0006n2-Ty for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:04 +0000 Date: Wed, 17 Jun 2015 18:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vMSI-X: support qword MMIO access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 284ffb4f9b0d5c3a33c4c5bd87645d0cc342ca96 Author: Jan Beulich AuthorDate: Thu Jun 11 11:52:18 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:52:18 2015 +0200 x86/vMSI-X: support qword MMIO access The specification explicitly provides for this, so we should have supported this from the beginning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmsi.c | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index cb87909..4968d39 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -223,7 +223,7 @@ static int msixtbl_read( unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - if ( len != 4 || (address & 3) ) + if ( (len != 4 && len != 8) || (address & (len - 1)) ) return r; rcu_read_lock(&msixtbl_rcu_lock); @@ -241,13 +241,25 @@ static int msixtbl_read( !acc_bit(test, entry, nr_entry, index) ) goto out; *pval = entry->gentries[nr_entry].msi_ad[index]; + if ( len == 8 ) + { + if ( index ) + offset = PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET; + else if ( acc_bit(test, entry, nr_entry, 1) ) + *pval |= (u64)entry->gentries[nr_entry].msi_ad[1] << 32; + else + goto out; + } } - else + if ( offset == PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { virt = msixtbl_addr_to_virt(entry, address); if ( !virt ) goto out; - *pval = readl(virt); + if ( len == 4 ) + *pval = readl(virt); + else + *pval |= (u64)readl(virt) << 32; } r = X86EMUL_OKAY; @@ -268,7 +280,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unsigned long flags, orig; struct irq_desc *desc; - if ( len != 4 || (address & 3) ) + if ( (len != 4 && len != 8) || (address & (len - 1)) ) return r; rcu_read_lock(&msixtbl_rcu_lock); @@ -279,16 +291,23 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); - if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET) + if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { + index = offset / sizeof(uint32_t); if ( nr_entry < MAX_MSIX_ACC_ENTRIES ) { - index = offset / sizeof(uint32_t); entry->gentries[nr_entry].msi_ad[index] = val; acc_bit(set, entry, nr_entry, index); + if ( len == 8 && !index ) + { + entry->gentries[nr_entry].msi_ad[1] = val >> 32; + acc_bit(set, entry, nr_entry, 1); + } } set_bit(nr_entry, &entry->table_flags); - goto out; + if ( len != 8 || !index ) + goto out; + val >>= 32; } /* Exit to device model when unmasking and address/data got modified. */ @@ -352,7 +371,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unlock: spin_unlock_irqrestore(&desc->lock, flags); - r = X86EMUL_OKAY; + if ( len == 4 ) + r = X86EMUL_OKAY; out: rcu_read_unlock(&msixtbl_rcu_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 Wed Jun 17 18:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hyc-0004s1-Ab; Wed, 17 Jun 2015 18:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyb-0004qn-5F for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:17 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id C3/A0-25881-8DAB1855; Wed, 17 Jun 2015 18:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434565334!14980575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5268 invoked from network); 17 Jun 2015 18:22:15 -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; 17 Jun 2015 18:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HyY-00029n-Ow for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HyY-0006o9-Dl for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:14 +0000 Date: Wed, 17 Jun 2015 18:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI-X: use qword MMIO access for address 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 73cb5d43a8f48930e4594ef7b15b974487651ffe Author: Jan Beulich AuthorDate: Thu Jun 11 11:53:20 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:53:20 2015 +0200 x86/MSI-X: use qword MMIO access for address writes Now that we support it for our guests, let's do so ourselves too. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msi.c | 8 ++------ xen/include/asm-x86/msi.h | 9 +++++++-- xen/include/xen/pci_regs.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e89f326..3527518 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -198,8 +198,7 @@ static void read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); - msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); + msg->address = readq(base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } @@ -260,10 +259,7 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - writel(msg->address_lo, - base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); - writel(msg->address_hi, - base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); + writeq(msg->address, base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); writel(msg->data, base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 4c62a3a..abbecf8 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -65,8 +65,13 @@ struct msi_info { }; struct msi_msg { - u32 address_lo; /* low 32 bits of msi message address */ - u32 address_hi; /* high 32 bits of msi message address */ + union { + u64 address; /* message address */ + struct { + u32 address_lo; /* message address low 32 bits */ + u32 address_hi; /* message address high 32 bits */ + }; + }; u32 data; /* 16 bits of msi message data */ u32 dest32; /* used when Interrupt Remapping with EIM is enabled */ }; diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index ecd6124..2de7847 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -307,6 +307,7 @@ #define PCI_MSIX_BIRMASK (7 << 0) #define PCI_MSIX_ENTRY_SIZE 16 +#define PCI_MSIX_ENTRY_ADDRESS_OFFSET 0 #define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET 0 #define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET 4 #define PCI_MSIX_ENTRY_DATA_OFFSET 8 -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hyc-0004s1-Ab; Wed, 17 Jun 2015 18:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyb-0004qn-5F for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:17 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id C3/A0-25881-8DAB1855; Wed, 17 Jun 2015 18:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434565334!14980575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5268 invoked from network); 17 Jun 2015 18:22:15 -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; 17 Jun 2015 18:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HyY-00029n-Ow for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HyY-0006o9-Dl for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:14 +0000 Date: Wed, 17 Jun 2015 18:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI-X: use qword MMIO access for address 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 73cb5d43a8f48930e4594ef7b15b974487651ffe Author: Jan Beulich AuthorDate: Thu Jun 11 11:53:20 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:53:20 2015 +0200 x86/MSI-X: use qword MMIO access for address writes Now that we support it for our guests, let's do so ourselves too. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msi.c | 8 ++------ xen/include/asm-x86/msi.h | 9 +++++++-- xen/include/xen/pci_regs.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e89f326..3527518 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -198,8 +198,7 @@ static void read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); - msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); + msg->address = readq(base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } @@ -260,10 +259,7 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - writel(msg->address_lo, - base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); - writel(msg->address_hi, - base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); + writeq(msg->address, base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); writel(msg->data, base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 4c62a3a..abbecf8 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -65,8 +65,13 @@ struct msi_info { }; struct msi_msg { - u32 address_lo; /* low 32 bits of msi message address */ - u32 address_hi; /* high 32 bits of msi message address */ + union { + u64 address; /* message address */ + struct { + u32 address_lo; /* message address low 32 bits */ + u32 address_hi; /* message address high 32 bits */ + }; + }; u32 data; /* 16 bits of msi message data */ u32 dest32; /* used when Interrupt Remapping with EIM is enabled */ }; diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index ecd6124..2de7847 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -307,6 +307,7 @@ #define PCI_MSIX_BIRMASK (7 << 0) #define PCI_MSIX_ENTRY_SIZE 16 +#define PCI_MSIX_ENTRY_ADDRESS_OFFSET 0 #define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET 0 #define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET 4 #define PCI_MSIX_ENTRY_DATA_OFFSET 8 -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:22:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hyn-0004ul-DJ; Wed, 17 Jun 2015 18:22:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyl-0004uI-LJ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:27 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 05/F5-21074-3EAB1855; Wed, 17 Jun 2015 18:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1434565345!11627444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32725 invoked from network); 17 Jun 2015 18:22:26 -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; 17 Jun 2015 18:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyj-00029z-9k for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hyi-0006og-TD for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:24 +0000 Date: Wed, 17 Jun 2015 18:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: use qword MMIO access for MSI address 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 ae05fd3912b153e18efa3018d9f7cf9105ea5b43 Author: Jan Beulich AuthorDate: Thu Jun 11 11:54:10 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:54:10 2015 +0200 VT-d: use qword MMIO access for MSI address writes Also make dmar_{read,write}q() actually do what their names suggest (we don't need to be concerned of 32-bit restrictions anymore). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 3 +-- xen/drivers/passthrough/vtd/iommu.h | 15 ++++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 9053a1f..6ef5a80 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1054,8 +1054,7 @@ static void dma_msi_set_affinity(struct irq_desc *desc, const cpumask_t *mask) spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FEDATA_REG, msg.data); - dmar_writel(iommu->reg, DMAR_FEADDR_REG, msg.address_lo); - dmar_writel(iommu->reg, DMAR_FEUADDR_REG, msg.address_hi); + dmar_writeq(iommu->reg, DMAR_FEADDR_REG, msg.address); spin_unlock_irqrestore(&iommu->register_lock, flags); } diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 80f8830..fbcaa06 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -51,17 +51,10 @@ #define DMAR_IRTA_REG 0xB8 /* intr remap */ #define OFFSET_STRIDE (9) -#define dmar_readl(dmar, reg) readl(dmar + reg) -#define dmar_writel(dmar, reg, val) writel(val, dmar + reg) -#define dmar_readq(dmar, reg) ({ \ - u32 lo, hi; \ - lo = dmar_readl(dmar, reg); \ - hi = dmar_readl(dmar, reg + 4); \ - (((u64) hi) << 32) + lo; }) -#define dmar_writeq(dmar, reg, val) do {\ - dmar_writel(dmar, reg, (u32)val); \ - dmar_writel(dmar, reg + 4, (u32)((u64) val >> 32)); \ - } while (0) +#define dmar_readl(dmar, reg) readl((dmar) + (reg)) +#define dmar_readq(dmar, reg) readq((dmar) + (reg)) +#define dmar_writel(dmar, reg, val) writel(val, (dmar) + (reg)) +#define dmar_writeq(dmar, reg, val) writeq(val, (dmar) + (reg)) #define VER_MAJOR(v) (((v) & 0xf0) >> 4) #define VER_MINOR(v) ((v) & 0x0f) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:22:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hyn-0004ul-DJ; Wed, 17 Jun 2015 18:22:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyl-0004uI-LJ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:27 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 05/F5-21074-3EAB1855; Wed, 17 Jun 2015 18:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1434565345!11627444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32725 invoked from network); 17 Jun 2015 18:22:26 -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; 17 Jun 2015 18:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyj-00029z-9k for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hyi-0006og-TD for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:24 +0000 Date: Wed, 17 Jun 2015 18:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: use qword MMIO access for MSI address 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 ae05fd3912b153e18efa3018d9f7cf9105ea5b43 Author: Jan Beulich AuthorDate: Thu Jun 11 11:54:10 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:54:10 2015 +0200 VT-d: use qword MMIO access for MSI address writes Also make dmar_{read,write}q() actually do what their names suggest (we don't need to be concerned of 32-bit restrictions anymore). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 3 +-- xen/drivers/passthrough/vtd/iommu.h | 15 ++++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 9053a1f..6ef5a80 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1054,8 +1054,7 @@ static void dma_msi_set_affinity(struct irq_desc *desc, const cpumask_t *mask) spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FEDATA_REG, msg.data); - dmar_writel(iommu->reg, DMAR_FEADDR_REG, msg.address_lo); - dmar_writel(iommu->reg, DMAR_FEUADDR_REG, msg.address_hi); + dmar_writeq(iommu->reg, DMAR_FEADDR_REG, msg.address); spin_unlock_irqrestore(&iommu->register_lock, flags); } diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 80f8830..fbcaa06 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -51,17 +51,10 @@ #define DMAR_IRTA_REG 0xB8 /* intr remap */ #define OFFSET_STRIDE (9) -#define dmar_readl(dmar, reg) readl(dmar + reg) -#define dmar_writel(dmar, reg, val) writel(val, dmar + reg) -#define dmar_readq(dmar, reg) ({ \ - u32 lo, hi; \ - lo = dmar_readl(dmar, reg); \ - hi = dmar_readl(dmar, reg + 4); \ - (((u64) hi) << 32) + lo; }) -#define dmar_writeq(dmar, reg, val) do {\ - dmar_writel(dmar, reg, (u32)val); \ - dmar_writel(dmar, reg + 4, (u32)((u64) val >> 32)); \ - } while (0) +#define dmar_readl(dmar, reg) readl((dmar) + (reg)) +#define dmar_readq(dmar, reg) readq((dmar) + (reg)) +#define dmar_writel(dmar, reg, val) writel(val, (dmar) + (reg)) +#define dmar_writeq(dmar, reg, val) writeq(val, (dmar) + (reg)) #define VER_MAJOR(v) (((v) & 0xf0) >> 4) #define VER_MINOR(v) ((v) & 0x0f) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hyx-0004x5-Fr; Wed, 17 Jun 2015 18:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyw-0004wv-6A for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:38 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 49/8C-28408-DEAB1855; Wed, 17 Jun 2015 18:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565355!12818916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30238 invoked from network); 17 Jun 2015 18:22:36 -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; 17 Jun 2015 18:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyt-0002A9-GC for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hyt-0006pD-Dv for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:35 +0000 Date: Wed, 17 Jun 2015 18:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: extend quirks to newer desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cdc6204b7749a53e6a4d95fac4440601c35a539d Author: Jan Beulich AuthorDate: Thu Jun 11 11:55:05 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:55:05 2015 +0200 VT-d: extend quirks to newer desktop chipsets We're being told that while on the server side the issue we're trying to work around is fixed starting with IvyBridge (another round of double checking is going on before we're going to remove the one IvyBridge ID that we're currently applying the workaround for), on the desktop side even Skylake still requires the workaround. Hence we need to add a whole bunch of desktop IDs. Signed-off-by: Jan Beulich Acked-by: Don Dugger --- xen/drivers/passthrough/vtd/quirks.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index b24fb12..69d29ab 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -503,9 +503,13 @@ void pci_vtd_quirk(const struct pci_dev *pdev) case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ - case 0x0a04: /* Haswell ULT */ - case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ - case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ + case 0x0a00: case 0x0a04: case 0x0a08: case 0x0a0f: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: case 0x0c0f: /* Haswell */ + case 0x0d00: case 0x0d04: case 0x0d08: case 0x0d0f: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: case 0x160f: /* Broadwell */ + case 0x1610: case 0x1614: case 0x1618: /* Broadwell */ + case 0x1900: case 0x1904: case 0x1908: case 0x190c: case 0x190f: /* Skylake */ + case 0x1910: case 0x1918: case 0x191f: /* Skylake */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hyx-0004x5-Fr; Wed, 17 Jun 2015 18:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyw-0004wv-6A for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:38 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 49/8C-28408-DEAB1855; Wed, 17 Jun 2015 18:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565355!12818916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30238 invoked from network); 17 Jun 2015 18:22:36 -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; 17 Jun 2015 18:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hyt-0002A9-GC for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hyt-0006pD-Dv for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:35 +0000 Date: Wed, 17 Jun 2015 18:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: extend quirks to newer desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cdc6204b7749a53e6a4d95fac4440601c35a539d Author: Jan Beulich AuthorDate: Thu Jun 11 11:55:05 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:55:05 2015 +0200 VT-d: extend quirks to newer desktop chipsets We're being told that while on the server side the issue we're trying to work around is fixed starting with IvyBridge (another round of double checking is going on before we're going to remove the one IvyBridge ID that we're currently applying the workaround for), on the desktop side even Skylake still requires the workaround. Hence we need to add a whole bunch of desktop IDs. Signed-off-by: Jan Beulich Acked-by: Don Dugger --- xen/drivers/passthrough/vtd/quirks.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index b24fb12..69d29ab 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -503,9 +503,13 @@ void pci_vtd_quirk(const struct pci_dev *pdev) case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ - case 0x0a04: /* Haswell ULT */ - case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ - case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ + case 0x0a00: case 0x0a04: case 0x0a08: case 0x0a0f: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: case 0x0c0f: /* Haswell */ + case 0x0d00: case 0x0d04: case 0x0d08: case 0x0d0f: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: case 0x160f: /* Broadwell */ + case 0x1610: case 0x1614: case 0x1618: /* Broadwell */ + case 0x1900: case 0x1904: case 0x1908: case 0x190c: case 0x190f: /* Skylake */ + case 0x1910: case 0x1918: case 0x191f: /* Skylake */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hz7-0004zM-IR; Wed, 17 Jun 2015 18: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 1Z5Hz6-0004z5-2t for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:48 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 49/39-32733-7FAB1855; Wed, 17 Jun 2015 18:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434565365!18166029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24307 invoked from network); 17 Jun 2015 18:22: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; 17 Jun 2015 18:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hz3-0002AM-LT for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hz3-0006pZ-KD for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:45 +0000 Date: Wed, 17 Jun 2015 18:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI/ARM: don't treat EfiBootServices{Code, Data} as normal RAM under /mapbs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44a84eac301fba0f5f4f430d8f81929ee22b1187 Author: Jan Beulich AuthorDate: Thu Jun 11 11:58:29 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:58:29 2015 +0200 EFI/ARM: don't treat EfiBootServices{Code,Data} as normal RAM under /mapbs Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 2a7aa13..6a12d91 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -132,9 +132,10 @@ static EFI_STATUS __init efi_process_memory_map_bootinfo(EFI_MEMORY_DESCRIPTOR * for ( Index = 0; Index < (mmap_size / desc_size); Index++ ) { - if ( desc_ptr->Type == EfiConventionalMemory - || desc_ptr->Type == EfiBootServicesCode - || desc_ptr->Type == EfiBootServicesData ) + if ( desc_ptr->Type == EfiConventionalMemory || + (!map_bs && + (desc_ptr->Type == EfiBootServicesCode || + desc_ptr->Type == EfiBootServicesData)) ) { if ( i >= NR_MEM_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 Wed Jun 17 18:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5Hz7-0004zM-IR; Wed, 17 Jun 2015 18: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 1Z5Hz6-0004z5-2t for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:48 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 49/39-32733-7FAB1855; Wed, 17 Jun 2015 18:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434565365!18166029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24307 invoked from network); 17 Jun 2015 18:22: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; 17 Jun 2015 18:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hz3-0002AM-LT for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hz3-0006pZ-KD for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:45 +0000 Date: Wed, 17 Jun 2015 18:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI/ARM: don't treat EfiBootServices{Code, Data} as normal RAM under /mapbs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44a84eac301fba0f5f4f430d8f81929ee22b1187 Author: Jan Beulich AuthorDate: Thu Jun 11 11:58:29 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 11:58:29 2015 +0200 EFI/ARM: don't treat EfiBootServices{Code,Data} as normal RAM under /mapbs Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 2a7aa13..6a12d91 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -132,9 +132,10 @@ static EFI_STATUS __init efi_process_memory_map_bootinfo(EFI_MEMORY_DESCRIPTOR * for ( Index = 0; Index < (mmap_size / desc_size); Index++ ) { - if ( desc_ptr->Type == EfiConventionalMemory - || desc_ptr->Type == EfiBootServicesCode - || desc_ptr->Type == EfiBootServicesData ) + if ( desc_ptr->Type == EfiConventionalMemory || + (!map_bs && + (desc_ptr->Type == EfiBootServicesCode || + desc_ptr->Type == EfiBootServicesData)) ) { if ( i >= NR_MEM_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 Wed Jun 17 18:22:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5HzH-00052X-Kq; Wed, 17 Jun 2015 18: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 1Z5HzG-00051w-3J for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:58 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id F2/AE-08467-10BB1855; Wed, 17 Jun 2015 18:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1434565376!14980086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27373 invoked from network); 17 Jun 2015 18: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; 17 Jun 2015 18:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzD-0002AX-SK for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HzD-0006pw-PW for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:55 +0000 Date: Wed, 17 Jun 2015 18:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d5c09d853d3f212861f70c577c65d1703f752ae Author: Jan Beulich AuthorDate: Thu Jun 11 14:44:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:44:12 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index dfb45f8..ca4c973 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2592,6 +2592,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:22:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5HzH-00052X-Kq; Wed, 17 Jun 2015 18: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 1Z5HzG-00051w-3J for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:58 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id F2/AE-08467-10BB1855; Wed, 17 Jun 2015 18:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1434565376!14980086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27373 invoked from network); 17 Jun 2015 18: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; 17 Jun 2015 18:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzD-0002AX-SK for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HzD-0006pw-PW for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:22:55 +0000 Date: Wed, 17 Jun 2015 18:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: add missing version check to GNTTABOP_swap_grant_ref handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d5c09d853d3f212861f70c577c65d1703f752ae Author: Jan Beulich AuthorDate: Thu Jun 11 14:44:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:44:12 2015 +0200 gnttab: add missing version check to GNTTABOP_swap_grant_ref handling ... avoiding NULL derefs when the version to use wasn't set yet (via GNTTABOP_setup_table or GNTTABOP_set_version). This is CVE-2015-4163 / XSA-134. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/grant_table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index dfb45f8..ca4c973 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2592,6 +2592,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) spin_lock(>->lock); + if ( gt->gt_version == 0 ) + PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); + /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:23:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5HzT-00055H-Nc; Wed, 17 Jun 2015 18:23:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzS-00054o-Fq for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:10 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 8D/02-29702-D0BB1855; Wed, 17 Jun 2015 18:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1434565386!15005041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27647 invoked from network); 17 Jun 2015 18:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzO-0002B7-2N for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HzO-0006qa-04 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:06 +0000 Date: Wed, 17 Jun 2015 18:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f0721377952fc038b48f175d7061ec701359aac Author: Andrew Cooper AuthorDate: Thu Jun 11 14:44:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:44:47 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 4b6b900..2dae0c7 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:23:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5HzT-00055H-Nc; Wed, 17 Jun 2015 18:23:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzS-00054o-Fq for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:10 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 8D/02-29702-D0BB1855; Wed, 17 Jun 2015 18:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1434565386!15005041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27647 invoked from network); 17 Jun 2015 18:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzO-0002B7-2N for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HzO-0006qa-04 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:06 +0000 Date: Wed, 17 Jun 2015 18:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: loop in the correct direction in compat_iret() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f0721377952fc038b48f175d7061ec701359aac Author: Andrew Cooper AuthorDate: Thu Jun 11 14:44:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:44:47 2015 +0200 x86/traps: loop in the correct direction in compat_iret() This is CVE-2015-4164 / XSA-136. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/compat/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 4b6b900..2dae0c7 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -119,7 +119,7 @@ unsigned int compat_iret(void) } else if ( ksp > regs->_esp ) { - for (i = 9; i > 0; ++i) + for ( i = 9; i > 0; --i ) { rc |= __get_user(x, (u32 *)regs->rsp + i); rc |= __put_user(x, (u32 *)(unsigned long)ksp + i); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:23:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5Hzb-000578-QD; Wed, 17 Jun 2015 18:23:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hza-00056m-Jp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:18 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id AD/B0-31258-61BB1855; Wed, 17 Jun 2015 18:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1434565396!24296506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3476 invoked from network); 17 Jun 2015 18:23:17 -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; 17 Jun 2015 18:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzY-0002BF-6m for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HzY-0006rZ-5O for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:16 +0000 Date: Wed, 17 Jun 2015 18:23:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: map allocation size must be set to zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c94684bb7c20ff01d03fb1f22c03cc0c2fc417b Author: Jan Beulich AuthorDate: Thu Jun 11 14:47:54 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:47:54 2015 +0200 EFI: map allocation size must be set to zero Commit 8a753b3f1c ("efi: fix allocation problems if ExitBootServices() fails") replaced the use of a static (and hence zero-initialized) variable by an automatic (and hence uninitialized) one. Also drop the variable introduced by that commit in favor of re-using another available and suitable one. Signed-off-by: Jan Beulich Acked-by: Ross Lagerwall Acked-by: Ian Campbell --- xen/common/efi/boot.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 22f4841..75a939f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -707,7 +707,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_STATUS status; unsigned int i, argc; CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; - UINTN map_alloc_size, map_key, info_size, gop_mode = ~0; + UINTN map_key, info_size, gop_mode = ~0; EFI_HANDLE *handles = NULL; EFI_SHIM_LOCK_PROTOCOL *shim_lock; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; @@ -1064,16 +1064,17 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_video_init(gop, info_size, mode_info); } - efi_bs->GetMemoryMap(&map_alloc_size, NULL, &map_key, + info_size = 0; + efi_bs->GetMemoryMap(&info_size, NULL, &map_key, &efi_mdesc_size, &mdesc_ver); - map_alloc_size += 8 * efi_mdesc_size; - efi_memmap = efi_arch_allocate_mmap_buffer(map_alloc_size); + info_size += 8 * efi_mdesc_size; + efi_memmap = efi_arch_allocate_mmap_buffer(info_size); if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); for ( retry = 0; ; retry = 1 ) { - efi_memmap_size = map_alloc_size; + efi_memmap_size = info_size; status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_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 Wed Jun 17 18:23:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5Hzb-000578-QD; Wed, 17 Jun 2015 18:23:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hza-00056m-Jp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:18 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id AD/B0-31258-61BB1855; Wed, 17 Jun 2015 18:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1434565396!24296506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3476 invoked from network); 17 Jun 2015 18:23:17 -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; 17 Jun 2015 18:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5HzY-0002BF-6m for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5HzY-0006rZ-5O for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:16 +0000 Date: Wed, 17 Jun 2015 18:23:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: map allocation size must be set to zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c94684bb7c20ff01d03fb1f22c03cc0c2fc417b Author: Jan Beulich AuthorDate: Thu Jun 11 14:47:54 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 11 14:47:54 2015 +0200 EFI: map allocation size must be set to zero Commit 8a753b3f1c ("efi: fix allocation problems if ExitBootServices() fails") replaced the use of a static (and hence zero-initialized) variable by an automatic (and hence uninitialized) one. Also drop the variable introduced by that commit in favor of re-using another available and suitable one. Signed-off-by: Jan Beulich Acked-by: Ross Lagerwall Acked-by: Ian Campbell --- xen/common/efi/boot.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 22f4841..75a939f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -707,7 +707,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_STATUS status; unsigned int i, argc; CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; - UINTN map_alloc_size, map_key, info_size, gop_mode = ~0; + UINTN map_key, info_size, gop_mode = ~0; EFI_HANDLE *handles = NULL; EFI_SHIM_LOCK_PROTOCOL *shim_lock; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; @@ -1064,16 +1064,17 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_video_init(gop, info_size, mode_info); } - efi_bs->GetMemoryMap(&map_alloc_size, NULL, &map_key, + info_size = 0; + efi_bs->GetMemoryMap(&info_size, NULL, &map_key, &efi_mdesc_size, &mdesc_ver); - map_alloc_size += 8 * efi_mdesc_size; - efi_memmap = efi_arch_allocate_mmap_buffer(map_alloc_size); + info_size += 8 * efi_mdesc_size; + efi_memmap = efi_arch_allocate_mmap_buffer(info_size); if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); for ( retry = 0; ; retry = 1 ) { - efi_memmap_size = map_alloc_size; + efi_memmap_size = info_size; status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_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 Wed Jun 17 18:23:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5Hzm-00059j-Vf; Wed, 17 Jun 2015 18:23:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzl-00059Q-Fh for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:29 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 7B/1F-08467-02BB1855; Wed, 17 Jun 2015 18:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565406!7400250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18072 invoked from network); 17 Jun 2015 18:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzi-0002BK-B9 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hzi-0006rv-9e for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:26 +0000 Date: Wed, 17 Jun 2015 18:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: prefer is_..._domain() over is_..._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 ee78176f98f60ad6de32faabba46d863b75ceb28 Author: Jan Beulich AuthorDate: Fri Jun 12 12:02:12 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:02:12 2015 +0200 domctl: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/domctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index e571e76..ce517a7 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -495,7 +495,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; #ifdef CONFIG_COMPAT - if ( !is_pv_32on64_vcpu(v) ) + if ( !is_pv_32on64_domain(d) ) ret = copy_from_guest(c.nat, op->u.vcpucontext.ctxt, 1); else ret = copy_from_guest(c.cmp, @@ -901,7 +901,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) vcpu_unpause(v); #ifdef CONFIG_COMPAT - if ( !is_pv_32on64_vcpu(v) ) + if ( !is_pv_32on64_domain(d) ) ret = copy_to_guest(op->u.vcpucontext.ctxt, c.nat, 1); else ret = copy_to_guest(guest_handle_cast(op->u.vcpucontext.ctxt, -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:23:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5Hzm-00059j-Vf; Wed, 17 Jun 2015 18:23:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzl-00059Q-Fh for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:29 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 7B/1F-08467-02BB1855; Wed, 17 Jun 2015 18:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565406!7400250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18072 invoked from network); 17 Jun 2015 18:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzi-0002BK-B9 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hzi-0006rv-9e for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:26 +0000 Date: Wed, 17 Jun 2015 18:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: prefer is_..._domain() over is_..._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 ee78176f98f60ad6de32faabba46d863b75ceb28 Author: Jan Beulich AuthorDate: Fri Jun 12 12:02:12 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:02:12 2015 +0200 domctl: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/domctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index e571e76..ce517a7 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -495,7 +495,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; #ifdef CONFIG_COMPAT - if ( !is_pv_32on64_vcpu(v) ) + if ( !is_pv_32on64_domain(d) ) ret = copy_from_guest(c.nat, op->u.vcpucontext.ctxt, 1); else ret = copy_from_guest(c.cmp, @@ -901,7 +901,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) vcpu_unpause(v); #ifdef CONFIG_COMPAT - if ( !is_pv_32on64_vcpu(v) ) + if ( !is_pv_32on64_domain(d) ) ret = copy_to_guest(op->u.vcpucontext.ctxt, c.nat, 1); else ret = copy_to_guest(guest_handle_cast(op->u.vcpucontext.ctxt, -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:23:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5Hzx-0005Br-2C; Wed, 17 Jun 2015 18:23:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzv-0005BI-4E for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:39 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 54/E1-08244-A2BB1855; Wed, 17 Jun 2015 18:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565416!7400278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21475 invoked from network); 17 Jun 2015 18:23:37 -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; 17 Jun 2015 18:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzs-0002BX-HH for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hzs-0006uF-Fb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:36 +0000 Date: Wed, 17 Jun 2015 18:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: prefer is_..._domain() over is_..._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 67a35cd752741d855b177b4d7b11b5ec80707e00 Author: Jan Beulich AuthorDate: Fri Jun 12 12:03:13 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:03:13 2015 +0200 x86: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available or such operations occur frequently in a function. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 14 +++++++------- xen/arch/x86/domctl.c | 13 +++++++------ xen/arch/x86/traps.c | 27 ++++++++++++++------------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index db073a6..93e491d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -481,7 +481,7 @@ int vcpu_initialise(struct vcpu *v) v->arch.pv_vcpu.ctrlreg[4] = real_cr4_to_pv_guest_cr4(mmu_cr4_features); - rc = is_pv_32on64_vcpu(v) ? setup_compat_l4(v) : 0; + rc = is_pv_32on64_domain(d) ? setup_compat_l4(v) : 0; done: if ( rc ) { @@ -722,7 +722,7 @@ int arch_set_info_guest( #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld)) flags = c(flags); - if ( is_pv_vcpu(v) ) + if ( is_pv_domain(d) ) { if ( !compat ) { @@ -763,7 +763,7 @@ int arch_set_info_guest( (c(ldt_ents) > 8192) ) return -EINVAL; } - else if ( is_pvh_vcpu(v) ) + else if ( is_pvh_domain(d) ) { /* PVH 32bitfixme */ ASSERT(!compat); @@ -781,7 +781,7 @@ int arch_set_info_guest( v->fpu_initialised = !!(flags & VGCF_I387_VALID); v->arch.flags &= ~TF_kernel_mode; - if ( (flags & VGCF_in_kernel) || has_hvm_container_vcpu(v)/*???*/ ) + if ( (flags & VGCF_in_kernel) || has_hvm_container_domain(d)/*???*/ ) v->arch.flags |= TF_kernel_mode; v->arch.vgc_flags = flags; @@ -796,7 +796,7 @@ int arch_set_info_guest( if ( !compat ) { memcpy(&v->arch.user_regs, &c.nat->user_regs, sizeof(c.nat->user_regs)); - if ( is_pv_vcpu(v) ) + if ( is_pv_domain(d) ) memcpy(v->arch.pv_vcpu.trap_ctxt, c.nat->trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -808,14 +808,14 @@ int arch_set_info_guest( c.cmp->trap_ctxt + i); } - if ( has_hvm_container_vcpu(v) ) + if ( has_hvm_container_domain(d) ) { for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) v->arch.debugreg[i] = c(debugreg[i]); hvm_set_info_guest(v); - if ( is_hvm_vcpu(v) || v->is_initialised ) + if ( is_hvm_domain(d) || v->is_initialised ) goto out; /* NB: No need to use PV cr3 un-pickling macros */ diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 1d3854f..c61cacd 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1150,10 +1150,11 @@ CHECK_FIELD_(struct, vcpu_guest_context, fpu_ctxt); void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) { unsigned int i; - bool_t compat = is_pv_32on64_domain(v->domain); + const struct domain *d = v->domain; + bool_t compat = is_pv_32on64_domain(d); #define c(fld) (!compat ? (c.nat->fld) : (c.cmp->fld)) - if ( !is_pv_vcpu(v) ) + if ( !is_pv_domain(d) ) memset(c.nat, 0, sizeof(*c.nat)); memcpy(&c.nat->fpu_ctxt, v->arch.fpu_ctxt, sizeof(c.nat->fpu_ctxt)); c(flags = v->arch.vgc_flags & ~(VGCF_i387_valid|VGCF_in_kernel)); @@ -1164,7 +1165,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) if ( !compat ) { memcpy(&c.nat->user_regs, &v->arch.user_regs, sizeof(c.nat->user_regs)); - if ( is_pv_vcpu(v) ) + if ( is_pv_domain(d) ) memcpy(c.nat->trap_ctxt, v->arch.pv_vcpu.trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -1179,7 +1180,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) c(debugreg[i] = v->arch.debugreg[i]); - if ( has_hvm_container_vcpu(v) ) + if ( has_hvm_container_domain(d) ) { struct segment_register sreg; @@ -1245,7 +1246,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) BUG_ON((c(user_regs.eflags) & X86_EFLAGS_IOPL) != 0); c(user_regs.eflags |= v->arch.pv_vcpu.iopl << 12); - if ( !is_pv_32on64_domain(v->domain) ) + if ( !compat ) { c.nat->ctrlreg[3] = xen_pfn_to_cr3( pagetable_get_pfn(v->arch.guest_table)); @@ -1274,7 +1275,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c(flags |= VGCF_in_kernel); } - c(vm_assist = v->domain->vm_assist); + c(vm_assist = d->vm_assist); #undef c } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index bfa46ee..b6c69c9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -749,16 +749,16 @@ int wrmsr_hypervisor_regs(uint32_t idx, uint64_t val) int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - struct domain *d = current->domain; + struct domain *currd = current->domain; /* Optionally shift out of the way of Viridian architectural leaves. */ - uint32_t base = is_viridian_domain(d) ? 0x40000100 : 0x40000000; + uint32_t base = is_viridian_domain(currd) ? 0x40000100 : 0x40000000; uint32_t limit, dummy; idx -= base; if ( idx > XEN_CPUID_MAX_NUM_LEAVES ) return 0; /* Avoid unnecessary pass through domain_cpuid() */ - domain_cpuid(d, base, 0, &limit, &dummy, &dummy, &dummy); + domain_cpuid(currd, base, 0, &limit, &dummy, &dummy, &dummy); if ( limit == 0 ) /* Default number of leaves */ limit = XEN_CPUID_MAX_NUM_LEAVES; @@ -794,11 +794,11 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, case 2: *eax = 1; /* Number of hypercall-transfer pages */ *ebx = 0x40000000; /* MSR base address */ - if ( is_viridian_domain(d) ) + if ( is_viridian_domain(currd) ) *ebx = 0x40000200; *ecx = 0; /* Features 1 */ *edx = 0; /* Features 2 */ - if ( is_pv_vcpu(current) ) + if ( is_pv_domain(currd) ) *ecx |= XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD; break; @@ -822,18 +822,19 @@ void pv_cpuid(struct cpu_user_regs *regs) { uint32_t a, b, c, d; struct vcpu *curr = current; + struct domain *currd = curr->domain; a = regs->eax; b = regs->ebx; c = regs->ecx; d = regs->edx; - if ( !is_control_domain(curr->domain) && !is_hardware_domain(curr->domain) ) + if ( !is_control_domain(currd) && !is_hardware_domain(currd) ) { unsigned int cpuid_leaf = a, sub_leaf = c; if ( !cpuid_hypervisor_leaves(a, c, &a, &b, &c, &d) ) - domain_cpuid(curr->domain, a, c, &a, &b, &c, &d); + domain_cpuid(currd, a, c, &a, &b, &c, &d); switch ( cpuid_leaf ) { @@ -849,7 +850,7 @@ void pv_cpuid(struct cpu_user_regs *regs) { if ( !(curr->arch.xcr0 & (1ULL << sub_leaf)) ) continue; - domain_cpuid(curr->domain, cpuid_leaf, sub_leaf, + domain_cpuid(currd, cpuid_leaf, sub_leaf, &_eax, &_ebx, &_ecx, &_edx); if ( (_eax + _ebx) > b ) b = _eax + _ebx; @@ -869,7 +870,7 @@ void pv_cpuid(struct cpu_user_regs *regs) if ( !cpu_has_apic ) __clear_bit(X86_FEATURE_APIC, &d); - if ( !is_pvh_vcpu(curr) ) + if ( !is_pvh_domain(currd) ) { __clear_bit(X86_FEATURE_PSE, &d); __clear_bit(X86_FEATURE_PGE, &d); @@ -887,7 +888,7 @@ void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_DS, &d); __clear_bit(X86_FEATURE_ACC, &d); __clear_bit(X86_FEATURE_PBE, &d); - if ( is_pvh_vcpu(curr) ) + if ( is_pvh_domain(currd) ) __clear_bit(X86_FEATURE_MTRR, &d); __clear_bit(X86_FEATURE_DTES64 % 32, &c); @@ -896,7 +897,7 @@ void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_VMXE % 32, &c); __clear_bit(X86_FEATURE_SMXE % 32, &c); __clear_bit(X86_FEATURE_TM2 % 32, &c); - if ( is_pv_32bit_vcpu(curr) ) + if ( is_pv_32bit_domain(currd) ) __clear_bit(X86_FEATURE_CX16 % 32, &c); __clear_bit(X86_FEATURE_XTPR % 32, &c); __clear_bit(X86_FEATURE_PDCM % 32, &c); @@ -945,12 +946,12 @@ void pv_cpuid(struct cpu_user_regs *regs) case 0x80000001: /* Modify Feature Information. */ - if ( is_pv_32bit_vcpu(curr) ) + if ( is_pv_32bit_domain(currd) ) { __clear_bit(X86_FEATURE_LM % 32, &d); __clear_bit(X86_FEATURE_LAHF_LM % 32, &c); } - if ( is_pv_32on64_vcpu(curr) && + if ( is_pv_32on64_domain(currd) && boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) __clear_bit(X86_FEATURE_SYSCALL % 32, &d); __clear_bit(X86_FEATURE_PAGE1GB % 32, &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 Wed Jun 17 18:23:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5Hzx-0005Br-2C; Wed, 17 Jun 2015 18:23:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzv-0005BI-4E for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:39 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 54/E1-08244-A2BB1855; Wed, 17 Jun 2015 18:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565416!7400278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21475 invoked from network); 17 Jun 2015 18:23:37 -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; 17 Jun 2015 18:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5Hzs-0002BX-HH for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5Hzs-0006uF-Fb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:36 +0000 Date: Wed, 17 Jun 2015 18:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: prefer is_..._domain() over is_..._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 67a35cd752741d855b177b4d7b11b5ec80707e00 Author: Jan Beulich AuthorDate: Fri Jun 12 12:03:13 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:03:13 2015 +0200 x86: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available or such operations occur frequently in a function. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 14 +++++++------- xen/arch/x86/domctl.c | 13 +++++++------ xen/arch/x86/traps.c | 27 ++++++++++++++------------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index db073a6..93e491d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -481,7 +481,7 @@ int vcpu_initialise(struct vcpu *v) v->arch.pv_vcpu.ctrlreg[4] = real_cr4_to_pv_guest_cr4(mmu_cr4_features); - rc = is_pv_32on64_vcpu(v) ? setup_compat_l4(v) : 0; + rc = is_pv_32on64_domain(d) ? setup_compat_l4(v) : 0; done: if ( rc ) { @@ -722,7 +722,7 @@ int arch_set_info_guest( #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld)) flags = c(flags); - if ( is_pv_vcpu(v) ) + if ( is_pv_domain(d) ) { if ( !compat ) { @@ -763,7 +763,7 @@ int arch_set_info_guest( (c(ldt_ents) > 8192) ) return -EINVAL; } - else if ( is_pvh_vcpu(v) ) + else if ( is_pvh_domain(d) ) { /* PVH 32bitfixme */ ASSERT(!compat); @@ -781,7 +781,7 @@ int arch_set_info_guest( v->fpu_initialised = !!(flags & VGCF_I387_VALID); v->arch.flags &= ~TF_kernel_mode; - if ( (flags & VGCF_in_kernel) || has_hvm_container_vcpu(v)/*???*/ ) + if ( (flags & VGCF_in_kernel) || has_hvm_container_domain(d)/*???*/ ) v->arch.flags |= TF_kernel_mode; v->arch.vgc_flags = flags; @@ -796,7 +796,7 @@ int arch_set_info_guest( if ( !compat ) { memcpy(&v->arch.user_regs, &c.nat->user_regs, sizeof(c.nat->user_regs)); - if ( is_pv_vcpu(v) ) + if ( is_pv_domain(d) ) memcpy(v->arch.pv_vcpu.trap_ctxt, c.nat->trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -808,14 +808,14 @@ int arch_set_info_guest( c.cmp->trap_ctxt + i); } - if ( has_hvm_container_vcpu(v) ) + if ( has_hvm_container_domain(d) ) { for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) v->arch.debugreg[i] = c(debugreg[i]); hvm_set_info_guest(v); - if ( is_hvm_vcpu(v) || v->is_initialised ) + if ( is_hvm_domain(d) || v->is_initialised ) goto out; /* NB: No need to use PV cr3 un-pickling macros */ diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 1d3854f..c61cacd 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1150,10 +1150,11 @@ CHECK_FIELD_(struct, vcpu_guest_context, fpu_ctxt); void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) { unsigned int i; - bool_t compat = is_pv_32on64_domain(v->domain); + const struct domain *d = v->domain; + bool_t compat = is_pv_32on64_domain(d); #define c(fld) (!compat ? (c.nat->fld) : (c.cmp->fld)) - if ( !is_pv_vcpu(v) ) + if ( !is_pv_domain(d) ) memset(c.nat, 0, sizeof(*c.nat)); memcpy(&c.nat->fpu_ctxt, v->arch.fpu_ctxt, sizeof(c.nat->fpu_ctxt)); c(flags = v->arch.vgc_flags & ~(VGCF_i387_valid|VGCF_in_kernel)); @@ -1164,7 +1165,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) if ( !compat ) { memcpy(&c.nat->user_regs, &v->arch.user_regs, sizeof(c.nat->user_regs)); - if ( is_pv_vcpu(v) ) + if ( is_pv_domain(d) ) memcpy(c.nat->trap_ctxt, v->arch.pv_vcpu.trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -1179,7 +1180,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) c(debugreg[i] = v->arch.debugreg[i]); - if ( has_hvm_container_vcpu(v) ) + if ( has_hvm_container_domain(d) ) { struct segment_register sreg; @@ -1245,7 +1246,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) BUG_ON((c(user_regs.eflags) & X86_EFLAGS_IOPL) != 0); c(user_regs.eflags |= v->arch.pv_vcpu.iopl << 12); - if ( !is_pv_32on64_domain(v->domain) ) + if ( !compat ) { c.nat->ctrlreg[3] = xen_pfn_to_cr3( pagetable_get_pfn(v->arch.guest_table)); @@ -1274,7 +1275,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c(flags |= VGCF_in_kernel); } - c(vm_assist = v->domain->vm_assist); + c(vm_assist = d->vm_assist); #undef c } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index bfa46ee..b6c69c9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -749,16 +749,16 @@ int wrmsr_hypervisor_regs(uint32_t idx, uint64_t val) int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - struct domain *d = current->domain; + struct domain *currd = current->domain; /* Optionally shift out of the way of Viridian architectural leaves. */ - uint32_t base = is_viridian_domain(d) ? 0x40000100 : 0x40000000; + uint32_t base = is_viridian_domain(currd) ? 0x40000100 : 0x40000000; uint32_t limit, dummy; idx -= base; if ( idx > XEN_CPUID_MAX_NUM_LEAVES ) return 0; /* Avoid unnecessary pass through domain_cpuid() */ - domain_cpuid(d, base, 0, &limit, &dummy, &dummy, &dummy); + domain_cpuid(currd, base, 0, &limit, &dummy, &dummy, &dummy); if ( limit == 0 ) /* Default number of leaves */ limit = XEN_CPUID_MAX_NUM_LEAVES; @@ -794,11 +794,11 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, case 2: *eax = 1; /* Number of hypercall-transfer pages */ *ebx = 0x40000000; /* MSR base address */ - if ( is_viridian_domain(d) ) + if ( is_viridian_domain(currd) ) *ebx = 0x40000200; *ecx = 0; /* Features 1 */ *edx = 0; /* Features 2 */ - if ( is_pv_vcpu(current) ) + if ( is_pv_domain(currd) ) *ecx |= XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD; break; @@ -822,18 +822,19 @@ void pv_cpuid(struct cpu_user_regs *regs) { uint32_t a, b, c, d; struct vcpu *curr = current; + struct domain *currd = curr->domain; a = regs->eax; b = regs->ebx; c = regs->ecx; d = regs->edx; - if ( !is_control_domain(curr->domain) && !is_hardware_domain(curr->domain) ) + if ( !is_control_domain(currd) && !is_hardware_domain(currd) ) { unsigned int cpuid_leaf = a, sub_leaf = c; if ( !cpuid_hypervisor_leaves(a, c, &a, &b, &c, &d) ) - domain_cpuid(curr->domain, a, c, &a, &b, &c, &d); + domain_cpuid(currd, a, c, &a, &b, &c, &d); switch ( cpuid_leaf ) { @@ -849,7 +850,7 @@ void pv_cpuid(struct cpu_user_regs *regs) { if ( !(curr->arch.xcr0 & (1ULL << sub_leaf)) ) continue; - domain_cpuid(curr->domain, cpuid_leaf, sub_leaf, + domain_cpuid(currd, cpuid_leaf, sub_leaf, &_eax, &_ebx, &_ecx, &_edx); if ( (_eax + _ebx) > b ) b = _eax + _ebx; @@ -869,7 +870,7 @@ void pv_cpuid(struct cpu_user_regs *regs) if ( !cpu_has_apic ) __clear_bit(X86_FEATURE_APIC, &d); - if ( !is_pvh_vcpu(curr) ) + if ( !is_pvh_domain(currd) ) { __clear_bit(X86_FEATURE_PSE, &d); __clear_bit(X86_FEATURE_PGE, &d); @@ -887,7 +888,7 @@ void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_DS, &d); __clear_bit(X86_FEATURE_ACC, &d); __clear_bit(X86_FEATURE_PBE, &d); - if ( is_pvh_vcpu(curr) ) + if ( is_pvh_domain(currd) ) __clear_bit(X86_FEATURE_MTRR, &d); __clear_bit(X86_FEATURE_DTES64 % 32, &c); @@ -896,7 +897,7 @@ void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_VMXE % 32, &c); __clear_bit(X86_FEATURE_SMXE % 32, &c); __clear_bit(X86_FEATURE_TM2 % 32, &c); - if ( is_pv_32bit_vcpu(curr) ) + if ( is_pv_32bit_domain(currd) ) __clear_bit(X86_FEATURE_CX16 % 32, &c); __clear_bit(X86_FEATURE_XTPR % 32, &c); __clear_bit(X86_FEATURE_PDCM % 32, &c); @@ -945,12 +946,12 @@ void pv_cpuid(struct cpu_user_regs *regs) case 0x80000001: /* Modify Feature Information. */ - if ( is_pv_32bit_vcpu(curr) ) + if ( is_pv_32bit_domain(currd) ) { __clear_bit(X86_FEATURE_LM % 32, &d); __clear_bit(X86_FEATURE_LAHF_LM % 32, &c); } - if ( is_pv_32on64_vcpu(curr) && + if ( is_pv_32on64_domain(currd) && boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) __clear_bit(X86_FEATURE_SYSCALL % 32, &d); __clear_bit(X86_FEATURE_PAGE1GB % 32, &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 Wed Jun 17 18:23:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5I08-0005EQ-4p; Wed, 17 Jun 2015 18:23:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I07-0005Dq-Nx for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:51 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 22/2A-25925-43BB1855; Wed, 17 Jun 2015 18:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565427!7400300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25225 invoked from network); 17 Jun 2015 18:23:47 -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; 17 Jun 2015 18:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I02-0002Bj-Rw for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I02-0006ue-MQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:46 +0000 Date: Wed, 17 Jun 2015 18:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: prefer is_..._domain() over is_..._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 c6e24bdc1bcd6c7736326ddc24104a597e754103 Author: Jan Beulich AuthorDate: Fri Jun 12 12:03:56 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:03:56 2015 +0200 x86/HVM: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available or such operations occur frequently in a function. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 23 +++++++++++------------ xen/arch/x86/hvm/vmx/vmcs.c | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2736802..65baa1b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -445,7 +445,7 @@ void hvm_do_resume(struct vcpu *v) check_wakeup_from_wait(); - if ( is_hvm_vcpu(v) ) + if ( is_hvm_domain(d) ) pt_restore_timer(v); list_for_each_entry ( s, @@ -2312,7 +2312,7 @@ int hvm_vcpu_initialise(struct vcpu *v) v->arch.hvm_vcpu.inject_trap.vector = -1; - if ( is_pvh_vcpu(v) ) + if ( is_pvh_domain(d) ) { v->arch.hvm_vcpu.hcall_64bit = 1; /* PVH 32bitfixme. */ /* This is for hvm_long_mode_enabled(v). */ @@ -2364,9 +2364,7 @@ int hvm_vcpu_initialise(struct vcpu *v) void hvm_vcpu_destroy(struct vcpu *v) { - struct domain *d = v->domain; - - hvm_all_ioreq_servers_remove_vcpu(d, v); + hvm_all_ioreq_servers_remove_vcpu(v->domain, v); nestedhvm_vcpu_destroy(v); @@ -4921,6 +4919,7 @@ extern const uint8_t hypercall_args_table[], compat_hypercall_args_table[]; int hvm_do_hypercall(struct cpu_user_regs *regs) { struct vcpu *curr = current; + struct domain *currd = curr->domain; struct segment_register sreg; int mode = hvm_guest_x86_mode(curr); uint32_t eax = regs->eax; @@ -4941,12 +4940,12 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) break; } - if ( (eax & 0x80000000) && is_viridian_domain(curr->domain) ) + if ( (eax & 0x80000000) && is_viridian_domain(currd) ) return viridian_hypercall(regs); if ( (eax >= NR_hypercalls) || - (is_pvh_vcpu(curr) ? !pvh_hypercall64_table[eax] - : !hvm_hypercall32_table[eax]) ) + (is_pvh_domain(currd) ? !pvh_hypercall64_table[eax] + : !hvm_hypercall32_table[eax]) ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -4980,7 +4979,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) #endif curr->arch.hvm_vcpu.hcall_64bit = 1; - regs->rax = (is_pvh_vcpu(curr) + regs->rax = (is_pvh_domain(currd) ? pvh_hypercall64_table : hvm_hypercall64_table)[eax](rdi, rsi, rdx, r10, r8, r9); curr->arch.hvm_vcpu.hcall_64bit = 0; @@ -5001,7 +5000,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif } - else if ( unlikely(is_pvh_vcpu(curr)) ) + else if ( unlikely(is_pvh_domain(currd)) ) regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ else { @@ -5053,8 +5052,8 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( curr->arch.hvm_vcpu.hcall_preempted ) return HVM_HCALL_preempted; - if ( unlikely(curr->domain->arch.hvm_domain.qemu_mapcache_invalidate) && - test_and_clear_bool(curr->domain->arch.hvm_domain. + if ( unlikely(currd->arch.hvm_domain.qemu_mapcache_invalidate) && + test_and_clear_bool(currd->arch.hvm_domain. qemu_mapcache_invalidate) ) return HVM_HCALL_invalidate; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 3aff365..4c5ceb5 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1207,7 +1207,7 @@ static int construct_vmcs(struct vcpu *v) vmx_vmcs_exit(v); /* PVH: paging mode is updated by arch_set_info_guest(). */ - if ( is_hvm_vcpu(v) ) + if ( is_hvm_domain(d) ) { /* will update HOST & GUEST_CR3 as reqd */ paging_update_paging_modes(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:23:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:23: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 1Z5I08-0005EQ-4p; Wed, 17 Jun 2015 18:23:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I07-0005Dq-Nx for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:51 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 22/2A-25925-43BB1855; Wed, 17 Jun 2015 18:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565427!7400300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25225 invoked from network); 17 Jun 2015 18:23:47 -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; 17 Jun 2015 18:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I02-0002Bj-Rw for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I02-0006ue-MQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:46 +0000 Date: Wed, 17 Jun 2015 18:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: prefer is_..._domain() over is_..._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 c6e24bdc1bcd6c7736326ddc24104a597e754103 Author: Jan Beulich AuthorDate: Fri Jun 12 12:03:56 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:03:56 2015 +0200 x86/HVM: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available or such operations occur frequently in a function. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 23 +++++++++++------------ xen/arch/x86/hvm/vmx/vmcs.c | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2736802..65baa1b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -445,7 +445,7 @@ void hvm_do_resume(struct vcpu *v) check_wakeup_from_wait(); - if ( is_hvm_vcpu(v) ) + if ( is_hvm_domain(d) ) pt_restore_timer(v); list_for_each_entry ( s, @@ -2312,7 +2312,7 @@ int hvm_vcpu_initialise(struct vcpu *v) v->arch.hvm_vcpu.inject_trap.vector = -1; - if ( is_pvh_vcpu(v) ) + if ( is_pvh_domain(d) ) { v->arch.hvm_vcpu.hcall_64bit = 1; /* PVH 32bitfixme. */ /* This is for hvm_long_mode_enabled(v). */ @@ -2364,9 +2364,7 @@ int hvm_vcpu_initialise(struct vcpu *v) void hvm_vcpu_destroy(struct vcpu *v) { - struct domain *d = v->domain; - - hvm_all_ioreq_servers_remove_vcpu(d, v); + hvm_all_ioreq_servers_remove_vcpu(v->domain, v); nestedhvm_vcpu_destroy(v); @@ -4921,6 +4919,7 @@ extern const uint8_t hypercall_args_table[], compat_hypercall_args_table[]; int hvm_do_hypercall(struct cpu_user_regs *regs) { struct vcpu *curr = current; + struct domain *currd = curr->domain; struct segment_register sreg; int mode = hvm_guest_x86_mode(curr); uint32_t eax = regs->eax; @@ -4941,12 +4940,12 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) break; } - if ( (eax & 0x80000000) && is_viridian_domain(curr->domain) ) + if ( (eax & 0x80000000) && is_viridian_domain(currd) ) return viridian_hypercall(regs); if ( (eax >= NR_hypercalls) || - (is_pvh_vcpu(curr) ? !pvh_hypercall64_table[eax] - : !hvm_hypercall32_table[eax]) ) + (is_pvh_domain(currd) ? !pvh_hypercall64_table[eax] + : !hvm_hypercall32_table[eax]) ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -4980,7 +4979,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) #endif curr->arch.hvm_vcpu.hcall_64bit = 1; - regs->rax = (is_pvh_vcpu(curr) + regs->rax = (is_pvh_domain(currd) ? pvh_hypercall64_table : hvm_hypercall64_table)[eax](rdi, rsi, rdx, r10, r8, r9); curr->arch.hvm_vcpu.hcall_64bit = 0; @@ -5001,7 +5000,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif } - else if ( unlikely(is_pvh_vcpu(curr)) ) + else if ( unlikely(is_pvh_domain(currd)) ) regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ else { @@ -5053,8 +5052,8 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( curr->arch.hvm_vcpu.hcall_preempted ) return HVM_HCALL_preempted; - if ( unlikely(curr->domain->arch.hvm_domain.qemu_mapcache_invalidate) && - test_and_clear_bool(curr->domain->arch.hvm_domain. + if ( unlikely(currd->arch.hvm_domain.qemu_mapcache_invalidate) && + test_and_clear_bool(currd->arch.hvm_domain. qemu_mapcache_invalidate) ) return HVM_HCALL_invalidate; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 3aff365..4c5ceb5 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1207,7 +1207,7 @@ static int construct_vmcs(struct vcpu *v) vmx_vmcs_exit(v); /* PVH: paging mode is updated by arch_set_info_guest(). */ - if ( is_hvm_vcpu(v) ) + if ( is_hvm_domain(d) ) { /* will update HOST & GUEST_CR3 as reqd */ paging_update_paging_modes(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0G-0005HE-7Z; Wed, 17 Jun 2015 18:24:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0F-0005Gt-QW for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:00 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id F8/65-18733-F3BB1855; Wed, 17 Jun 2015 18:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434565437!24308806!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12260 invoked from network); 17 Jun 2015 18:23:58 -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; 17 Jun 2015 18:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0D-0002C4-0E for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0C-0006v2-VS for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:56 +0000 Date: Wed, 17 Jun 2015 18:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/context-switch: prefer is_..._domain() over is_..._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 2cba5cfe8036eedf6654cdda2cabb6084508a81f Author: Jan Beulich AuthorDate: Fri Jun 12 12:04:26 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:04:26 2015 +0200 x86/context-switch: prefer is_..._domain() over is_..._vcpu() Latch both domains alongside both vCPU-s into local variables, making use of them where possible also beyond what the title says. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 58 +++++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 93e491d..ed82a07 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1429,9 +1429,9 @@ static void _update_runstate_area(struct vcpu *v) v->arch.pv_vcpu.need_update_runstate_area = 1; } -static inline int need_full_gdt(struct vcpu *v) +static inline bool_t need_full_gdt(const struct domain *d) { - return (is_pv_vcpu(v) && !is_idle_vcpu(v)); + return is_pv_domain(d) && !is_idle_domain(d); } static void __context_switch(void) @@ -1440,13 +1440,14 @@ static void __context_switch(void) unsigned int cpu = smp_processor_id(); struct vcpu *p = per_cpu(curr_vcpu, cpu); struct vcpu *n = current; + struct domain *pd = p->domain, *nd = n->domain; struct desc_struct *gdt; struct desc_ptr gdt_desc; ASSERT(p != n); ASSERT(cpumask_empty(n->vcpu_dirty_cpumask)); - if ( !is_idle_vcpu(p) ) + if ( !is_idle_domain(pd) ) { memcpy(&p->arch.user_regs, stack_regs, CTXT_SWITCH_STACK_BYTES); vcpu_save_fpu(p); @@ -1458,11 +1459,11 @@ static void __context_switch(void) * ctxt_switch_to(). This avoids a race on things like EPT flushing, * which is synchronised on that function. */ - if ( p->domain != n->domain ) - cpumask_set_cpu(cpu, n->domain->domain_dirty_cpumask); + if ( pd != nd ) + cpumask_set_cpu(cpu, nd->domain_dirty_cpumask); cpumask_set_cpu(cpu, n->vcpu_dirty_cpumask); - if ( !is_idle_vcpu(n) ) + if ( !is_idle_domain(nd) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); if ( cpu_has_xsave ) @@ -1476,14 +1477,14 @@ static void __context_switch(void) n->arch.ctxt_switch_to(n); } - psr_ctxt_switch_to(n->domain); + psr_ctxt_switch_to(nd); - gdt = !is_pv_32on64_vcpu(n) ? per_cpu(gdt_table, cpu) : - per_cpu(compat_gdt_table, cpu); - if ( need_full_gdt(n) ) + gdt = !is_pv_32on64_domain(nd) ? per_cpu(gdt_table, cpu) : + per_cpu(compat_gdt_table, cpu); + if ( need_full_gdt(nd) ) { unsigned long mfn = virt_to_mfn(gdt); - l1_pgentry_t *pl1e = gdt_ldt_ptes(n->domain, n); + l1_pgentry_t *pl1e = gdt_ldt_ptes(nd, n); unsigned int i; for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) @@ -1491,8 +1492,8 @@ static void __context_switch(void) l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR)); } - if ( need_full_gdt(p) && - ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(n)) ) + if ( need_full_gdt(pd) && + ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(nd)) ) { gdt_desc.limit = LAST_RESERVED_GDT_BYTE; gdt_desc.base = (unsigned long)(gdt - FIRST_RESERVED_GDT_ENTRY); @@ -1501,16 +1502,16 @@ static void __context_switch(void) write_ptbase(n); - if ( need_full_gdt(n) && - ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(p)) ) + if ( need_full_gdt(nd) && + ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(pd)) ) { gdt_desc.limit = LAST_RESERVED_GDT_BYTE; gdt_desc.base = GDT_VIRT_START(n); asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } - if ( p->domain != n->domain ) - cpumask_clear_cpu(cpu, p->domain->domain_dirty_cpumask); + if ( pd != nd ) + cpumask_clear_cpu(cpu, pd->domain_dirty_cpumask); cpumask_clear_cpu(cpu, p->vcpu_dirty_cpumask); per_cpu(curr_vcpu, cpu) = n; @@ -1520,6 +1521,7 @@ static void __context_switch(void) void context_switch(struct vcpu *prev, struct vcpu *next) { unsigned int cpu = smp_processor_id(); + const struct domain *prevd = prev->domain, *nextd = next->domain; cpumask_t dirty_mask; ASSERT(local_irq_is_enabled()); @@ -1537,7 +1539,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) if ( prev != next ) _update_runstate_area(prev); - if ( is_hvm_vcpu(prev) ) + if ( is_hvm_domain(prevd) ) { if (prev != next) vpmu_save(prev); @@ -1551,7 +1553,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) set_current(next); if ( (per_cpu(curr_vcpu, cpu) == next) || - (is_idle_vcpu(next) && cpu_online(cpu)) ) + (is_idle_domain(nextd) && cpu_online(cpu)) ) { local_irq_enable(); } @@ -1559,10 +1561,10 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { __context_switch(); - if ( is_pv_vcpu(next) && - (is_idle_vcpu(prev) || - has_hvm_container_vcpu(prev) || - is_pv_32on64_vcpu(prev) != is_pv_32on64_vcpu(next)) ) + if ( is_pv_domain(nextd) && + (is_idle_domain(prevd) || + has_hvm_container_domain(prevd) || + is_pv_32on64_domain(prevd) != is_pv_32on64_domain(nextd)) ) { uint64_t efer = read_efer(); if ( !(efer & EFER_SCE) ) @@ -1572,18 +1574,18 @@ void context_switch(struct vcpu *prev, struct vcpu *next) /* Re-enable interrupts before restoring state which may fault. */ local_irq_enable(); - if ( is_pv_vcpu(next) ) + if ( is_pv_domain(nextd) ) { load_LDT(next); load_segments(next); } - set_cpuid_faulting(is_pv_vcpu(next) && - !is_control_domain(next->domain) && - !is_hardware_domain(next->domain)); + set_cpuid_faulting(is_pv_domain(nextd) && + !is_control_domain(nextd) && + !is_hardware_domain(nextd)); } - if (is_hvm_vcpu(next) && (prev != next) ) + if (is_hvm_domain(nextd) && (prev != next) ) /* Must be done with interrupts enabled */ vpmu_load(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 Wed Jun 17 18:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0G-0005HE-7Z; Wed, 17 Jun 2015 18:24:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0F-0005Gt-QW for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:00 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id F8/65-18733-F3BB1855; Wed, 17 Jun 2015 18:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434565437!24308806!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12260 invoked from network); 17 Jun 2015 18:23:58 -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; 17 Jun 2015 18:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0D-0002C4-0E for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0C-0006v2-VS for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:23:56 +0000 Date: Wed, 17 Jun 2015 18:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/context-switch: prefer is_..._domain() over is_..._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 2cba5cfe8036eedf6654cdda2cabb6084508a81f Author: Jan Beulich AuthorDate: Fri Jun 12 12:04:26 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:04:26 2015 +0200 x86/context-switch: prefer is_..._domain() over is_..._vcpu() Latch both domains alongside both vCPU-s into local variables, making use of them where possible also beyond what the title says. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 58 +++++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 93e491d..ed82a07 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1429,9 +1429,9 @@ static void _update_runstate_area(struct vcpu *v) v->arch.pv_vcpu.need_update_runstate_area = 1; } -static inline int need_full_gdt(struct vcpu *v) +static inline bool_t need_full_gdt(const struct domain *d) { - return (is_pv_vcpu(v) && !is_idle_vcpu(v)); + return is_pv_domain(d) && !is_idle_domain(d); } static void __context_switch(void) @@ -1440,13 +1440,14 @@ static void __context_switch(void) unsigned int cpu = smp_processor_id(); struct vcpu *p = per_cpu(curr_vcpu, cpu); struct vcpu *n = current; + struct domain *pd = p->domain, *nd = n->domain; struct desc_struct *gdt; struct desc_ptr gdt_desc; ASSERT(p != n); ASSERT(cpumask_empty(n->vcpu_dirty_cpumask)); - if ( !is_idle_vcpu(p) ) + if ( !is_idle_domain(pd) ) { memcpy(&p->arch.user_regs, stack_regs, CTXT_SWITCH_STACK_BYTES); vcpu_save_fpu(p); @@ -1458,11 +1459,11 @@ static void __context_switch(void) * ctxt_switch_to(). This avoids a race on things like EPT flushing, * which is synchronised on that function. */ - if ( p->domain != n->domain ) - cpumask_set_cpu(cpu, n->domain->domain_dirty_cpumask); + if ( pd != nd ) + cpumask_set_cpu(cpu, nd->domain_dirty_cpumask); cpumask_set_cpu(cpu, n->vcpu_dirty_cpumask); - if ( !is_idle_vcpu(n) ) + if ( !is_idle_domain(nd) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); if ( cpu_has_xsave ) @@ -1476,14 +1477,14 @@ static void __context_switch(void) n->arch.ctxt_switch_to(n); } - psr_ctxt_switch_to(n->domain); + psr_ctxt_switch_to(nd); - gdt = !is_pv_32on64_vcpu(n) ? per_cpu(gdt_table, cpu) : - per_cpu(compat_gdt_table, cpu); - if ( need_full_gdt(n) ) + gdt = !is_pv_32on64_domain(nd) ? per_cpu(gdt_table, cpu) : + per_cpu(compat_gdt_table, cpu); + if ( need_full_gdt(nd) ) { unsigned long mfn = virt_to_mfn(gdt); - l1_pgentry_t *pl1e = gdt_ldt_ptes(n->domain, n); + l1_pgentry_t *pl1e = gdt_ldt_ptes(nd, n); unsigned int i; for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) @@ -1491,8 +1492,8 @@ static void __context_switch(void) l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR)); } - if ( need_full_gdt(p) && - ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(n)) ) + if ( need_full_gdt(pd) && + ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(nd)) ) { gdt_desc.limit = LAST_RESERVED_GDT_BYTE; gdt_desc.base = (unsigned long)(gdt - FIRST_RESERVED_GDT_ENTRY); @@ -1501,16 +1502,16 @@ static void __context_switch(void) write_ptbase(n); - if ( need_full_gdt(n) && - ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(p)) ) + if ( need_full_gdt(nd) && + ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(pd)) ) { gdt_desc.limit = LAST_RESERVED_GDT_BYTE; gdt_desc.base = GDT_VIRT_START(n); asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } - if ( p->domain != n->domain ) - cpumask_clear_cpu(cpu, p->domain->domain_dirty_cpumask); + if ( pd != nd ) + cpumask_clear_cpu(cpu, pd->domain_dirty_cpumask); cpumask_clear_cpu(cpu, p->vcpu_dirty_cpumask); per_cpu(curr_vcpu, cpu) = n; @@ -1520,6 +1521,7 @@ static void __context_switch(void) void context_switch(struct vcpu *prev, struct vcpu *next) { unsigned int cpu = smp_processor_id(); + const struct domain *prevd = prev->domain, *nextd = next->domain; cpumask_t dirty_mask; ASSERT(local_irq_is_enabled()); @@ -1537,7 +1539,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) if ( prev != next ) _update_runstate_area(prev); - if ( is_hvm_vcpu(prev) ) + if ( is_hvm_domain(prevd) ) { if (prev != next) vpmu_save(prev); @@ -1551,7 +1553,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) set_current(next); if ( (per_cpu(curr_vcpu, cpu) == next) || - (is_idle_vcpu(next) && cpu_online(cpu)) ) + (is_idle_domain(nextd) && cpu_online(cpu)) ) { local_irq_enable(); } @@ -1559,10 +1561,10 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { __context_switch(); - if ( is_pv_vcpu(next) && - (is_idle_vcpu(prev) || - has_hvm_container_vcpu(prev) || - is_pv_32on64_vcpu(prev) != is_pv_32on64_vcpu(next)) ) + if ( is_pv_domain(nextd) && + (is_idle_domain(prevd) || + has_hvm_container_domain(prevd) || + is_pv_32on64_domain(prevd) != is_pv_32on64_domain(nextd)) ) { uint64_t efer = read_efer(); if ( !(efer & EFER_SCE) ) @@ -1572,18 +1574,18 @@ void context_switch(struct vcpu *prev, struct vcpu *next) /* Re-enable interrupts before restoring state which may fault. */ local_irq_enable(); - if ( is_pv_vcpu(next) ) + if ( is_pv_domain(nextd) ) { load_LDT(next); load_segments(next); } - set_cpuid_faulting(is_pv_vcpu(next) && - !is_control_domain(next->domain) && - !is_hardware_domain(next->domain)); + set_cpuid_faulting(is_pv_domain(nextd) && + !is_control_domain(nextd) && + !is_hardware_domain(nextd)); } - if (is_hvm_vcpu(next) && (prev != next) ) + if (is_hvm_domain(nextd) && (prev != next) ) /* Must be done with interrupts enabled */ vpmu_load(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 Wed Jun 17 18:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0Q-0005KL-E9; Wed, 17 Jun 2015 18:24:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0P-0005Jt-Fp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:09 +0000 Content-Length: 1608 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 2D/35-23832-84BB1855; Wed, 17 Jun 2015 18:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565447!12819230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6561 invoked from network); 17 Jun 2015 18:24:08 -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; 17 Jun 2015 18:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0N-0002Co-4W for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0N-0006vj-31 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:07 +0000 Date: Wed, 17 Jun 2015 18:24:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libelf: fix elf_parse_bsdsyms 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: multipart/mixed; boundary="===============4925722391219468978==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4925722391219468978== Content-Length: 1187 Content-Transfer-Encoding: quoted-printable commit 90b18f1666a89e7829912456ee32099c7669cb10 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri Jun 12 12:05:54 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:05:54 2015 +0200 libelf: fix elf_parse_bsdsyms call elf_parse_bsdsyms expects the second paramater to be a physical address, not a virtual one. Signed-off-by: Roger Pau Monn=C3=A9 --- xen/common/libelf/libelf-dominfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 6120dd4..86403b9 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -438,7 +438,7 @@ static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, if ( parms->bsd_symtab ) { - elf_parse_bsdsyms(elf, parms->virt_kend); + elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) parms->virt_kend =3D elf->bsd_symtab_pend + parms->virt_offset; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4925722391219468978== 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 --===============4925722391219468978==-- From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0Q-0005KL-E9; Wed, 17 Jun 2015 18:24:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0P-0005Jt-Fp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:09 +0000 Content-Length: 1608 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 2D/35-23832-84BB1855; Wed, 17 Jun 2015 18:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565447!12819230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6561 invoked from network); 17 Jun 2015 18:24:08 -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; 17 Jun 2015 18:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0N-0002Co-4W for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0N-0006vj-31 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:07 +0000 Date: Wed, 17 Jun 2015 18:24:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libelf: fix elf_parse_bsdsyms 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: multipart/mixed; boundary="===============4925722391219468978==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4925722391219468978== Content-Length: 1187 Content-Transfer-Encoding: quoted-printable commit 90b18f1666a89e7829912456ee32099c7669cb10 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri Jun 12 12:05:54 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:05:54 2015 +0200 libelf: fix elf_parse_bsdsyms call elf_parse_bsdsyms expects the second paramater to be a physical address, not a virtual one. Signed-off-by: Roger Pau Monn=C3=A9 --- xen/common/libelf/libelf-dominfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 6120dd4..86403b9 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -438,7 +438,7 @@ static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, if ( parms->bsd_symtab ) { - elf_parse_bsdsyms(elf, parms->virt_kend); + elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) parms->virt_kend =3D elf->bsd_symtab_pend + parms->virt_offset; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4925722391219468978== 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 --===============4925722391219468978==-- From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:24:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0b-0005Mv-Gs; Wed, 17 Jun 2015 18: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 1Z5I0a-0005MV-F0 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:20 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 04/B8-13517-35BB1855; Wed, 17 Jun 2015 18:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434565457!14818353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5784 invoked from network); 17 Jun 2015 18:24:18 -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; 17 Jun 2015 18:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0X-0002Cw-9o for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0X-0006ww-8a for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:17 +0000 Date: Wed, 17 Jun 2015 18:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpupool: fix shutdown with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98c51d0c7eb188745f564813443adcb5fd5db00b Author: Dario Faggioli AuthorDate: Fri Jun 12 12:06:24 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:06:24 2015 +0200 cpupool: fix shutdown with cpupools with different schedulers trying to shutdown the host when a cpupool exists, has pCPUs, and has a scheduler different than the Xen's default one, produces this: root@Zhaman:~# xl cpupool-cpu-remove Pool-0 8 root@Zhaman:~# xl cpupool-create name=\"Pool-1\" sched=\"credit2\" Using config file "command line" cpupool name: Pool-1 scheduler: credit2 number of cpus: 0 root@Zhaman:~# xl cpupool-cpu-add Pool-1 8 root@Zhaman:~# shutdown -h now (XEN) ----[ Xen-4.6-unstable x86_64 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] kill_timer+0x56/0x298 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor ... ... ... (XEN) Xen call trace: (XEN) [] kill_timer+0x56/0x298 (XEN) [] csched_free_pdata+0x9b/0xcf (XEN) [] cpu_schedule_callback+0x64/0x8b (XEN) [] notifier_call_chain+0x67/0x87 (XEN) [] cpu_down+0xd9/0x12c (XEN) [] disable_nonboot_cpus+0x93/0x138 (XEN) [] enter_state_helper+0xbd/0x365 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b ... ... ... (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000041 (XEN) **************************************** The fix is, when tearing down a pCPU, call the free_pdata() hook from the scheduler of the cpupool the pCPU belongs to, not always the one from the default scheduler. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Acked-by: George Dunlap --- xen/common/schedule.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 6b02f98..3325ccd 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1303,9 +1303,10 @@ static int cpu_schedule_up(unsigned int cpu) static void cpu_schedule_down(unsigned int cpu) { struct schedule_data *sd = &per_cpu(schedule_data, cpu); + struct scheduler *sched = per_cpu(scheduler, cpu); if ( sd->sched_priv != NULL ) - SCHED_OP(&ops, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:24:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0b-0005Mv-Gs; Wed, 17 Jun 2015 18: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 1Z5I0a-0005MV-F0 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:20 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 04/B8-13517-35BB1855; Wed, 17 Jun 2015 18:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434565457!14818353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5784 invoked from network); 17 Jun 2015 18:24:18 -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; 17 Jun 2015 18:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0X-0002Cw-9o for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0X-0006ww-8a for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:17 +0000 Date: Wed, 17 Jun 2015 18:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpupool: fix shutdown with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98c51d0c7eb188745f564813443adcb5fd5db00b Author: Dario Faggioli AuthorDate: Fri Jun 12 12:06:24 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:06:24 2015 +0200 cpupool: fix shutdown with cpupools with different schedulers trying to shutdown the host when a cpupool exists, has pCPUs, and has a scheduler different than the Xen's default one, produces this: root@Zhaman:~# xl cpupool-cpu-remove Pool-0 8 root@Zhaman:~# xl cpupool-create name=\"Pool-1\" sched=\"credit2\" Using config file "command line" cpupool name: Pool-1 scheduler: credit2 number of cpus: 0 root@Zhaman:~# xl cpupool-cpu-add Pool-1 8 root@Zhaman:~# shutdown -h now (XEN) ----[ Xen-4.6-unstable x86_64 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] kill_timer+0x56/0x298 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor ... ... ... (XEN) Xen call trace: (XEN) [] kill_timer+0x56/0x298 (XEN) [] csched_free_pdata+0x9b/0xcf (XEN) [] cpu_schedule_callback+0x64/0x8b (XEN) [] notifier_call_chain+0x67/0x87 (XEN) [] cpu_down+0xd9/0x12c (XEN) [] disable_nonboot_cpus+0x93/0x138 (XEN) [] enter_state_helper+0xbd/0x365 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b ... ... ... (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000041 (XEN) **************************************** The fix is, when tearing down a pCPU, call the free_pdata() hook from the scheduler of the cpupool the pCPU belongs to, not always the one from the default scheduler. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Acked-by: George Dunlap --- xen/common/schedule.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 6b02f98..3325ccd 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1303,9 +1303,10 @@ static int cpu_schedule_up(unsigned int cpu) static void cpu_schedule_down(unsigned int cpu) { struct schedule_data *sd = &per_cpu(schedule_data, cpu); + struct scheduler *sched = per_cpu(scheduler, cpu); if ( sd->sched_priv != NULL ) - SCHED_OP(&ops, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:24:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0l-0005PO-JH; Wed, 17 Jun 2015 18: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 1Z5I0k-0005PA-Ar for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:30 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 3A/35-27764-D5BB1855; Wed, 17 Jun 2015 18:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565467!24309351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24722 invoked from network); 17 Jun 2015 18:24:28 -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; 17 Jun 2015 18:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0h-0002D4-F7 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0h-0006xU-Dw for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:27 +0000 Date: Wed, 17 Jun 2015 18:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: avoid tripping watchdog when constructing 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 c5089fae0f6f71443356530ecec4781788c7377a Author: Ross Lagerwall AuthorDate: Fri Jun 12 12:07:05 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:07:05 2015 +0200 x86: avoid tripping watchdog when constructing dom0 Constructing dom0 may take a few seconds, particularly if the slow VESA graphics terminal is used. Process pending softirqs a few times to avoid tripping a watchdog with a short timeout. Signed-off-by: Ross Lagerwall Move inclusion of xen/softirq.h (and at once clean up other includes). Signed-off-by: Jan Beulich --- xen/arch/x86/domain_build.c | 4 ++++ xen/common/libelf/libelf-dominfo.c | 4 ++++ xen/common/libelf/libelf-private.h | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 03e4bfe..d76707f 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -930,6 +930,8 @@ int __init construct_dom0( BUG_ON(d->vcpu[0] == NULL); BUG_ON(v->is_initialised); + process_pending_softirqs(); + printk("*** LOADING DOMAIN 0 ***\n"); d->max_pages = ~0U; @@ -1167,6 +1169,8 @@ int __init construct_dom0( _p(v_start), _p(v_end)); printk(" ENTRY ADDRESS: %p\n", _p(parms.virt_entry)); + process_pending_softirqs(); + mpt_alloc = (vpt_start - v_start) + pfn_to_paddr(alloc_spfn); if ( vinitrd_start ) mpt_alloc -= PAGE_ALIGN(initrd_len); diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 86403b9..0771323 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -235,6 +235,10 @@ static unsigned elf_xen_parse_notes(struct elf_binary *elf, ELF_HANDLE_PTRVAL(note) < parms->elf_note_end; note = elf_note_next(elf, note) ) { +#ifdef __XEN__ + process_pending_softirqs(); +#endif + if ( *total_note_count >= ELF_MAX_TOTAL_NOTE_COUNT ) { elf_mark_broken(elf, "too many ELF notes"); diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h index 854a0d7..dd4675a 100644 --- a/xen/common/libelf/libelf-private.h +++ b/xen/common/libelf/libelf-private.h @@ -18,11 +18,9 @@ #ifdef __XEN__ -#include -#include -#include #include #include +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:24:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I0l-0005PO-JH; Wed, 17 Jun 2015 18: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 1Z5I0k-0005PA-Ar for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:30 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 3A/35-27764-D5BB1855; Wed, 17 Jun 2015 18:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565467!24309351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24722 invoked from network); 17 Jun 2015 18:24:28 -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; 17 Jun 2015 18:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0h-0002D4-F7 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0h-0006xU-Dw for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:27 +0000 Date: Wed, 17 Jun 2015 18:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: avoid tripping watchdog when constructing 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 c5089fae0f6f71443356530ecec4781788c7377a Author: Ross Lagerwall AuthorDate: Fri Jun 12 12:07:05 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 12 12:07:05 2015 +0200 x86: avoid tripping watchdog when constructing dom0 Constructing dom0 may take a few seconds, particularly if the slow VESA graphics terminal is used. Process pending softirqs a few times to avoid tripping a watchdog with a short timeout. Signed-off-by: Ross Lagerwall Move inclusion of xen/softirq.h (and at once clean up other includes). Signed-off-by: Jan Beulich --- xen/arch/x86/domain_build.c | 4 ++++ xen/common/libelf/libelf-dominfo.c | 4 ++++ xen/common/libelf/libelf-private.h | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 03e4bfe..d76707f 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -930,6 +930,8 @@ int __init construct_dom0( BUG_ON(d->vcpu[0] == NULL); BUG_ON(v->is_initialised); + process_pending_softirqs(); + printk("*** LOADING DOMAIN 0 ***\n"); d->max_pages = ~0U; @@ -1167,6 +1169,8 @@ int __init construct_dom0( _p(v_start), _p(v_end)); printk(" ENTRY ADDRESS: %p\n", _p(parms.virt_entry)); + process_pending_softirqs(); + mpt_alloc = (vpt_start - v_start) + pfn_to_paddr(alloc_spfn); if ( vinitrd_start ) mpt_alloc -= PAGE_ALIGN(initrd_len); diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 86403b9..0771323 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -235,6 +235,10 @@ static unsigned elf_xen_parse_notes(struct elf_binary *elf, ELF_HANDLE_PTRVAL(note) < parms->elf_note_end; note = elf_note_next(elf, note) ) { +#ifdef __XEN__ + process_pending_softirqs(); +#endif + if ( *total_note_count >= ELF_MAX_TOTAL_NOTE_COUNT ) { elf_mark_broken(elf, "too many ELF notes"); diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h index 854a0d7..dd4675a 100644 --- a/xen/common/libelf/libelf-private.h +++ b/xen/common/libelf/libelf-private.h @@ -18,11 +18,9 @@ #ifdef __XEN__ -#include -#include -#include #include #include +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:24:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:24: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 1Z5I0y-0005S6-M8; Wed, 17 Jun 2015 18:24:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0x-0005RQ-AQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:43 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 0F/9B-02969-76BB1855; Wed, 17 Jun 2015 18:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1434565478!15991631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26627 invoked from network); 17 Jun 2015 18:24:39 -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; 17 Jun 2015 18:24:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0r-0002DJ-Ru for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0r-0006xy-Jk for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:37 +0000 Date: Wed, 17 Jun 2015 18:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl_internal.h: Clarify ao rule against internal callers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad7ea0dbb251176cb8beea1b46e14c9f039d95e5 Author: Ian Jackson AuthorDate: Thu Jun 11 17:56:15 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 12 12:15:34 2015 +0100 libxl: libxl_internal.h: Clarify ao rule against internal callers Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Juergen Gross Acked-by: Ian Campbell Acked-by: Juergen Gross --- tools/libxl/libxl_internal.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bb3a5c7..e96d6b5 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1908,8 +1908,9 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); * All "slow" functions (see below for the exact definition) need to * use the asynchronous operation ("ao") machinery. The function * should take a parameter const libxl_asyncop_how *ao_how and must - * start with a call to AO_INITIATOR_ENTRY. These functions MAY NOT - * be called from inside libxl, because they can cause reentrancy + * start with a call to AO_CREATE or equivalent. These functions MAY + * NOT be called from inside libxl (regardless of what is passed for + * ao_how), because they can cause reentrancy hazards due to * callbacks. * * For the same reason functions taking an ao_how may make themselves -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:24:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:24: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 1Z5I0y-0005S6-M8; Wed, 17 Jun 2015 18:24:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0x-0005RQ-AQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:43 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 0F/9B-02969-76BB1855; Wed, 17 Jun 2015 18:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1434565478!15991631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26627 invoked from network); 17 Jun 2015 18:24:39 -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; 17 Jun 2015 18:24:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I0r-0002DJ-Ru for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I0r-0006xy-Jk for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:37 +0000 Date: Wed, 17 Jun 2015 18:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl_internal.h: Clarify ao rule against internal callers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad7ea0dbb251176cb8beea1b46e14c9f039d95e5 Author: Ian Jackson AuthorDate: Thu Jun 11 17:56:15 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 12 12:15:34 2015 +0100 libxl: libxl_internal.h: Clarify ao rule against internal callers Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Juergen Gross Acked-by: Ian Campbell Acked-by: Juergen Gross --- tools/libxl/libxl_internal.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bb3a5c7..e96d6b5 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1908,8 +1908,9 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); * All "slow" functions (see below for the exact definition) need to * use the asynchronous operation ("ao") machinery. The function * should take a parameter const libxl_asyncop_how *ao_how and must - * start with a call to AO_INITIATOR_ENTRY. These functions MAY NOT - * be called from inside libxl, because they can cause reentrancy + * start with a call to AO_CREATE or equivalent. These functions MAY + * NOT be called from inside libxl (regardless of what is passed for + * ao_how), because they can cause reentrancy hazards due to * callbacks. * * For the same reason functions taking an ao_how may make themselves -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:24:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I15-0005Tw-Ol; Wed, 17 Jun 2015 18: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 1Z5I14-0005TM-Dq for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:50 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id A9/7F-31304-17BB1855; Wed, 17 Jun 2015 18:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434565488!14973906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24897 invoked from network); 17 Jun 2015 18:24:49 -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; 17 Jun 2015 18:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I12-0002DR-0b for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I11-0006yk-Vp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:47 +0000 Date: Wed, 17 Jun 2015 18:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/MSI-X: use qword MMIO access for address 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 c8b630fedf285cc85b9a4834a0eb74cda7c3cca2 Author: Jan Beulich AuthorDate: Mon Jun 15 11:32:28 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 11:32:28 2015 +0200 Revert "x86/MSI-X: use qword MMIO access for address writes" This reverts commit 73cb5d43a8f48930e4594ef7b15b974487651ffe, which appears to break with certain Tigon3 NICs. --- xen/arch/x86/msi.c | 8 ++++++-- xen/include/asm-x86/msi.h | 9 ++------- xen/include/xen/pci_regs.h | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 3527518..e89f326 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -198,7 +198,8 @@ static void read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - msg->address = readq(base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); + msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); + msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } @@ -259,7 +260,10 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - writeq(msg->address, base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); + writel(msg->address_lo, + base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); + writel(msg->address_hi, + base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); writel(msg->data, base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index abbecf8..4c62a3a 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -65,13 +65,8 @@ struct msi_info { }; struct msi_msg { - union { - u64 address; /* message address */ - struct { - u32 address_lo; /* message address low 32 bits */ - u32 address_hi; /* message address high 32 bits */ - }; - }; + u32 address_lo; /* low 32 bits of msi message address */ + u32 address_hi; /* high 32 bits of msi message address */ u32 data; /* 16 bits of msi message data */ u32 dest32; /* used when Interrupt Remapping with EIM is enabled */ }; diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index 2de7847..ecd6124 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -307,7 +307,6 @@ #define PCI_MSIX_BIRMASK (7 << 0) #define PCI_MSIX_ENTRY_SIZE 16 -#define PCI_MSIX_ENTRY_ADDRESS_OFFSET 0 #define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET 0 #define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET 4 #define PCI_MSIX_ENTRY_DATA_OFFSET 8 -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:24:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I15-0005Tw-Ol; Wed, 17 Jun 2015 18: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 1Z5I14-0005TM-Dq for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:50 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id A9/7F-31304-17BB1855; Wed, 17 Jun 2015 18:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1434565488!14973906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24897 invoked from network); 17 Jun 2015 18:24:49 -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; 17 Jun 2015 18:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I12-0002DR-0b for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I11-0006yk-Vp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:47 +0000 Date: Wed, 17 Jun 2015 18:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/MSI-X: use qword MMIO access for address 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 c8b630fedf285cc85b9a4834a0eb74cda7c3cca2 Author: Jan Beulich AuthorDate: Mon Jun 15 11:32:28 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 11:32:28 2015 +0200 Revert "x86/MSI-X: use qword MMIO access for address writes" This reverts commit 73cb5d43a8f48930e4594ef7b15b974487651ffe, which appears to break with certain Tigon3 NICs. --- xen/arch/x86/msi.c | 8 ++++++-- xen/include/asm-x86/msi.h | 9 ++------- xen/include/xen/pci_regs.h | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 3527518..e89f326 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -198,7 +198,8 @@ static void read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - msg->address = readq(base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); + msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); + msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } @@ -259,7 +260,10 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __iomem *base; base = entry->mask_base; - writeq(msg->address, base + PCI_MSIX_ENTRY_ADDRESS_OFFSET); + writel(msg->address_lo, + base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); + writel(msg->address_hi, + base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); writel(msg->data, base + PCI_MSIX_ENTRY_DATA_OFFSET); break; } diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index abbecf8..4c62a3a 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -65,13 +65,8 @@ struct msi_info { }; struct msi_msg { - union { - u64 address; /* message address */ - struct { - u32 address_lo; /* message address low 32 bits */ - u32 address_hi; /* message address high 32 bits */ - }; - }; + u32 address_lo; /* low 32 bits of msi message address */ + u32 address_hi; /* high 32 bits of msi message address */ u32 data; /* 16 bits of msi message data */ u32 dest32; /* used when Interrupt Remapping with EIM is enabled */ }; diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index 2de7847..ecd6124 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -307,7 +307,6 @@ #define PCI_MSIX_BIRMASK (7 << 0) #define PCI_MSIX_ENTRY_SIZE 16 -#define PCI_MSIX_ENTRY_ADDRESS_OFFSET 0 #define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET 0 #define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET 4 #define PCI_MSIX_ENTRY_DATA_OFFSET 8 -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:25:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1H-0005X3-RS; Wed, 17 Jun 2015 18:25:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1G-0005Wm-4S for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:02 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 67/FB-02969-D7BB1855; Wed, 17 Jun 2015 18:25:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565498!12819398!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11051 invoked from network); 17 Jun 2015 18:24:59 -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; 17 Jun 2015 18:24:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1C-0002Dc-5F for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1C-0006z6-3w for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:58 +0000 Date: Wed, 17 Jun 2015 18:24:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: per-active entry 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 b4650e9a96d78b87ccf7deb4f74733ccfcc64db5 Author: David Vrabel AuthorDate: Mon Jun 15 13:22:07 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:22:07 2015 +0200 gnttab: per-active entry locking Introduce a per-active entry spin lock to protect active entry state The grant table lock must be locked before acquiring (locking) an active entry. This is a step in reducing contention on the grant table lock, but will only do so once the grant table lock is turned into a read-write lock. Based on a patch originally by Matt Wilson . Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- docs/misc/grant-tables.txt | 42 ++++++++++++- xen/common/grant_table.c | 155 ++++++++++++++++++++++++++++++++----------- 2 files changed, 156 insertions(+), 41 deletions(-) diff --git a/docs/misc/grant-tables.txt b/docs/misc/grant-tables.txt index 19db4ec..2a3f591 100644 --- a/docs/misc/grant-tables.txt +++ b/docs/misc/grant-tables.txt @@ -63,6 +63,7 @@ is complete. act->domid : remote domain being granted rights act->frame : machine frame being granted act->pin : used to hold reference counts + act->lock : spinlock used to serialize access to active entry state Map tracking ~~~~~~~~~~~~ @@ -74,7 +75,46 @@ is complete. matching map track entry is then removed, as if unmap had been invoked. These are not used by the transfer mechanism. map->domid : owner of the mapped frame - map->ref_and_flags : grant reference, ro/rw, mapped for host or device access + map->ref : grant reference + map->flags : ro/rw, mapped for host or device access + +******************************************************************************** + Locking + ~~~~~~~ + Xen uses several locks to serialize access to the internal grant table state. + + grant_table->lock : lock used to prevent readers from accessing + inconsistent grant table state such as current + version, partially initialized active table pages, + etc. + active_grant_entry->lock : spinlock used to serialize modifications to + active entries + + The primary lock for the grant table is a spinlock. All functions + that access members of struct grant_table must acquire the lock + around critical sections. + + Active entries are obtained by calling active_entry_acquire(gt, ref). + This function returns a pointer to the active entry after locking its + spinlock. The caller must hold the grant table lock for the gt in + question before calling active_entry_acquire(). This is because the + grant table can be dynamically extended via gnttab_grow_table() while + a domain is running and must be fully initialized. Once all access to + the active entry is complete, release the lock by calling + active_entry_release(act). + + Summary of rules for locking: + active_entry_acquire() and active_entry_release() can only be + called when holding the relevant grant table's lock. I.e.: + spin_lock(>->lock); + act = active_entry_acquire(gt, ref); + ... + active_entry_release(act); + spin_unlock(>->lock); + + Active entries cannot be acquired while holding the maptrack lock. + Multiple active entries can be acquired while holding the grant table + lock. ******************************************************************************** diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index ca4c973..917b46b 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -157,10 +157,13 @@ struct active_grant_entry { in the page. */ unsigned length:16; /* For sub-page grants, the length of the grant. */ + spinlock_t lock; /* lock to protect access of this entry. + see docs/misc/grant-tables.txt for + locking protocol */ }; #define ACGNT_PER_PAGE (PAGE_SIZE / sizeof(struct active_grant_entry)) -#define active_entry(t, e) \ +#define _active_entry(t, e) \ ((t)->active[(e)/ACGNT_PER_PAGE][(e)%ACGNT_PER_PAGE]) static inline void gnttab_flush_tlb(const struct domain *d) @@ -188,6 +191,24 @@ nr_active_grant_frames(struct grant_table *gt) return num_act_frames_from_sha_frames(nr_grant_frames(gt)); } +static inline struct active_grant_entry * +active_entry_acquire(struct grant_table *t, grant_ref_t e) +{ + struct active_grant_entry *act; + + ASSERT(spin_is_locked(&t->lock)); + + act = &_active_entry(t, e); + spin_lock(&act->lock); + + return act; +} + +static inline void active_entry_release(struct active_grant_entry *act) +{ + spin_unlock(&act->lock); +} + /* Check if the page has been paged out, or needs unsharing. If rc == GNTST_okay, *page contains the page struct with a ref taken. Caller must do put_page(*page). @@ -505,7 +526,6 @@ static int grant_map_exists(const struct domain *ld, unsigned long mfn, unsigned int *ref_count) { - const struct active_grant_entry *act; unsigned int ref, max_iter; ASSERT(spin_is_locked(&rgt->lock)); @@ -514,18 +534,19 @@ static int grant_map_exists(const struct domain *ld, nr_grant_entries(rgt)); for ( ref = *ref_count; ref < max_iter; ref++ ) { - act = &active_entry(rgt, ref); + struct active_grant_entry *act; + bool_t exists; - if ( !act->pin ) - continue; + act = active_entry_acquire(rgt, ref); - if ( act->domid != ld->domain_id ) - continue; + exists = act->pin + && act->domid == ld->domain_id + && act->frame == mfn; - if ( act->frame != mfn ) - continue; + active_entry_release(act); - return 0; + if ( exists ) + return 0; } if ( ref < nr_grant_entries(rgt) ) @@ -546,13 +567,24 @@ static void mapcount( *wrc = *rdc = 0; + /* + * Must have the local domain's grant table lock when iterating + * over its maptrack entries. + */ + ASSERT(spin_is_locked(&lgt->lock)); + /* + * Must have the remote domain's grant table lock while counting + * its active entries. + */ + ASSERT(spin_is_locked(&rd->grant_table->lock)); + for ( handle = 0; handle < lgt->maptrack_limit; handle++ ) { map = &maptrack_entry(lgt, handle); if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) || map->domid != rd->domain_id ) continue; - if ( active_entry(rd->grant_table, map->ref).frame == mfn ) + if ( _active_entry(rd->grant_table, map->ref).frame == mfn ) (map->flags & GNTMAP_readonly) ? (*rdc)++ : (*wrc)++; } } @@ -639,7 +671,7 @@ __gnttab_map_grant_ref( if ( unlikely(op->ref >= nr_grant_entries(rgt))) PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref (%d).\n", op->ref); - act = &active_entry(rgt, op->ref); + act = active_entry_acquire(rgt, op->ref); shah = shared_entry_header(rgt, op->ref); if (rgt->gt_version == 1) { sha1 = &shared_entry_v1(rgt, op->ref); @@ -656,7 +688,7 @@ __gnttab_map_grant_ref( ((act->domid != ld->domain_id) || (act->pin & 0x80808080U) != 0 || (act->is_sub_page)) ) - PIN_FAIL(unlock_out, GNTST_general_error, + PIN_FAIL(act_release_out, GNTST_general_error, "Bad domain (%d != %d), or risk of counter overflow %08x, or subpage %d\n", act->domid, ld->domain_id, act->pin, act->is_sub_page); @@ -667,7 +699,7 @@ __gnttab_map_grant_ref( if ( (rc = _set_status(rgt->gt_version, ld->domain_id, op->flags & GNTMAP_readonly, 1, shah, act, status) ) != GNTST_okay ) - goto unlock_out; + goto act_release_out; if ( !act->pin ) { @@ -702,6 +734,7 @@ __gnttab_map_grant_ref( cache_flags = (shah->flags & (GTF_PAT | GTF_PWT | GTF_PCD) ); + active_entry_release(act); spin_unlock(&rgt->lock); /* pg may be set, with a refcount included, from __get_paged_frame */ @@ -839,7 +872,7 @@ __gnttab_map_grant_ref( spin_lock(&rgt->lock); - act = &active_entry(rgt, op->ref); + act = active_entry_acquire(rgt, op->ref); if ( op->flags & GNTMAP_device_map ) act->pin -= (op->flags & GNTMAP_readonly) ? @@ -856,6 +889,9 @@ __gnttab_map_grant_ref( if ( !act->pin ) gnttab_clear_flag(_GTF_reading, status); + act_release_out: + active_entry_release(act); + unlock_out: spin_unlock(&rgt->lock); op->status = rc; @@ -950,7 +986,7 @@ __gnttab_unmap_common( } op->rd = rd; - act = &active_entry(rgt, op->map->ref); + act = active_entry_acquire(rgt, op->map->ref); if ( op->frame == 0 ) { @@ -959,7 +995,7 @@ __gnttab_unmap_common( else { if ( unlikely(op->frame != act->frame) ) - PIN_FAIL(unmap_out, GNTST_general_error, + PIN_FAIL(act_release_out, GNTST_general_error, "Bad frame number doesn't match gntref. (%lx != %lx)\n", op->frame, act->frame); if ( op->flags & GNTMAP_device_map ) @@ -978,7 +1014,7 @@ __gnttab_unmap_common( if ( (rc = replace_grant_host_mapping(op->host_addr, op->frame, op->new_addr, op->flags)) < 0 ) - goto unmap_out; + goto act_release_out; ASSERT(act->pin & (GNTPIN_hstw_mask | GNTPIN_hstr_mask)); op->map->flags &= ~GNTMAP_host_map; @@ -1000,7 +1036,7 @@ __gnttab_unmap_common( if ( err ) { rc = GNTST_general_error; - goto unmap_out; + goto act_release_out; } } @@ -1008,8 +1044,11 @@ __gnttab_unmap_common( if ( !(op->flags & GNTMAP_readonly) ) gnttab_mark_dirty(rd, op->frame); + act_release_out: + active_entry_release(act); unmap_out: double_gt_unlock(lgt, rgt); + op->status = rc; rcu_unlock_domain(rd); } @@ -1042,9 +1081,9 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) spin_lock(&rgt->lock); if ( rgt->gt_version == 0 ) - goto unmap_out; + goto unlock_out; - act = &active_entry(rgt, op->map->ref); + act = active_entry_acquire(rgt, op->map->ref); sha = shared_entry_header(rgt, op->map->ref); if ( rgt->gt_version == 1 ) @@ -1058,7 +1097,7 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) * Suggests that __gntab_unmap_common failed early and so * nothing further to do */ - goto unmap_out; + goto act_release_out; } pg = mfn_to_page(op->frame); @@ -1082,7 +1121,7 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) * Suggests that __gntab_unmap_common failed in * replace_grant_host_mapping() so nothing further to do */ - goto unmap_out; + goto act_release_out; } if ( !is_iomem_page(op->frame) ) @@ -1103,8 +1142,11 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) if ( act->pin == 0 ) gnttab_clear_flag(_GTF_reading, status); - unmap_out: + act_release_out: + active_entry_release(act); + unlock_out: spin_unlock(&rgt->lock); + if ( put_handle ) { op->map->flags = 0; @@ -1296,7 +1338,7 @@ gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) /* d's grant table lock must be held by the caller */ struct grant_table *gt = d->grant_table; - unsigned int i; + unsigned int i, j; ASSERT(req_nr_frames <= max_grant_frames); @@ -1311,6 +1353,8 @@ gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) if ( (gt->active[i] = alloc_xenheap_page()) == NULL ) goto active_alloc_failed; clear_page(gt->active[i]); + for ( j = 0; j < ACGNT_PER_PAGE; j++ ) + spin_lock_init(>->active[i][j].lock); } /* Shared */ @@ -1806,7 +1850,7 @@ __release_grant_for_copy( spin_lock(&rgt->lock); - act = &active_entry(rgt, gref); + act = active_entry_acquire(rgt, gref); sha = shared_entry_header(rgt, gref); r_frame = act->frame; @@ -1845,6 +1889,7 @@ __release_grant_for_copy( released_read = 1; } + active_entry_release(act); spin_unlock(&rgt->lock); if ( td != rd ) @@ -1906,14 +1951,14 @@ __acquire_grant_for_copy( spin_lock(&rgt->lock); if ( rgt->gt_version == 0 ) - PIN_FAIL(unlock_out, GNTST_general_error, + PIN_FAIL(gt_unlock_out, GNTST_general_error, "remote grant table not ready\n"); if ( unlikely(gref >= nr_grant_entries(rgt)) ) - PIN_FAIL(unlock_out, GNTST_bad_gntref, + PIN_FAIL(gt_unlock_out, GNTST_bad_gntref, "Bad grant reference %ld\n", gref); - act = &active_entry(rgt, gref); + act = active_entry_acquire(rgt, gref); shah = shared_entry_header(rgt, gref); if ( rgt->gt_version == 1 ) { @@ -1972,6 +2017,13 @@ __acquire_grant_for_copy( PIN_FAIL(unlock_out_clear, GNTST_general_error, "transitive grant referenced bad domain %d\n", trans_domid); + + /* + * __acquire_grant_for_copy() could take the lock on the + * remote table (if rd == td), so we have to drop the lock + * here and reacquire + */ + active_entry_release(act); spin_unlock(&rgt->lock); rc = __acquire_grant_for_copy(td, trans_gref, rd->domain_id, @@ -1979,9 +2031,12 @@ __acquire_grant_for_copy( &trans_page_off, &trans_length, 0); spin_lock(&rgt->lock); + act = active_entry_acquire(rgt, gref); + if ( rc != GNTST_okay ) { __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); + active_entry_release(act); spin_unlock(&rgt->lock); return rc; } @@ -1994,6 +2049,7 @@ __acquire_grant_for_copy( { __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); + active_entry_release(act); spin_unlock(&rgt->lock); put_page(*page); return __acquire_grant_for_copy(rd, gref, ldom, readonly, @@ -2062,6 +2118,7 @@ __acquire_grant_for_copy( *length = act->length; *frame = act->frame; + active_entry_release(act); spin_unlock(&rgt->lock); return rc; @@ -2074,7 +2131,11 @@ __acquire_grant_for_copy( gnttab_clear_flag(_GTF_reading, status); unlock_out: + active_entry_release(act); + + gt_unlock_out: spin_unlock(&rgt->lock); + return rc; } @@ -2374,7 +2435,6 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) gnttab_set_version_t op; struct domain *d = current->domain; struct grant_table *gt = d->grant_table; - struct active_grant_entry *act; grant_entry_v1_t reserved_entries[GNTTAB_NR_RESERVED_ENTRIES]; long res; int i; @@ -2399,8 +2459,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) { for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) { - act = &active_entry(gt, i); - if ( act->pin != 0 ) + if ( read_atomic(&_active_entry(gt, i).pin) != 0 ) { gdprintk(XENLOG_WARNING, "tried to change grant table version from %d to %d, but some grant entries still in use\n", @@ -2587,7 +2646,8 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) { struct domain *d = rcu_lock_current_domain(); struct grant_table *gt = d->grant_table; - struct active_grant_entry *act; + struct active_grant_entry *act_a = NULL; + struct active_grant_entry *act_b = NULL; s16 rc = GNTST_okay; spin_lock(>->lock); @@ -2601,12 +2661,16 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) if ( unlikely(ref_b >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-b (%d).\n", ref_b); - act = &active_entry(gt, ref_a); - if ( act->pin ) + /* Swapping the same ref is a no-op. */ + if ( ref_a == ref_b ) + goto out; + + act_a = active_entry_acquire(gt, ref_a); + if ( act_a->pin ) PIN_FAIL(out, GNTST_eagain, "ref a %ld busy\n", (long)ref_a); - act = &active_entry(gt, ref_b); - if ( act->pin ) + act_b = active_entry_acquire(gt, ref_b); + if ( act_b->pin ) PIN_FAIL(out, GNTST_eagain, "ref b %ld busy\n", (long)ref_b); if ( gt->gt_version == 1 ) @@ -2633,6 +2697,10 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) } out: + if ( act_b != NULL ) + active_entry_release(act_b); + if ( act_a != NULL ) + active_entry_release(act_a); spin_unlock(>->lock); rcu_unlock_domain(d); @@ -2942,7 +3010,7 @@ grant_table_create( struct domain *d) { struct grant_table *t; - int i; + unsigned int i, j; if ( (t = xzalloc(struct grant_table)) == NULL ) goto no_mem_0; @@ -2961,6 +3029,8 @@ grant_table_create( if ( (t->active[i] = alloc_xenheap_page()) == NULL ) goto no_mem_2; clear_page(t->active[i]); + for ( j = 0; j < ACGNT_PER_PAGE; j++ ) + spin_lock_init(&t->active[i][j].lock); } /* Tracking of mapped foreign frames table */ @@ -3057,7 +3127,7 @@ gnttab_release_mappings( rgt = rd->grant_table; spin_lock(&rgt->lock); - act = &active_entry(rgt, ref); + act = active_entry_acquire(rgt, ref); sha = shared_entry_header(rgt, ref); if (rgt->gt_version == 1) status = &sha->flags; @@ -3115,6 +3185,7 @@ gnttab_release_mappings( if ( act->pin == 0 ) gnttab_clear_flag(_GTF_reading, status); + active_entry_release(act); spin_unlock(&rgt->lock); rcu_unlock_domain(rd); @@ -3177,9 +3248,12 @@ static void gnttab_usage_print(struct domain *rd) uint16_t status; uint64_t frame; - act = &active_entry(gt, ref); + act = active_entry_acquire(gt, ref); if ( !act->pin ) + { + active_entry_release(act); continue; + } sha = shared_entry_header(gt, ref); @@ -3209,6 +3283,7 @@ static void gnttab_usage_print(struct domain *rd) printk("[%3d] %5d 0x%06lx 0x%08x %5d 0x%06"PRIx64" 0x%02x\n", ref, act->domid, act->frame, act->pin, sha->domid, frame, status); + active_entry_release(act); } out: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:25:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1H-0005X3-RS; Wed, 17 Jun 2015 18:25:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1G-0005Wm-4S for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:02 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 67/FB-02969-D7BB1855; Wed, 17 Jun 2015 18:25:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565498!12819398!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11051 invoked from network); 17 Jun 2015 18:24:59 -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; 17 Jun 2015 18:24:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1C-0002Dc-5F for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1C-0006z6-3w for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:24:58 +0000 Date: Wed, 17 Jun 2015 18:24:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: per-active entry 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 b4650e9a96d78b87ccf7deb4f74733ccfcc64db5 Author: David Vrabel AuthorDate: Mon Jun 15 13:22:07 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:22:07 2015 +0200 gnttab: per-active entry locking Introduce a per-active entry spin lock to protect active entry state The grant table lock must be locked before acquiring (locking) an active entry. This is a step in reducing contention on the grant table lock, but will only do so once the grant table lock is turned into a read-write lock. Based on a patch originally by Matt Wilson . Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- docs/misc/grant-tables.txt | 42 ++++++++++++- xen/common/grant_table.c | 155 ++++++++++++++++++++++++++++++++----------- 2 files changed, 156 insertions(+), 41 deletions(-) diff --git a/docs/misc/grant-tables.txt b/docs/misc/grant-tables.txt index 19db4ec..2a3f591 100644 --- a/docs/misc/grant-tables.txt +++ b/docs/misc/grant-tables.txt @@ -63,6 +63,7 @@ is complete. act->domid : remote domain being granted rights act->frame : machine frame being granted act->pin : used to hold reference counts + act->lock : spinlock used to serialize access to active entry state Map tracking ~~~~~~~~~~~~ @@ -74,7 +75,46 @@ is complete. matching map track entry is then removed, as if unmap had been invoked. These are not used by the transfer mechanism. map->domid : owner of the mapped frame - map->ref_and_flags : grant reference, ro/rw, mapped for host or device access + map->ref : grant reference + map->flags : ro/rw, mapped for host or device access + +******************************************************************************** + Locking + ~~~~~~~ + Xen uses several locks to serialize access to the internal grant table state. + + grant_table->lock : lock used to prevent readers from accessing + inconsistent grant table state such as current + version, partially initialized active table pages, + etc. + active_grant_entry->lock : spinlock used to serialize modifications to + active entries + + The primary lock for the grant table is a spinlock. All functions + that access members of struct grant_table must acquire the lock + around critical sections. + + Active entries are obtained by calling active_entry_acquire(gt, ref). + This function returns a pointer to the active entry after locking its + spinlock. The caller must hold the grant table lock for the gt in + question before calling active_entry_acquire(). This is because the + grant table can be dynamically extended via gnttab_grow_table() while + a domain is running and must be fully initialized. Once all access to + the active entry is complete, release the lock by calling + active_entry_release(act). + + Summary of rules for locking: + active_entry_acquire() and active_entry_release() can only be + called when holding the relevant grant table's lock. I.e.: + spin_lock(>->lock); + act = active_entry_acquire(gt, ref); + ... + active_entry_release(act); + spin_unlock(>->lock); + + Active entries cannot be acquired while holding the maptrack lock. + Multiple active entries can be acquired while holding the grant table + lock. ******************************************************************************** diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index ca4c973..917b46b 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -157,10 +157,13 @@ struct active_grant_entry { in the page. */ unsigned length:16; /* For sub-page grants, the length of the grant. */ + spinlock_t lock; /* lock to protect access of this entry. + see docs/misc/grant-tables.txt for + locking protocol */ }; #define ACGNT_PER_PAGE (PAGE_SIZE / sizeof(struct active_grant_entry)) -#define active_entry(t, e) \ +#define _active_entry(t, e) \ ((t)->active[(e)/ACGNT_PER_PAGE][(e)%ACGNT_PER_PAGE]) static inline void gnttab_flush_tlb(const struct domain *d) @@ -188,6 +191,24 @@ nr_active_grant_frames(struct grant_table *gt) return num_act_frames_from_sha_frames(nr_grant_frames(gt)); } +static inline struct active_grant_entry * +active_entry_acquire(struct grant_table *t, grant_ref_t e) +{ + struct active_grant_entry *act; + + ASSERT(spin_is_locked(&t->lock)); + + act = &_active_entry(t, e); + spin_lock(&act->lock); + + return act; +} + +static inline void active_entry_release(struct active_grant_entry *act) +{ + spin_unlock(&act->lock); +} + /* Check if the page has been paged out, or needs unsharing. If rc == GNTST_okay, *page contains the page struct with a ref taken. Caller must do put_page(*page). @@ -505,7 +526,6 @@ static int grant_map_exists(const struct domain *ld, unsigned long mfn, unsigned int *ref_count) { - const struct active_grant_entry *act; unsigned int ref, max_iter; ASSERT(spin_is_locked(&rgt->lock)); @@ -514,18 +534,19 @@ static int grant_map_exists(const struct domain *ld, nr_grant_entries(rgt)); for ( ref = *ref_count; ref < max_iter; ref++ ) { - act = &active_entry(rgt, ref); + struct active_grant_entry *act; + bool_t exists; - if ( !act->pin ) - continue; + act = active_entry_acquire(rgt, ref); - if ( act->domid != ld->domain_id ) - continue; + exists = act->pin + && act->domid == ld->domain_id + && act->frame == mfn; - if ( act->frame != mfn ) - continue; + active_entry_release(act); - return 0; + if ( exists ) + return 0; } if ( ref < nr_grant_entries(rgt) ) @@ -546,13 +567,24 @@ static void mapcount( *wrc = *rdc = 0; + /* + * Must have the local domain's grant table lock when iterating + * over its maptrack entries. + */ + ASSERT(spin_is_locked(&lgt->lock)); + /* + * Must have the remote domain's grant table lock while counting + * its active entries. + */ + ASSERT(spin_is_locked(&rd->grant_table->lock)); + for ( handle = 0; handle < lgt->maptrack_limit; handle++ ) { map = &maptrack_entry(lgt, handle); if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) || map->domid != rd->domain_id ) continue; - if ( active_entry(rd->grant_table, map->ref).frame == mfn ) + if ( _active_entry(rd->grant_table, map->ref).frame == mfn ) (map->flags & GNTMAP_readonly) ? (*rdc)++ : (*wrc)++; } } @@ -639,7 +671,7 @@ __gnttab_map_grant_ref( if ( unlikely(op->ref >= nr_grant_entries(rgt))) PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref (%d).\n", op->ref); - act = &active_entry(rgt, op->ref); + act = active_entry_acquire(rgt, op->ref); shah = shared_entry_header(rgt, op->ref); if (rgt->gt_version == 1) { sha1 = &shared_entry_v1(rgt, op->ref); @@ -656,7 +688,7 @@ __gnttab_map_grant_ref( ((act->domid != ld->domain_id) || (act->pin & 0x80808080U) != 0 || (act->is_sub_page)) ) - PIN_FAIL(unlock_out, GNTST_general_error, + PIN_FAIL(act_release_out, GNTST_general_error, "Bad domain (%d != %d), or risk of counter overflow %08x, or subpage %d\n", act->domid, ld->domain_id, act->pin, act->is_sub_page); @@ -667,7 +699,7 @@ __gnttab_map_grant_ref( if ( (rc = _set_status(rgt->gt_version, ld->domain_id, op->flags & GNTMAP_readonly, 1, shah, act, status) ) != GNTST_okay ) - goto unlock_out; + goto act_release_out; if ( !act->pin ) { @@ -702,6 +734,7 @@ __gnttab_map_grant_ref( cache_flags = (shah->flags & (GTF_PAT | GTF_PWT | GTF_PCD) ); + active_entry_release(act); spin_unlock(&rgt->lock); /* pg may be set, with a refcount included, from __get_paged_frame */ @@ -839,7 +872,7 @@ __gnttab_map_grant_ref( spin_lock(&rgt->lock); - act = &active_entry(rgt, op->ref); + act = active_entry_acquire(rgt, op->ref); if ( op->flags & GNTMAP_device_map ) act->pin -= (op->flags & GNTMAP_readonly) ? @@ -856,6 +889,9 @@ __gnttab_map_grant_ref( if ( !act->pin ) gnttab_clear_flag(_GTF_reading, status); + act_release_out: + active_entry_release(act); + unlock_out: spin_unlock(&rgt->lock); op->status = rc; @@ -950,7 +986,7 @@ __gnttab_unmap_common( } op->rd = rd; - act = &active_entry(rgt, op->map->ref); + act = active_entry_acquire(rgt, op->map->ref); if ( op->frame == 0 ) { @@ -959,7 +995,7 @@ __gnttab_unmap_common( else { if ( unlikely(op->frame != act->frame) ) - PIN_FAIL(unmap_out, GNTST_general_error, + PIN_FAIL(act_release_out, GNTST_general_error, "Bad frame number doesn't match gntref. (%lx != %lx)\n", op->frame, act->frame); if ( op->flags & GNTMAP_device_map ) @@ -978,7 +1014,7 @@ __gnttab_unmap_common( if ( (rc = replace_grant_host_mapping(op->host_addr, op->frame, op->new_addr, op->flags)) < 0 ) - goto unmap_out; + goto act_release_out; ASSERT(act->pin & (GNTPIN_hstw_mask | GNTPIN_hstr_mask)); op->map->flags &= ~GNTMAP_host_map; @@ -1000,7 +1036,7 @@ __gnttab_unmap_common( if ( err ) { rc = GNTST_general_error; - goto unmap_out; + goto act_release_out; } } @@ -1008,8 +1044,11 @@ __gnttab_unmap_common( if ( !(op->flags & GNTMAP_readonly) ) gnttab_mark_dirty(rd, op->frame); + act_release_out: + active_entry_release(act); unmap_out: double_gt_unlock(lgt, rgt); + op->status = rc; rcu_unlock_domain(rd); } @@ -1042,9 +1081,9 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) spin_lock(&rgt->lock); if ( rgt->gt_version == 0 ) - goto unmap_out; + goto unlock_out; - act = &active_entry(rgt, op->map->ref); + act = active_entry_acquire(rgt, op->map->ref); sha = shared_entry_header(rgt, op->map->ref); if ( rgt->gt_version == 1 ) @@ -1058,7 +1097,7 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) * Suggests that __gntab_unmap_common failed early and so * nothing further to do */ - goto unmap_out; + goto act_release_out; } pg = mfn_to_page(op->frame); @@ -1082,7 +1121,7 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) * Suggests that __gntab_unmap_common failed in * replace_grant_host_mapping() so nothing further to do */ - goto unmap_out; + goto act_release_out; } if ( !is_iomem_page(op->frame) ) @@ -1103,8 +1142,11 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) if ( act->pin == 0 ) gnttab_clear_flag(_GTF_reading, status); - unmap_out: + act_release_out: + active_entry_release(act); + unlock_out: spin_unlock(&rgt->lock); + if ( put_handle ) { op->map->flags = 0; @@ -1296,7 +1338,7 @@ gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) /* d's grant table lock must be held by the caller */ struct grant_table *gt = d->grant_table; - unsigned int i; + unsigned int i, j; ASSERT(req_nr_frames <= max_grant_frames); @@ -1311,6 +1353,8 @@ gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) if ( (gt->active[i] = alloc_xenheap_page()) == NULL ) goto active_alloc_failed; clear_page(gt->active[i]); + for ( j = 0; j < ACGNT_PER_PAGE; j++ ) + spin_lock_init(>->active[i][j].lock); } /* Shared */ @@ -1806,7 +1850,7 @@ __release_grant_for_copy( spin_lock(&rgt->lock); - act = &active_entry(rgt, gref); + act = active_entry_acquire(rgt, gref); sha = shared_entry_header(rgt, gref); r_frame = act->frame; @@ -1845,6 +1889,7 @@ __release_grant_for_copy( released_read = 1; } + active_entry_release(act); spin_unlock(&rgt->lock); if ( td != rd ) @@ -1906,14 +1951,14 @@ __acquire_grant_for_copy( spin_lock(&rgt->lock); if ( rgt->gt_version == 0 ) - PIN_FAIL(unlock_out, GNTST_general_error, + PIN_FAIL(gt_unlock_out, GNTST_general_error, "remote grant table not ready\n"); if ( unlikely(gref >= nr_grant_entries(rgt)) ) - PIN_FAIL(unlock_out, GNTST_bad_gntref, + PIN_FAIL(gt_unlock_out, GNTST_bad_gntref, "Bad grant reference %ld\n", gref); - act = &active_entry(rgt, gref); + act = active_entry_acquire(rgt, gref); shah = shared_entry_header(rgt, gref); if ( rgt->gt_version == 1 ) { @@ -1972,6 +2017,13 @@ __acquire_grant_for_copy( PIN_FAIL(unlock_out_clear, GNTST_general_error, "transitive grant referenced bad domain %d\n", trans_domid); + + /* + * __acquire_grant_for_copy() could take the lock on the + * remote table (if rd == td), so we have to drop the lock + * here and reacquire + */ + active_entry_release(act); spin_unlock(&rgt->lock); rc = __acquire_grant_for_copy(td, trans_gref, rd->domain_id, @@ -1979,9 +2031,12 @@ __acquire_grant_for_copy( &trans_page_off, &trans_length, 0); spin_lock(&rgt->lock); + act = active_entry_acquire(rgt, gref); + if ( rc != GNTST_okay ) { __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); + active_entry_release(act); spin_unlock(&rgt->lock); return rc; } @@ -1994,6 +2049,7 @@ __acquire_grant_for_copy( { __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); + active_entry_release(act); spin_unlock(&rgt->lock); put_page(*page); return __acquire_grant_for_copy(rd, gref, ldom, readonly, @@ -2062,6 +2118,7 @@ __acquire_grant_for_copy( *length = act->length; *frame = act->frame; + active_entry_release(act); spin_unlock(&rgt->lock); return rc; @@ -2074,7 +2131,11 @@ __acquire_grant_for_copy( gnttab_clear_flag(_GTF_reading, status); unlock_out: + active_entry_release(act); + + gt_unlock_out: spin_unlock(&rgt->lock); + return rc; } @@ -2374,7 +2435,6 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) gnttab_set_version_t op; struct domain *d = current->domain; struct grant_table *gt = d->grant_table; - struct active_grant_entry *act; grant_entry_v1_t reserved_entries[GNTTAB_NR_RESERVED_ENTRIES]; long res; int i; @@ -2399,8 +2459,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) { for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) { - act = &active_entry(gt, i); - if ( act->pin != 0 ) + if ( read_atomic(&_active_entry(gt, i).pin) != 0 ) { gdprintk(XENLOG_WARNING, "tried to change grant table version from %d to %d, but some grant entries still in use\n", @@ -2587,7 +2646,8 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) { struct domain *d = rcu_lock_current_domain(); struct grant_table *gt = d->grant_table; - struct active_grant_entry *act; + struct active_grant_entry *act_a = NULL; + struct active_grant_entry *act_b = NULL; s16 rc = GNTST_okay; spin_lock(>->lock); @@ -2601,12 +2661,16 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) if ( unlikely(ref_b >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-b (%d).\n", ref_b); - act = &active_entry(gt, ref_a); - if ( act->pin ) + /* Swapping the same ref is a no-op. */ + if ( ref_a == ref_b ) + goto out; + + act_a = active_entry_acquire(gt, ref_a); + if ( act_a->pin ) PIN_FAIL(out, GNTST_eagain, "ref a %ld busy\n", (long)ref_a); - act = &active_entry(gt, ref_b); - if ( act->pin ) + act_b = active_entry_acquire(gt, ref_b); + if ( act_b->pin ) PIN_FAIL(out, GNTST_eagain, "ref b %ld busy\n", (long)ref_b); if ( gt->gt_version == 1 ) @@ -2633,6 +2697,10 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) } out: + if ( act_b != NULL ) + active_entry_release(act_b); + if ( act_a != NULL ) + active_entry_release(act_a); spin_unlock(>->lock); rcu_unlock_domain(d); @@ -2942,7 +3010,7 @@ grant_table_create( struct domain *d) { struct grant_table *t; - int i; + unsigned int i, j; if ( (t = xzalloc(struct grant_table)) == NULL ) goto no_mem_0; @@ -2961,6 +3029,8 @@ grant_table_create( if ( (t->active[i] = alloc_xenheap_page()) == NULL ) goto no_mem_2; clear_page(t->active[i]); + for ( j = 0; j < ACGNT_PER_PAGE; j++ ) + spin_lock_init(&t->active[i][j].lock); } /* Tracking of mapped foreign frames table */ @@ -3057,7 +3127,7 @@ gnttab_release_mappings( rgt = rd->grant_table; spin_lock(&rgt->lock); - act = &active_entry(rgt, ref); + act = active_entry_acquire(rgt, ref); sha = shared_entry_header(rgt, ref); if (rgt->gt_version == 1) status = &sha->flags; @@ -3115,6 +3185,7 @@ gnttab_release_mappings( if ( act->pin == 0 ) gnttab_clear_flag(_GTF_reading, status); + active_entry_release(act); spin_unlock(&rgt->lock); rcu_unlock_domain(rd); @@ -3177,9 +3248,12 @@ static void gnttab_usage_print(struct domain *rd) uint16_t status; uint64_t frame; - act = &active_entry(gt, ref); + act = active_entry_acquire(gt, ref); if ( !act->pin ) + { + active_entry_release(act); continue; + } sha = shared_entry_header(gt, ref); @@ -3209,6 +3283,7 @@ static void gnttab_usage_print(struct domain *rd) printk("[%3d] %5d 0x%06lx 0x%08x %5d 0x%06"PRIx64" 0x%02x\n", ref, act->domid, act->frame, act->pin, sha->domid, frame, status); + active_entry_release(act); } out: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:25:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1S-0005Zk-0w; Wed, 17 Jun 2015 18:25:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1Q-0005ZV-KZ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:12 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id C5/99-01068-78BB1855; Wed, 17 Jun 2015 18:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1434565508!17272966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26686 invoked from network); 17 Jun 2015 18:25:09 -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; 17 Jun 2015 18:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1M-0002EC-AU for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1M-0006zg-98 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:08 +0000 Date: Wed, 17 Jun 2015 18:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: introduce maptrack lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a9899ddc42040e139233a6b1f0f65f3b65eda6d Author: David Vrabel AuthorDate: Mon Jun 15 13:23:34 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:23:34 2015 +0200 gnttab: introduce maptrack lock Split grant table lock into two separate locks. One to protect maptrack free list (maptrack_lock) and one for everything else (lock). Based on a patch originally by Matt Wilson . Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- docs/misc/grant-tables.txt | 4 ++++ xen/common/grant_table.c | 9 +++++---- xen/include/xen/grant_table.h | 2 ++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/misc/grant-tables.txt b/docs/misc/grant-tables.txt index 2a3f591..4a62bf9 100644 --- a/docs/misc/grant-tables.txt +++ b/docs/misc/grant-tables.txt @@ -87,6 +87,7 @@ is complete. inconsistent grant table state such as current version, partially initialized active table pages, etc. + grant_table->maptrack_lock : spinlock used to protect the maptrack free list active_grant_entry->lock : spinlock used to serialize modifications to active entries @@ -94,6 +95,9 @@ is complete. that access members of struct grant_table must acquire the lock around critical sections. + The maptrack free list is protected by its own spinlock. The maptrack + lock may be locked while holding the grant table lock. + Active entries are obtained by calling active_entry_acquire(gt, ref). This function returns a pointer to the active entry after locking its spinlock. The caller must hold the grant table lock for the gt in diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 917b46b..25da735 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -288,10 +288,10 @@ static inline void put_maptrack_handle( struct grant_table *t, int handle) { - spin_lock(&t->lock); + spin_lock(&t->maptrack_lock); maptrack_entry(t, handle).ref = t->maptrack_head; t->maptrack_head = handle; - spin_unlock(&t->lock); + spin_unlock(&t->maptrack_lock); } static inline int @@ -303,7 +303,7 @@ get_maptrack_handle( struct grant_mapping *new_mt; unsigned int new_mt_limit, nr_frames; - spin_lock(&lgt->lock); + spin_lock(&lgt->maptrack_lock); while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) ) { @@ -332,7 +332,7 @@ get_maptrack_handle( nr_frames + 1); } - spin_unlock(&lgt->lock); + spin_unlock(&lgt->maptrack_lock); return handle; } @@ -3017,6 +3017,7 @@ grant_table_create( /* Simple stuff. */ spin_lock_init(&t->lock); + spin_lock_init(&t->maptrack_lock); t->nr_grant_frames = INITIAL_NR_GRANT_FRAMES; /* Active grant table. */ diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 32f5786..0b35a5e 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -82,6 +82,8 @@ struct grant_table { struct grant_mapping **maptrack; unsigned int maptrack_head; unsigned int maptrack_limit; + /* Lock protecting the maptrack page list, head, and limit */ + spinlock_t maptrack_lock; /* Lock protecting updates to active and shared grant tables. */ spinlock_t lock; /* The defined versions are 1 and 2. Set to 0 if we don't know -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:25:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1S-0005Zk-0w; Wed, 17 Jun 2015 18:25:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1Q-0005ZV-KZ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:12 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id C5/99-01068-78BB1855; Wed, 17 Jun 2015 18:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1434565508!17272966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26686 invoked from network); 17 Jun 2015 18:25:09 -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; 17 Jun 2015 18:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1M-0002EC-AU for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1M-0006zg-98 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:08 +0000 Date: Wed, 17 Jun 2015 18:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: introduce maptrack lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a9899ddc42040e139233a6b1f0f65f3b65eda6d Author: David Vrabel AuthorDate: Mon Jun 15 13:23:34 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:23:34 2015 +0200 gnttab: introduce maptrack lock Split grant table lock into two separate locks. One to protect maptrack free list (maptrack_lock) and one for everything else (lock). Based on a patch originally by Matt Wilson . Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- docs/misc/grant-tables.txt | 4 ++++ xen/common/grant_table.c | 9 +++++---- xen/include/xen/grant_table.h | 2 ++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/misc/grant-tables.txt b/docs/misc/grant-tables.txt index 2a3f591..4a62bf9 100644 --- a/docs/misc/grant-tables.txt +++ b/docs/misc/grant-tables.txt @@ -87,6 +87,7 @@ is complete. inconsistent grant table state such as current version, partially initialized active table pages, etc. + grant_table->maptrack_lock : spinlock used to protect the maptrack free list active_grant_entry->lock : spinlock used to serialize modifications to active entries @@ -94,6 +95,9 @@ is complete. that access members of struct grant_table must acquire the lock around critical sections. + The maptrack free list is protected by its own spinlock. The maptrack + lock may be locked while holding the grant table lock. + Active entries are obtained by calling active_entry_acquire(gt, ref). This function returns a pointer to the active entry after locking its spinlock. The caller must hold the grant table lock for the gt in diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 917b46b..25da735 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -288,10 +288,10 @@ static inline void put_maptrack_handle( struct grant_table *t, int handle) { - spin_lock(&t->lock); + spin_lock(&t->maptrack_lock); maptrack_entry(t, handle).ref = t->maptrack_head; t->maptrack_head = handle; - spin_unlock(&t->lock); + spin_unlock(&t->maptrack_lock); } static inline int @@ -303,7 +303,7 @@ get_maptrack_handle( struct grant_mapping *new_mt; unsigned int new_mt_limit, nr_frames; - spin_lock(&lgt->lock); + spin_lock(&lgt->maptrack_lock); while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) ) { @@ -332,7 +332,7 @@ get_maptrack_handle( nr_frames + 1); } - spin_unlock(&lgt->lock); + spin_unlock(&lgt->maptrack_lock); return handle; } @@ -3017,6 +3017,7 @@ grant_table_create( /* Simple stuff. */ spin_lock_init(&t->lock); + spin_lock_init(&t->maptrack_lock); t->nr_grant_frames = INITIAL_NR_GRANT_FRAMES; /* Active grant table. */ diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 32f5786..0b35a5e 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -82,6 +82,8 @@ struct grant_table { struct grant_mapping **maptrack; unsigned int maptrack_head; unsigned int maptrack_limit; + /* Lock protecting the maptrack page list, head, and limit */ + spinlock_t maptrack_lock; /* Lock protecting updates to active and shared grant tables. */ spinlock_t lock; /* The defined versions are 1 and 2. Set to 0 if we don't know -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:25:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1c-0005bp-3Y; Wed, 17 Jun 2015 18:25:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1a-0005bY-9m for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:22 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id C0/5C-02969-19BB1855; Wed, 17 Jun 2015 18:25:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1434565518!17241867!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31967 invoked from network); 17 Jun 2015 18:25:19 -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; 17 Jun 2015 18:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1W-0002FH-II for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1W-00070a-F4 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:18 +0000 Date: Wed, 17 Jun 2015 18:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: make the grant table lock a read-write lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40de9fffb4cc0b0485aa3391d72e2220b8e1ce12 Author: David Vrabel AuthorDate: Mon Jun 15 13:25:20 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:25:20 2015 +0200 gnttab: make the grant table lock a read-write lock In combination with the per-active entry locks, the grant table lock can be made a read-write lock since the majority of cases only the read lock is required. The grant table read lock protects against changes to the table version or size (which are done with the write lock held). The write lock is also required when two active entries must be acquired. The double lock is still required when updating IOMMU page tables. With the lock contention being only on the maptrack lock (unless IOMMU updates are required), performance and scalability is improved. Based on a patch originally by Matt Wilson . Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- docs/misc/grant-tables.txt | 37 ++++++--- xen/arch/arm/mm.c | 4 +- xen/arch/x86/mm.c | 4 +- xen/common/grant_table.c | 177 +++++++++++++++++++++++----------------- xen/include/xen/grant_table.h | 9 ++- 5 files changed, 135 insertions(+), 96 deletions(-) diff --git a/docs/misc/grant-tables.txt b/docs/misc/grant-tables.txt index 4a62bf9..417ce2d 100644 --- a/docs/misc/grant-tables.txt +++ b/docs/misc/grant-tables.txt @@ -83,7 +83,7 @@ is complete. ~~~~~~~ Xen uses several locks to serialize access to the internal grant table state. - grant_table->lock : lock used to prevent readers from accessing + grant_table->lock : rwlock used to prevent readers from accessing inconsistent grant table state such as current version, partially initialized active table pages, etc. @@ -91,34 +91,43 @@ is complete. active_grant_entry->lock : spinlock used to serialize modifications to active entries - The primary lock for the grant table is a spinlock. All functions - that access members of struct grant_table must acquire the lock - around critical sections. + The primary lock for the grant table is a read/write spinlock. All + functions that access members of struct grant_table must acquire a + read lock around critical sections. Any modification to the members + of struct grant_table (e.g., nr_status_frames, nr_grant_frames, + active frames, etc.) must only be made if the write lock is + held. These elements are read-mostly, and read critical sections can + be large, which makes a rwlock a good choice. The maptrack free list is protected by its own spinlock. The maptrack lock may be locked while holding the grant table lock. Active entries are obtained by calling active_entry_acquire(gt, ref). This function returns a pointer to the active entry after locking its - spinlock. The caller must hold the grant table lock for the gt in - question before calling active_entry_acquire(). This is because the - grant table can be dynamically extended via gnttab_grow_table() while - a domain is running and must be fully initialized. Once all access to - the active entry is complete, release the lock by calling - active_entry_release(act). + spinlock. The caller must hold the grant table read lock before + calling active_entry_acquire(). This is because the grant table can + be dynamically extended via gnttab_grow_table() while a domain is + running and must be fully initialized. Once all access to the active + entry is complete, release the lock by calling active_entry_release(act). Summary of rules for locking: active_entry_acquire() and active_entry_release() can only be - called when holding the relevant grant table's lock. I.e.: - spin_lock(>->lock); + called when holding the relevant grant table's read lock. I.e.: + read_lock(>->lock); act = active_entry_acquire(gt, ref); ... active_entry_release(act); - spin_unlock(>->lock); + read_unlock(>->lock); Active entries cannot be acquired while holding the maptrack lock. Multiple active entries can be acquired while holding the grant table - lock. + _write_ lock. + + Maptrack entries are protected by the corresponding active entry + lock. As an exception, new maptrack entries may be populated without + holding the lock, provided the flags field is written last. This + requires any maptrack entry user validates the flags field as + non-zero first. ******************************************************************************** diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index feabe34..ff1b330 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1050,7 +1050,7 @@ int xenmem_add_to_physmap_one( switch ( space ) { case XENMAPSPACE_grant_table: - spin_lock(&d->grant_table->lock); + write_lock(&d->grant_table->lock); if ( d->grant_table->gt_version == 0 ) d->grant_table->gt_version = 1; @@ -1080,7 +1080,7 @@ int xenmem_add_to_physmap_one( t = p2m_ram_rw; - spin_unlock(&d->grant_table->lock); + write_unlock(&d->grant_table->lock); break; case XENMAPSPACE_shared_info: if ( idx != 0 ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 472c494..9e08c9b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4595,7 +4595,7 @@ int xenmem_add_to_physmap_one( mfn = virt_to_mfn(d->shared_info); break; case XENMAPSPACE_grant_table: - spin_lock(&d->grant_table->lock); + write_lock(&d->grant_table->lock); if ( d->grant_table->gt_version == 0 ) d->grant_table->gt_version = 1; @@ -4617,7 +4617,7 @@ int xenmem_add_to_physmap_one( mfn = virt_to_mfn(d->grant_table->shared_raw[idx]); } - spin_unlock(&d->grant_table->lock); + write_unlock(&d->grant_table->lock); break; case XENMAPSPACE_gmfn_range: case XENMAPSPACE_gmfn: diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 25da735..e134f13 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -196,7 +196,7 @@ active_entry_acquire(struct grant_table *t, grant_ref_t e) { struct active_grant_entry *act; - ASSERT(spin_is_locked(&t->lock)); + ASSERT(rw_is_locked(&t->lock)); act = &_active_entry(t, e); spin_lock(&act->lock); @@ -252,25 +252,29 @@ static int __get_paged_frame(unsigned long gfn, unsigned long *frame, struct pag static inline void double_gt_lock(struct grant_table *lgt, struct grant_table *rgt) { + /* + * See mapcount() for why the write lock is also required for the + * remote domain. + */ if ( lgt < rgt ) { - spin_lock(&lgt->lock); - spin_lock(&rgt->lock); + write_lock(&lgt->lock); + write_lock(&rgt->lock); } else { if ( lgt != rgt ) - spin_lock(&rgt->lock); - spin_lock(&lgt->lock); + write_lock(&rgt->lock); + write_lock(&lgt->lock); } } static inline void double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) { - spin_unlock(&lgt->lock); + write_unlock(&lgt->lock); if ( lgt != rgt ) - spin_unlock(&rgt->lock); + write_unlock(&rgt->lock); } static inline int @@ -528,7 +532,7 @@ static int grant_map_exists(const struct domain *ld, { unsigned int ref, max_iter; - ASSERT(spin_is_locked(&rgt->lock)); + ASSERT(rw_is_locked(&rgt->lock)); max_iter = min(*ref_count + (1 << GNTTABOP_CONTINUATION_ARG_SHIFT), nr_grant_entries(rgt)); @@ -568,15 +572,15 @@ static void mapcount( *wrc = *rdc = 0; /* - * Must have the local domain's grant table lock when iterating - * over its maptrack entries. + * Must have the local domain's grant table write lock when + * iterating over its maptrack entries. */ - ASSERT(spin_is_locked(&lgt->lock)); + ASSERT(rw_is_write_locked(&lgt->lock)); /* - * Must have the remote domain's grant table lock while counting - * its active entries. + * Must have the remote domain's grant table write lock while + * counting its active entries. */ - ASSERT(spin_is_locked(&rd->grant_table->lock)); + ASSERT(rw_is_write_locked(&rd->grant_table->lock)); for ( handle = 0; handle < lgt->maptrack_limit; handle++ ) { @@ -616,6 +620,7 @@ __gnttab_map_grant_ref( grant_entry_v2_t *sha2; grant_entry_header_t *shah; uint16_t *status; + bool_t need_iommu; led = current; ld = led->domain; @@ -661,7 +666,7 @@ __gnttab_map_grant_ref( } rgt = rd->grant_table; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) PIN_FAIL(unlock_out, GNTST_general_error, @@ -735,7 +740,7 @@ __gnttab_map_grant_ref( cache_flags = (shah->flags & (GTF_PAT | GTF_PWT | GTF_PCD) ); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); /* pg may be set, with a refcount included, from __get_paged_frame */ if ( !pg ) @@ -811,12 +816,14 @@ __gnttab_map_grant_ref( goto undo_out; } - double_gt_lock(lgt, rgt); - - if ( gnttab_need_iommu_mapping(ld) ) + need_iommu = gnttab_need_iommu_mapping(ld); + if ( need_iommu ) { unsigned int wrc, rdc; int err = 0; + + double_gt_lock(lgt, rgt); + /* We're not translated, so we know that gmfns and mfns are the same things, so the IOMMU entry is always 1-to-1. */ mapcount(lgt, rd, frame, &wrc, &rdc); @@ -842,12 +849,22 @@ __gnttab_map_grant_ref( TRACE_1D(TRC_MEM_PAGE_GRANT_MAP, op->dom); + /* + * All maptrack entry users check mt->flags first before using the + * other fields so just ensure the flags field is stored last. + * + * However, if gnttab_need_iommu_mapping() then this would race + * with a concurrent mapcount() call (on an unmap, for example) + * and a lock is required. + */ mt = &maptrack_entry(lgt, handle); mt->domid = op->dom; mt->ref = op->ref; - mt->flags = op->flags; + wmb(); + write_atomic(&mt->flags, op->flags); - double_gt_unlock(lgt, rgt); + if ( need_iommu ) + double_gt_unlock(lgt, rgt); op->dev_bus_addr = (u64)frame << PAGE_SHIFT; op->handle = handle; @@ -870,7 +887,7 @@ __gnttab_map_grant_ref( put_page(pg); } - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, op->ref); @@ -893,7 +910,7 @@ __gnttab_map_grant_ref( active_entry_release(act); unlock_out: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); op->status = rc; put_maptrack_handle(lgt, handle); rcu_unlock_domain(rd); @@ -943,18 +960,19 @@ __gnttab_unmap_common( } op->map = &maptrack_entry(lgt, op->handle); - spin_lock(&lgt->lock); - if ( unlikely(!op->map->flags) ) + read_lock(&lgt->lock); + + if ( unlikely(!read_atomic(&op->map->flags)) ) { - spin_unlock(&lgt->lock); + read_unlock(&lgt->lock); gdprintk(XENLOG_INFO, "Zero flags for handle (%d).\n", op->handle); op->status = GNTST_bad_handle; return; } dom = op->map->domid; - spin_unlock(&lgt->lock); + read_unlock(&lgt->lock); if ( unlikely((rd = rcu_lock_domain_by_id(dom)) == NULL) ) { @@ -975,9 +993,10 @@ __gnttab_unmap_common( TRACE_1D(TRC_MEM_PAGE_GRANT_UNMAP, dom); rgt = rd->grant_table; - double_gt_lock(lgt, rgt); - op->flags = op->map->flags; + read_lock(&rgt->lock); + + op->flags = read_atomic(&op->map->flags); if ( unlikely(!op->flags) || unlikely(op->map->domid != dom) ) { gdprintk(XENLOG_WARNING, "Unstable handle %u\n", op->handle); @@ -1024,31 +1043,34 @@ __gnttab_unmap_common( act->pin -= GNTPIN_hstw_inc; } - if ( gnttab_need_iommu_mapping(ld) ) + act_release_out: + active_entry_release(act); + unmap_out: + read_unlock(&rgt->lock); + + if ( rc == GNTST_okay && gnttab_need_iommu_mapping(ld) ) { unsigned int wrc, rdc; int err = 0; + + double_gt_lock(lgt, rgt); + mapcount(lgt, rd, op->frame, &wrc, &rdc); if ( (wrc + rdc) == 0 ) err = iommu_unmap_page(ld, op->frame); else if ( wrc == 0 ) err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); + + double_gt_unlock(lgt, rgt); + if ( err ) - { rc = GNTST_general_error; - goto act_release_out; - } } /* If just unmapped a writable mapping, mark as dirtied */ - if ( !(op->flags & GNTMAP_readonly) ) + if ( rc == GNTST_okay && !(op->flags & GNTMAP_readonly) ) gnttab_mark_dirty(rd, op->frame); - act_release_out: - active_entry_release(act); - unmap_out: - double_gt_unlock(lgt, rgt); - op->status = rc; rcu_unlock_domain(rd); } @@ -1078,8 +1100,8 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) rcu_lock_domain(rd); rgt = rd->grant_table; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) goto unlock_out; @@ -1145,7 +1167,7 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) act_release_out: active_entry_release(act); unlock_out: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); if ( put_handle ) { @@ -1332,11 +1354,13 @@ gnttab_unpopulate_status_frames(struct domain *d, struct grant_table *gt) gt->nr_status_frames = 0; } +/* + * Grow the grant table. The caller must hold the grant table's + * write lock before calling this function. + */ int gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) { - /* d's grant table lock must be held by the caller */ - struct grant_table *gt = d->grant_table; unsigned int i, j; @@ -1442,7 +1466,7 @@ gnttab_setup_table( } gt = d->grant_table; - spin_lock(>->lock); + write_lock(>->lock); if ( gt->gt_version == 0 ) gt->gt_version = 1; @@ -1470,7 +1494,7 @@ gnttab_setup_table( } out3: - spin_unlock(>->lock); + write_unlock(>->lock); out2: rcu_unlock_domain(d); out1: @@ -1512,13 +1536,13 @@ gnttab_query_size( goto query_out_unlock; } - spin_lock(&d->grant_table->lock); + read_lock(&d->grant_table->lock); op.nr_frames = nr_grant_frames(d->grant_table); op.max_nr_frames = max_grant_frames; op.status = GNTST_okay; - spin_unlock(&d->grant_table->lock); + read_unlock(&d->grant_table->lock); query_out_unlock: @@ -1544,7 +1568,7 @@ gnttab_prepare_for_transfer( union grant_combo scombo, prev_scombo, new_scombo; int retries = 0; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) { @@ -1595,11 +1619,11 @@ gnttab_prepare_for_transfer( scombo = prev_scombo; } - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return 1; fail: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return 0; } @@ -1614,6 +1638,7 @@ gnttab_transfer( struct gnttab_transfer gop; unsigned long mfn; unsigned int max_bitsize; + struct active_grant_entry *act; for ( i = 0; i < count; i++ ) { @@ -1792,7 +1817,8 @@ gnttab_transfer( TRACE_1D(TRC_MEM_PAGE_GRANT_TRANSFER, e->domain_id); /* Tell the guest about its new page frame. */ - spin_lock(&e->grant_table->lock); + read_lock(&e->grant_table->lock); + act = active_entry_acquire(e->grant_table, gop.ref); if ( e->grant_table->gt_version == 1 ) { @@ -1810,7 +1836,8 @@ gnttab_transfer( shared_entry_header(e->grant_table, gop.ref)->flags |= GTF_transfer_completed; - spin_unlock(&e->grant_table->lock); + active_entry_release(act); + read_unlock(&e->grant_table->lock); rcu_unlock_domain(e); @@ -1848,7 +1875,7 @@ __release_grant_for_copy( released_read = 0; released_write = 0; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, gref); sha = shared_entry_header(rgt, gref); @@ -1890,7 +1917,7 @@ __release_grant_for_copy( } active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); if ( td != rd ) { @@ -1948,7 +1975,7 @@ __acquire_grant_for_copy( *page = NULL; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) PIN_FAIL(gt_unlock_out, GNTST_general_error, @@ -2024,20 +2051,20 @@ __acquire_grant_for_copy( * here and reacquire */ active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); rc = __acquire_grant_for_copy(td, trans_gref, rd->domain_id, readonly, &grant_frame, page, &trans_page_off, &trans_length, 0); - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, gref); if ( rc != GNTST_okay ) { __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return rc; } @@ -2050,7 +2077,7 @@ __acquire_grant_for_copy( __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); put_page(*page); return __acquire_grant_for_copy(rd, gref, ldom, readonly, frame, page, page_off, length, @@ -2119,7 +2146,7 @@ __acquire_grant_for_copy( *frame = act->frame; active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return rc; unlock_out_clear: @@ -2134,7 +2161,7 @@ __acquire_grant_for_copy( active_entry_release(act); gt_unlock_out: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return rc; } @@ -2450,7 +2477,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) if ( gt->gt_version == op.version ) goto out; - spin_lock(>->lock); + write_lock(>->lock); /* Make sure that the grant table isn't currently in use when we change the version number, except for the first 8 entries which are allowed to be in use (xenstore/xenconsole keeps them mapped). @@ -2535,7 +2562,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) gt->gt_version = op.version; out_unlock: - spin_unlock(>->lock); + write_unlock(>->lock); out: op.version = gt->gt_version; @@ -2591,7 +2618,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_t) uop, op.status = GNTST_okay; - spin_lock(>->lock); + read_lock(>->lock); for ( i = 0; i < op.nr_frames; i++ ) { @@ -2600,7 +2627,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_t) uop, op.status = GNTST_bad_virt_addr; } - spin_unlock(>->lock); + read_unlock(>->lock); out2: rcu_unlock_domain(d); out1: @@ -2650,7 +2677,7 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) struct active_grant_entry *act_b = NULL; s16 rc = GNTST_okay; - spin_lock(>->lock); + write_lock(>->lock); if ( gt->gt_version == 0 ) PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); @@ -2701,7 +2728,7 @@ out: active_entry_release(act_b); if ( act_a != NULL ) active_entry_release(act_a); - spin_unlock(>->lock); + write_unlock(>->lock); rcu_unlock_domain(d); @@ -2772,12 +2799,12 @@ static int __gnttab_cache_flush(gnttab_cache_flush_t *cflush, if ( d != owner ) { - spin_lock(&owner->grant_table->lock); + read_lock(&owner->grant_table->lock); ret = grant_map_exists(d, owner->grant_table, mfn, ref_count); if ( ret != 0 ) { - spin_unlock(&owner->grant_table->lock); + read_unlock(&owner->grant_table->lock); rcu_unlock_domain(d); put_page(page); return ret; @@ -2797,7 +2824,7 @@ static int __gnttab_cache_flush(gnttab_cache_flush_t *cflush, ret = 0; if ( d != owner ) - spin_unlock(&owner->grant_table->lock); + read_unlock(&owner->grant_table->lock); unmap_domain_page(v); put_page(page); @@ -3016,7 +3043,7 @@ grant_table_create( goto no_mem_0; /* Simple stuff. */ - spin_lock_init(&t->lock); + rwlock_init(&t->lock); spin_lock_init(&t->maptrack_lock); t->nr_grant_frames = INITIAL_NR_GRANT_FRAMES; @@ -3126,7 +3153,7 @@ gnttab_release_mappings( } rgt = rd->grant_table; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, ref); sha = shared_entry_header(rgt, ref); @@ -3187,7 +3214,7 @@ gnttab_release_mappings( gnttab_clear_flag(_GTF_reading, status); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); rcu_unlock_domain(rd); @@ -3235,7 +3262,7 @@ static void gnttab_usage_print(struct domain *rd) printk(" -------- active -------- -------- shared --------\n"); printk("[ref] localdom mfn pin localdom gmfn flags\n"); - spin_lock(>->lock); + read_lock(>->lock); if ( gt->gt_version == 0 ) goto out; @@ -3288,7 +3315,7 @@ static void gnttab_usage_print(struct domain *rd) } out: - spin_unlock(>->lock); + read_unlock(>->lock); if ( first ) printk("grant-table for remote domain:%5d ... " diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 0b35a5e..f22ebd0 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -64,6 +64,11 @@ struct grant_mapping { /* Per-domain grant information. */ struct grant_table { + /* + * Lock protecting updates to grant table state (version, active + * entry list, etc.) + */ + rwlock_t lock; /* Table size. Number of frames shared with guest */ unsigned int nr_grant_frames; /* Shared grant table (see include/public/grant_table.h). */ @@ -84,8 +89,6 @@ struct grant_table { unsigned int maptrack_limit; /* Lock protecting the maptrack page list, head, and limit */ spinlock_t maptrack_lock; - /* Lock protecting updates to active and shared grant tables. */ - spinlock_t lock; /* The defined versions are 1 and 2. Set to 0 if we don't know what version to use yet. */ unsigned gt_version; @@ -103,7 +106,7 @@ gnttab_release_mappings( struct domain *d); /* Increase the size of a domain's grant table. - * Caller must hold d's grant table lock. + * Caller must hold d's grant table write lock. */ int gnttab_grow_table(struct domain *d, unsigned int req_nr_frames); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:25:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1c-0005bp-3Y; Wed, 17 Jun 2015 18:25:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1a-0005bY-9m for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:22 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id C0/5C-02969-19BB1855; Wed, 17 Jun 2015 18:25:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1434565518!17241867!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31967 invoked from network); 17 Jun 2015 18:25:19 -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; 17 Jun 2015 18:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1W-0002FH-II for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1W-00070a-F4 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:18 +0000 Date: Wed, 17 Jun 2015 18:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: make the grant table lock a read-write lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40de9fffb4cc0b0485aa3391d72e2220b8e1ce12 Author: David Vrabel AuthorDate: Mon Jun 15 13:25:20 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:25:20 2015 +0200 gnttab: make the grant table lock a read-write lock In combination with the per-active entry locks, the grant table lock can be made a read-write lock since the majority of cases only the read lock is required. The grant table read lock protects against changes to the table version or size (which are done with the write lock held). The write lock is also required when two active entries must be acquired. The double lock is still required when updating IOMMU page tables. With the lock contention being only on the maptrack lock (unless IOMMU updates are required), performance and scalability is improved. Based on a patch originally by Matt Wilson . Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- docs/misc/grant-tables.txt | 37 ++++++--- xen/arch/arm/mm.c | 4 +- xen/arch/x86/mm.c | 4 +- xen/common/grant_table.c | 177 +++++++++++++++++++++++----------------- xen/include/xen/grant_table.h | 9 ++- 5 files changed, 135 insertions(+), 96 deletions(-) diff --git a/docs/misc/grant-tables.txt b/docs/misc/grant-tables.txt index 4a62bf9..417ce2d 100644 --- a/docs/misc/grant-tables.txt +++ b/docs/misc/grant-tables.txt @@ -83,7 +83,7 @@ is complete. ~~~~~~~ Xen uses several locks to serialize access to the internal grant table state. - grant_table->lock : lock used to prevent readers from accessing + grant_table->lock : rwlock used to prevent readers from accessing inconsistent grant table state such as current version, partially initialized active table pages, etc. @@ -91,34 +91,43 @@ is complete. active_grant_entry->lock : spinlock used to serialize modifications to active entries - The primary lock for the grant table is a spinlock. All functions - that access members of struct grant_table must acquire the lock - around critical sections. + The primary lock for the grant table is a read/write spinlock. All + functions that access members of struct grant_table must acquire a + read lock around critical sections. Any modification to the members + of struct grant_table (e.g., nr_status_frames, nr_grant_frames, + active frames, etc.) must only be made if the write lock is + held. These elements are read-mostly, and read critical sections can + be large, which makes a rwlock a good choice. The maptrack free list is protected by its own spinlock. The maptrack lock may be locked while holding the grant table lock. Active entries are obtained by calling active_entry_acquire(gt, ref). This function returns a pointer to the active entry after locking its - spinlock. The caller must hold the grant table lock for the gt in - question before calling active_entry_acquire(). This is because the - grant table can be dynamically extended via gnttab_grow_table() while - a domain is running and must be fully initialized. Once all access to - the active entry is complete, release the lock by calling - active_entry_release(act). + spinlock. The caller must hold the grant table read lock before + calling active_entry_acquire(). This is because the grant table can + be dynamically extended via gnttab_grow_table() while a domain is + running and must be fully initialized. Once all access to the active + entry is complete, release the lock by calling active_entry_release(act). Summary of rules for locking: active_entry_acquire() and active_entry_release() can only be - called when holding the relevant grant table's lock. I.e.: - spin_lock(>->lock); + called when holding the relevant grant table's read lock. I.e.: + read_lock(>->lock); act = active_entry_acquire(gt, ref); ... active_entry_release(act); - spin_unlock(>->lock); + read_unlock(>->lock); Active entries cannot be acquired while holding the maptrack lock. Multiple active entries can be acquired while holding the grant table - lock. + _write_ lock. + + Maptrack entries are protected by the corresponding active entry + lock. As an exception, new maptrack entries may be populated without + holding the lock, provided the flags field is written last. This + requires any maptrack entry user validates the flags field as + non-zero first. ******************************************************************************** diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index feabe34..ff1b330 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1050,7 +1050,7 @@ int xenmem_add_to_physmap_one( switch ( space ) { case XENMAPSPACE_grant_table: - spin_lock(&d->grant_table->lock); + write_lock(&d->grant_table->lock); if ( d->grant_table->gt_version == 0 ) d->grant_table->gt_version = 1; @@ -1080,7 +1080,7 @@ int xenmem_add_to_physmap_one( t = p2m_ram_rw; - spin_unlock(&d->grant_table->lock); + write_unlock(&d->grant_table->lock); break; case XENMAPSPACE_shared_info: if ( idx != 0 ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 472c494..9e08c9b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4595,7 +4595,7 @@ int xenmem_add_to_physmap_one( mfn = virt_to_mfn(d->shared_info); break; case XENMAPSPACE_grant_table: - spin_lock(&d->grant_table->lock); + write_lock(&d->grant_table->lock); if ( d->grant_table->gt_version == 0 ) d->grant_table->gt_version = 1; @@ -4617,7 +4617,7 @@ int xenmem_add_to_physmap_one( mfn = virt_to_mfn(d->grant_table->shared_raw[idx]); } - spin_unlock(&d->grant_table->lock); + write_unlock(&d->grant_table->lock); break; case XENMAPSPACE_gmfn_range: case XENMAPSPACE_gmfn: diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 25da735..e134f13 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -196,7 +196,7 @@ active_entry_acquire(struct grant_table *t, grant_ref_t e) { struct active_grant_entry *act; - ASSERT(spin_is_locked(&t->lock)); + ASSERT(rw_is_locked(&t->lock)); act = &_active_entry(t, e); spin_lock(&act->lock); @@ -252,25 +252,29 @@ static int __get_paged_frame(unsigned long gfn, unsigned long *frame, struct pag static inline void double_gt_lock(struct grant_table *lgt, struct grant_table *rgt) { + /* + * See mapcount() for why the write lock is also required for the + * remote domain. + */ if ( lgt < rgt ) { - spin_lock(&lgt->lock); - spin_lock(&rgt->lock); + write_lock(&lgt->lock); + write_lock(&rgt->lock); } else { if ( lgt != rgt ) - spin_lock(&rgt->lock); - spin_lock(&lgt->lock); + write_lock(&rgt->lock); + write_lock(&lgt->lock); } } static inline void double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) { - spin_unlock(&lgt->lock); + write_unlock(&lgt->lock); if ( lgt != rgt ) - spin_unlock(&rgt->lock); + write_unlock(&rgt->lock); } static inline int @@ -528,7 +532,7 @@ static int grant_map_exists(const struct domain *ld, { unsigned int ref, max_iter; - ASSERT(spin_is_locked(&rgt->lock)); + ASSERT(rw_is_locked(&rgt->lock)); max_iter = min(*ref_count + (1 << GNTTABOP_CONTINUATION_ARG_SHIFT), nr_grant_entries(rgt)); @@ -568,15 +572,15 @@ static void mapcount( *wrc = *rdc = 0; /* - * Must have the local domain's grant table lock when iterating - * over its maptrack entries. + * Must have the local domain's grant table write lock when + * iterating over its maptrack entries. */ - ASSERT(spin_is_locked(&lgt->lock)); + ASSERT(rw_is_write_locked(&lgt->lock)); /* - * Must have the remote domain's grant table lock while counting - * its active entries. + * Must have the remote domain's grant table write lock while + * counting its active entries. */ - ASSERT(spin_is_locked(&rd->grant_table->lock)); + ASSERT(rw_is_write_locked(&rd->grant_table->lock)); for ( handle = 0; handle < lgt->maptrack_limit; handle++ ) { @@ -616,6 +620,7 @@ __gnttab_map_grant_ref( grant_entry_v2_t *sha2; grant_entry_header_t *shah; uint16_t *status; + bool_t need_iommu; led = current; ld = led->domain; @@ -661,7 +666,7 @@ __gnttab_map_grant_ref( } rgt = rd->grant_table; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) PIN_FAIL(unlock_out, GNTST_general_error, @@ -735,7 +740,7 @@ __gnttab_map_grant_ref( cache_flags = (shah->flags & (GTF_PAT | GTF_PWT | GTF_PCD) ); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); /* pg may be set, with a refcount included, from __get_paged_frame */ if ( !pg ) @@ -811,12 +816,14 @@ __gnttab_map_grant_ref( goto undo_out; } - double_gt_lock(lgt, rgt); - - if ( gnttab_need_iommu_mapping(ld) ) + need_iommu = gnttab_need_iommu_mapping(ld); + if ( need_iommu ) { unsigned int wrc, rdc; int err = 0; + + double_gt_lock(lgt, rgt); + /* We're not translated, so we know that gmfns and mfns are the same things, so the IOMMU entry is always 1-to-1. */ mapcount(lgt, rd, frame, &wrc, &rdc); @@ -842,12 +849,22 @@ __gnttab_map_grant_ref( TRACE_1D(TRC_MEM_PAGE_GRANT_MAP, op->dom); + /* + * All maptrack entry users check mt->flags first before using the + * other fields so just ensure the flags field is stored last. + * + * However, if gnttab_need_iommu_mapping() then this would race + * with a concurrent mapcount() call (on an unmap, for example) + * and a lock is required. + */ mt = &maptrack_entry(lgt, handle); mt->domid = op->dom; mt->ref = op->ref; - mt->flags = op->flags; + wmb(); + write_atomic(&mt->flags, op->flags); - double_gt_unlock(lgt, rgt); + if ( need_iommu ) + double_gt_unlock(lgt, rgt); op->dev_bus_addr = (u64)frame << PAGE_SHIFT; op->handle = handle; @@ -870,7 +887,7 @@ __gnttab_map_grant_ref( put_page(pg); } - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, op->ref); @@ -893,7 +910,7 @@ __gnttab_map_grant_ref( active_entry_release(act); unlock_out: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); op->status = rc; put_maptrack_handle(lgt, handle); rcu_unlock_domain(rd); @@ -943,18 +960,19 @@ __gnttab_unmap_common( } op->map = &maptrack_entry(lgt, op->handle); - spin_lock(&lgt->lock); - if ( unlikely(!op->map->flags) ) + read_lock(&lgt->lock); + + if ( unlikely(!read_atomic(&op->map->flags)) ) { - spin_unlock(&lgt->lock); + read_unlock(&lgt->lock); gdprintk(XENLOG_INFO, "Zero flags for handle (%d).\n", op->handle); op->status = GNTST_bad_handle; return; } dom = op->map->domid; - spin_unlock(&lgt->lock); + read_unlock(&lgt->lock); if ( unlikely((rd = rcu_lock_domain_by_id(dom)) == NULL) ) { @@ -975,9 +993,10 @@ __gnttab_unmap_common( TRACE_1D(TRC_MEM_PAGE_GRANT_UNMAP, dom); rgt = rd->grant_table; - double_gt_lock(lgt, rgt); - op->flags = op->map->flags; + read_lock(&rgt->lock); + + op->flags = read_atomic(&op->map->flags); if ( unlikely(!op->flags) || unlikely(op->map->domid != dom) ) { gdprintk(XENLOG_WARNING, "Unstable handle %u\n", op->handle); @@ -1024,31 +1043,34 @@ __gnttab_unmap_common( act->pin -= GNTPIN_hstw_inc; } - if ( gnttab_need_iommu_mapping(ld) ) + act_release_out: + active_entry_release(act); + unmap_out: + read_unlock(&rgt->lock); + + if ( rc == GNTST_okay && gnttab_need_iommu_mapping(ld) ) { unsigned int wrc, rdc; int err = 0; + + double_gt_lock(lgt, rgt); + mapcount(lgt, rd, op->frame, &wrc, &rdc); if ( (wrc + rdc) == 0 ) err = iommu_unmap_page(ld, op->frame); else if ( wrc == 0 ) err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); + + double_gt_unlock(lgt, rgt); + if ( err ) - { rc = GNTST_general_error; - goto act_release_out; - } } /* If just unmapped a writable mapping, mark as dirtied */ - if ( !(op->flags & GNTMAP_readonly) ) + if ( rc == GNTST_okay && !(op->flags & GNTMAP_readonly) ) gnttab_mark_dirty(rd, op->frame); - act_release_out: - active_entry_release(act); - unmap_out: - double_gt_unlock(lgt, rgt); - op->status = rc; rcu_unlock_domain(rd); } @@ -1078,8 +1100,8 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) rcu_lock_domain(rd); rgt = rd->grant_table; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) goto unlock_out; @@ -1145,7 +1167,7 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) act_release_out: active_entry_release(act); unlock_out: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); if ( put_handle ) { @@ -1332,11 +1354,13 @@ gnttab_unpopulate_status_frames(struct domain *d, struct grant_table *gt) gt->nr_status_frames = 0; } +/* + * Grow the grant table. The caller must hold the grant table's + * write lock before calling this function. + */ int gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) { - /* d's grant table lock must be held by the caller */ - struct grant_table *gt = d->grant_table; unsigned int i, j; @@ -1442,7 +1466,7 @@ gnttab_setup_table( } gt = d->grant_table; - spin_lock(>->lock); + write_lock(>->lock); if ( gt->gt_version == 0 ) gt->gt_version = 1; @@ -1470,7 +1494,7 @@ gnttab_setup_table( } out3: - spin_unlock(>->lock); + write_unlock(>->lock); out2: rcu_unlock_domain(d); out1: @@ -1512,13 +1536,13 @@ gnttab_query_size( goto query_out_unlock; } - spin_lock(&d->grant_table->lock); + read_lock(&d->grant_table->lock); op.nr_frames = nr_grant_frames(d->grant_table); op.max_nr_frames = max_grant_frames; op.status = GNTST_okay; - spin_unlock(&d->grant_table->lock); + read_unlock(&d->grant_table->lock); query_out_unlock: @@ -1544,7 +1568,7 @@ gnttab_prepare_for_transfer( union grant_combo scombo, prev_scombo, new_scombo; int retries = 0; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) { @@ -1595,11 +1619,11 @@ gnttab_prepare_for_transfer( scombo = prev_scombo; } - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return 1; fail: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return 0; } @@ -1614,6 +1638,7 @@ gnttab_transfer( struct gnttab_transfer gop; unsigned long mfn; unsigned int max_bitsize; + struct active_grant_entry *act; for ( i = 0; i < count; i++ ) { @@ -1792,7 +1817,8 @@ gnttab_transfer( TRACE_1D(TRC_MEM_PAGE_GRANT_TRANSFER, e->domain_id); /* Tell the guest about its new page frame. */ - spin_lock(&e->grant_table->lock); + read_lock(&e->grant_table->lock); + act = active_entry_acquire(e->grant_table, gop.ref); if ( e->grant_table->gt_version == 1 ) { @@ -1810,7 +1836,8 @@ gnttab_transfer( shared_entry_header(e->grant_table, gop.ref)->flags |= GTF_transfer_completed; - spin_unlock(&e->grant_table->lock); + active_entry_release(act); + read_unlock(&e->grant_table->lock); rcu_unlock_domain(e); @@ -1848,7 +1875,7 @@ __release_grant_for_copy( released_read = 0; released_write = 0; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, gref); sha = shared_entry_header(rgt, gref); @@ -1890,7 +1917,7 @@ __release_grant_for_copy( } active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); if ( td != rd ) { @@ -1948,7 +1975,7 @@ __acquire_grant_for_copy( *page = NULL; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); if ( rgt->gt_version == 0 ) PIN_FAIL(gt_unlock_out, GNTST_general_error, @@ -2024,20 +2051,20 @@ __acquire_grant_for_copy( * here and reacquire */ active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); rc = __acquire_grant_for_copy(td, trans_gref, rd->domain_id, readonly, &grant_frame, page, &trans_page_off, &trans_length, 0); - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, gref); if ( rc != GNTST_okay ) { __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return rc; } @@ -2050,7 +2077,7 @@ __acquire_grant_for_copy( __fixup_status_for_copy_pin(act, status); rcu_unlock_domain(td); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); put_page(*page); return __acquire_grant_for_copy(rd, gref, ldom, readonly, frame, page, page_off, length, @@ -2119,7 +2146,7 @@ __acquire_grant_for_copy( *frame = act->frame; active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return rc; unlock_out_clear: @@ -2134,7 +2161,7 @@ __acquire_grant_for_copy( active_entry_release(act); gt_unlock_out: - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); return rc; } @@ -2450,7 +2477,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) if ( gt->gt_version == op.version ) goto out; - spin_lock(>->lock); + write_lock(>->lock); /* Make sure that the grant table isn't currently in use when we change the version number, except for the first 8 entries which are allowed to be in use (xenstore/xenconsole keeps them mapped). @@ -2535,7 +2562,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) gt->gt_version = op.version; out_unlock: - spin_unlock(>->lock); + write_unlock(>->lock); out: op.version = gt->gt_version; @@ -2591,7 +2618,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_t) uop, op.status = GNTST_okay; - spin_lock(>->lock); + read_lock(>->lock); for ( i = 0; i < op.nr_frames; i++ ) { @@ -2600,7 +2627,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_t) uop, op.status = GNTST_bad_virt_addr; } - spin_unlock(>->lock); + read_unlock(>->lock); out2: rcu_unlock_domain(d); out1: @@ -2650,7 +2677,7 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) struct active_grant_entry *act_b = NULL; s16 rc = GNTST_okay; - spin_lock(>->lock); + write_lock(>->lock); if ( gt->gt_version == 0 ) PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); @@ -2701,7 +2728,7 @@ out: active_entry_release(act_b); if ( act_a != NULL ) active_entry_release(act_a); - spin_unlock(>->lock); + write_unlock(>->lock); rcu_unlock_domain(d); @@ -2772,12 +2799,12 @@ static int __gnttab_cache_flush(gnttab_cache_flush_t *cflush, if ( d != owner ) { - spin_lock(&owner->grant_table->lock); + read_lock(&owner->grant_table->lock); ret = grant_map_exists(d, owner->grant_table, mfn, ref_count); if ( ret != 0 ) { - spin_unlock(&owner->grant_table->lock); + read_unlock(&owner->grant_table->lock); rcu_unlock_domain(d); put_page(page); return ret; @@ -2797,7 +2824,7 @@ static int __gnttab_cache_flush(gnttab_cache_flush_t *cflush, ret = 0; if ( d != owner ) - spin_unlock(&owner->grant_table->lock); + read_unlock(&owner->grant_table->lock); unmap_domain_page(v); put_page(page); @@ -3016,7 +3043,7 @@ grant_table_create( goto no_mem_0; /* Simple stuff. */ - spin_lock_init(&t->lock); + rwlock_init(&t->lock); spin_lock_init(&t->maptrack_lock); t->nr_grant_frames = INITIAL_NR_GRANT_FRAMES; @@ -3126,7 +3153,7 @@ gnttab_release_mappings( } rgt = rd->grant_table; - spin_lock(&rgt->lock); + read_lock(&rgt->lock); act = active_entry_acquire(rgt, ref); sha = shared_entry_header(rgt, ref); @@ -3187,7 +3214,7 @@ gnttab_release_mappings( gnttab_clear_flag(_GTF_reading, status); active_entry_release(act); - spin_unlock(&rgt->lock); + read_unlock(&rgt->lock); rcu_unlock_domain(rd); @@ -3235,7 +3262,7 @@ static void gnttab_usage_print(struct domain *rd) printk(" -------- active -------- -------- shared --------\n"); printk("[ref] localdom mfn pin localdom gmfn flags\n"); - spin_lock(>->lock); + read_lock(>->lock); if ( gt->gt_version == 0 ) goto out; @@ -3288,7 +3315,7 @@ static void gnttab_usage_print(struct domain *rd) } out: - spin_unlock(>->lock); + read_unlock(>->lock); if ( first ) printk("grant-table for remote domain:%5d ... " diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 0b35a5e..f22ebd0 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -64,6 +64,11 @@ struct grant_mapping { /* Per-domain grant information. */ struct grant_table { + /* + * Lock protecting updates to grant table state (version, active + * entry list, etc.) + */ + rwlock_t lock; /* Table size. Number of frames shared with guest */ unsigned int nr_grant_frames; /* Shared grant table (see include/public/grant_table.h). */ @@ -84,8 +89,6 @@ struct grant_table { unsigned int maptrack_limit; /* Lock protecting the maptrack page list, head, and limit */ spinlock_t maptrack_lock; - /* Lock protecting updates to active and shared grant tables. */ - spinlock_t lock; /* The defined versions are 1 and 2. Set to 0 if we don't know what version to use yet. */ unsigned gt_version; @@ -103,7 +106,7 @@ gnttab_release_mappings( struct domain *d); /* Increase the size of a domain's grant table. - * Caller must hold d's grant table lock. + * Caller must hold d's grant table write lock. */ int gnttab_grow_table(struct domain *d, unsigned int req_nr_frames); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1l-0005e7-8V; Wed, 17 Jun 2015 18:25:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1j-0005dn-Bw for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:31 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 46/78-13047-A9BB1855; Wed, 17 Jun 2015 18:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1434565529!24208898!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19626 invoked from network); 17 Jun 2015 18:25:29 -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; 17 Jun 2015 18:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1g-0002FR-Rh for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1g-00070w-Nb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:28 +0000 Date: Wed, 17 Jun 2015 18:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: partly restore commit 73cb5d43a8 (build 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 2fdf3c433a8cba33fae623d7138c173e111b81cb Author: Jan Beulich AuthorDate: Mon Jun 15 13:27:53 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:27:53 2015 +0200 x86/MSI: partly restore commit 73cb5d43a8 (build fix) Signed-off-by: Jan Beulich --- xen/include/asm-x86/msi.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 4c62a3a..abbecf8 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -65,8 +65,13 @@ struct msi_info { }; struct msi_msg { - u32 address_lo; /* low 32 bits of msi message address */ - u32 address_hi; /* high 32 bits of msi message address */ + union { + u64 address; /* message address */ + struct { + u32 address_lo; /* message address low 32 bits */ + u32 address_hi; /* message address high 32 bits */ + }; + }; u32 data; /* 16 bits of msi message data */ u32 dest32; /* used when Interrupt Remapping with EIM is enabled */ }; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1l-0005e7-8V; Wed, 17 Jun 2015 18:25:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1j-0005dn-Bw for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:31 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 46/78-13047-A9BB1855; Wed, 17 Jun 2015 18:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1434565529!24208898!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19626 invoked from network); 17 Jun 2015 18:25:29 -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; 17 Jun 2015 18:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1g-0002FR-Rh for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1g-00070w-Nb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:28 +0000 Date: Wed, 17 Jun 2015 18:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: partly restore commit 73cb5d43a8 (build 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 2fdf3c433a8cba33fae623d7138c173e111b81cb Author: Jan Beulich AuthorDate: Mon Jun 15 13:27:53 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 15 13:27:53 2015 +0200 x86/MSI: partly restore commit 73cb5d43a8 (build fix) Signed-off-by: Jan Beulich --- xen/include/asm-x86/msi.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 4c62a3a..abbecf8 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -65,8 +65,13 @@ struct msi_info { }; struct msi_msg { - u32 address_lo; /* low 32 bits of msi message address */ - u32 address_hi; /* high 32 bits of msi message address */ + union { + u64 address; /* message address */ + struct { + u32 address_lo; /* message address low 32 bits */ + u32 address_hi; /* message address high 32 bits */ + }; + }; u32 data; /* 16 bits of msi message data */ u32 dest32; /* used when Interrupt Remapping with EIM is enabled */ }; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:25:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1z-0005hD-BU; Wed, 17 Jun 2015 18:25:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1w-0005gk-Pb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:45 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 71/79-18947-8ABB1855; Wed, 17 Jun 2015 18:25:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1434565539!24296126!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 555 invoked from network); 17 Jun 2015 18:25:40 -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; 17 Jun 2015 18:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1r-0002FZ-4X for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1q-00071M-Vb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:39 +0000 Date: Wed, 17 Jun 2015 18:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: add to tools/xentrace/ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd19a9976e7ce63bf07f8af1b9b5e8bb5812d51d Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:38 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:34:59 2015 +0100 xenalyze: add to tools/xentrace/ This merges xenalyze.hg, changeset 150:24308507be1d, into tools/xentrace/xenalyze.c to have the tool and public/trace.h in one place. Adjust code to use public/trace.h instead of private trace.h Signed-off-by: Olaf Hering Acked-by: Wei Liu Acked-by: George Dunlap Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu [ ijc -- wrap $(BIN) install in a check in case it is empty (which it is on !x86, avoid BIN += since it results in BIN = ' ' on !x86 ] --- .gitignore | 1 + tools/xentrace/Makefile | 9 +- tools/xentrace/analyze.h | 107 + tools/xentrace/mread.c | 160 + tools/xentrace/mread.h | 18 + tools/xentrace/pv.h | 41 + tools/xentrace/xenalyze.c |10407 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 10742 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3bc9cd9..3f42ded 100644 --- a/.gitignore +++ b/.gitignore @@ -173,6 +173,7 @@ tools/misc/gtracestat tools/misc/xenlockprof tools/misc/lowmemd tools/misc/xencov +tools/xentrace/xenalyze tools/pygrub/build/* tools/python/build/* tools/security/secpol_tool diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 5360960..7d874a3 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -6,7 +6,8 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) -BIN = +BIN-$(CONFIG_X86) = xenalyze +BIN = $(BIN-y) SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format @@ -26,6 +27,9 @@ install: build [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) +ifneq ($(BIN),) + $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) +endif $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) @@ -48,5 +52,8 @@ xenctx: xenctx.o xentrace_setsize: setsize.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) +xenalyze: xenalyze.o mread.o + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS) + -include $(DEPS) diff --git a/tools/xentrace/analyze.h b/tools/xentrace/analyze.h new file mode 100644 index 0000000..40ee551 --- /dev/null +++ b/tools/xentrace/analyze.h @@ -0,0 +1,107 @@ +#ifndef __ANALYZE_H +# define __ANALYZE_H + +#include + +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + +#define TRC_GEN_MAIN 0 +#define TRC_SCHED_MAIN 1 +#define TRC_DOM0OP_MAIN 2 +#define TRC_HVM_MAIN 3 +#define TRC_MEM_MAIN 4 +#define TRC_PV_MAIN 5 +#define TRC_SHADOW_MAIN 6 +#define TRC_HW_MAIN 7 + +#define TRC_LOST_RECORDS_END (TRC_GEN + 50) + +#define NR_CPUS 128 +#if __x86_64__ +# define BITS_PER_LONG 64 +#else +# define BITS_PER_LONG 32 +#endif + +#define BITS_TO_LONGS(bits) \ + (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) +#define DECLARE_BITMAP(name,bits) \ + unsigned long name[BITS_TO_LONGS(bits)] +typedef struct cpumask{ DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t; + +enum { + TRCE_SFLAG_SET_AD, + TRCE_SFLAG_SET_A, + TRCE_SFLAG_SHADOW_L1_GET_REF, + TRCE_SFLAG_SHADOW_L1_PUT_REF, + TRCE_SFLAG_L2_PROPAGATE, + TRCE_SFLAG_SET_CHANGED, + TRCE_SFLAG_SET_FLUSH, + TRCE_SFLAG_SET_ERROR, + TRCE_SFLAG_DEMOTE, + TRCE_SFLAG_PROMOTE, + TRCE_SFLAG_WRMAP, + TRCE_SFLAG_WRMAP_GUESS_FOUND, + TRCE_SFLAG_WRMAP_BRUTE_FORCE, + TRCE_SFLAG_EARLY_UNSHADOW, + TRCE_SFLAG_EMULATION_2ND_PT_WRITTEN, + TRCE_SFLAG_EMULATION_LAST_FAILED, + TRCE_SFLAG_EMULATE_FULL_PT, + TRCE_SFLAG_PREALLOC_UNPIN, + TRCE_SFLAG_PREALLOC_UNHOOK +}; + +#define TRC_HVM_OP_DESTROY_PROC (TRC_HVM_HANDLER + 0x100) + +typedef unsigned long long tsc_t; + +/* -- on-disk trace buffer definitions -- */ +struct trace_record { + union { + struct { + unsigned event:28, + extra_words:3, + cycle_flag:1; + union { + struct { + uint32_t tsc_lo, tsc_hi; + uint32_t data[7]; + } tsc; + struct { + uint32_t data[7]; + } notsc; + } u; + }; + uint32_t raw[8]; + }; +}; + +/* -- General info about a current record -- */ +struct time_struct { + unsigned long long time; + unsigned int s, ns; +}; + +#define DUMP_HEADER_MAX 256 + +struct record_info { + int cpu; + tsc_t tsc; + union { + unsigned event; + struct { + unsigned minor:12, + sub:4, + main:12, + unused:4; + } evt; + }; + int extra_words; + int size; + uint32_t *d; + char dump_header[DUMP_HEADER_MAX]; + struct time_struct t; + struct trace_record rec; +}; + +#endif diff --git a/tools/xentrace/mread.c b/tools/xentrace/mread.c new file mode 100644 index 0000000..a63d16c --- /dev/null +++ b/tools/xentrace/mread.c @@ -0,0 +1,160 @@ +#include +#include +#include +#include +#include +#include +#include +#include "mread.h" + +mread_handle_t mread_init(int fd) +{ + struct stat64 s; + mread_handle_t h; + + h=malloc(sizeof(struct mread_ctrl)); + + if (!h) + { + perror("malloc"); + exit(1); + } + + bzero(h, sizeof(struct mread_ctrl)); + + h->fd = fd; + + fstat64(fd, &s); + h->file_size = s.st_size; + + return h; +} + +ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, loff_t offset) +{ + /* Idea: have a "cache" of N mmaped regions. If the offset is + * in one of the regions, just copy it. If not, evict one of the + * regions and map the appropriate range. + * + * Basic algorithm: + * - See if the offset is in one of the regions + * - If not, map it + * - evict an old region + * - map the new region + * - Copy + */ + char * b=NULL; + int bind=-1; + loff_t boffset=0; + ssize_t bsize; + +#define dprintf(x...) +//#define dprintf fprintf + + dprintf(warn, "%s: offset %llx len %d\n", __func__, + offset, len); + if ( offset > h->file_size ) + { + dprintf(warn, " offset > file size %llx, returning 0\n", + h->file_size); + return 0; + } + if ( offset + len > h->file_size ) + { + dprintf(warn, " offset+len > file size %llx, truncating\n", + h->file_size); + len = h->file_size - offset; + } + + /* Try to find the offset in our range */ + dprintf(warn, " Trying last, %d\n", last); + if ( h->map[h->last].buffer + && (offset & MREAD_BUF_MASK) == h->map[h->last].start_offset ) + { + bind=h->last; + goto copy; + } + + /* Scan to see if it's anywhere else */ + dprintf(warn, " Scanning\n"); + for(bind=0; bindmap[bind].buffer + && (offset & MREAD_BUF_MASK) == h->map[bind].start_offset ) + { + dprintf(warn, " Found, index %d\n", bind); + break; + } + + /* If we didn't find it, evict someone and map it */ + if ( bind == MREAD_MAPS ) + { + dprintf(warn, " Clock\n"); + while(1) + { + h->clock++; + if(h->clock >= MREAD_MAPS) + h->clock=0; + dprintf(warn, " %d\n", h->clock); + if(h->map[h->clock].buffer == NULL) + { + dprintf(warn, " Buffer null, using\n"); + break; + } + if(!h->map[h->clock].accessed) + { + dprintf(warn, " Not accessed, using\n"); + break; + } + h->map[h->clock].accessed=0; + } + if(h->map[h->clock].buffer) + { + dprintf(warn, " Unmapping\n"); + munmap(h->map[h->clock].buffer, MREAD_BUF_SIZE); + } + /* FIXME: Try MAP_HUGETLB? */ + /* FIXME: Make sure this works on large files... */ + h->map[h->clock].start_offset = offset & MREAD_BUF_MASK; + dprintf(warn, " Mapping %llx from offset %llx\n", + MREAD_BUF_SIZE, h->map[h->clock].start_offset); + h->map[h->clock].buffer = mmap(NULL, MREAD_BUF_SIZE, PROT_READ, + MAP_SHARED, + h->fd, + h->map[h->clock].start_offset); + dprintf(warn, " mmap returned %p\n", h->map[h->clock].buffer); + if ( h->map[h->clock].buffer == MAP_FAILED ) + { + h->map[h->clock].buffer = NULL; + perror("mmap"); + exit(1); + } + bind = h->clock; + } + + h->last=bind; +copy: + h->map[bind].accessed=1; + b=h->map[bind].buffer; + boffset=offset - h->map[bind].start_offset; + if ( boffset + len > MREAD_BUF_SIZE ) + bsize = MREAD_BUF_SIZE - boffset; + else + bsize = len; + dprintf(warn, " Using index %d, buffer at %p, buffer offset %llx len %d\n", + bind, b, boffset, bsize); + + bcopy(b+boffset, rec, bsize); + + /* Handle the boundary case; make sure this is after doing anything + * with the static variables*/ + if ( len > bsize ) + { + dprintf(warn, " Finishing up by reading l %d o %llx\n", + len-bsize, offset+bsize); + mread64(h, rec+bsize, len-bsize, offset+bsize); + } + + /* FIXME: ?? */ + return len; +#undef dprintf +} diff --git a/tools/xentrace/mread.h b/tools/xentrace/mread.h new file mode 100644 index 0000000..8df41a8 --- /dev/null +++ b/tools/xentrace/mread.h @@ -0,0 +1,18 @@ +#define MREAD_MAPS 8 +#define MREAD_BUF_SHIFT 9 +#define PAGE_SHIFT 12 +#define MREAD_BUF_SIZE (1ULL<<(PAGE_SHIFT+MREAD_BUF_SHIFT)) +#define MREAD_BUF_MASK (~(MREAD_BUF_SIZE-1)) +typedef struct mread_ctrl { + int fd; + loff_t file_size; + struct mread_buffer { + char * buffer; + loff_t start_offset; + int accessed; + } map[MREAD_MAPS]; + int clock, last; +} *mread_handle_t; + +mread_handle_t mread_init(int fd); +ssize_t mread64(mread_handle_t h, void *dst, ssize_t len, loff_t offset); diff --git a/tools/xentrace/pv.h b/tools/xentrace/pv.h new file mode 100644 index 0000000..3e6ad77 --- /dev/null +++ b/tools/xentrace/pv.h @@ -0,0 +1,41 @@ +/* + * PV event decoding. + * + * Copyright (C) 2012 Citrix Systems R&D Ltd. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + */ +#ifndef __PV_H + +#include "analyze.h" +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define ARG_MISSING 0x0 +#define ARG_32BIT 0x1 +#define ARG_64BIT 0x2 + +#define MMU_UPDATE_PREEMPTED (~(~0U>>1)) + +static inline uint32_t pv_hypercall_op(const struct record_info *ri) +{ + return ri->d[0] & ~TRC_PV_HYPERCALL_V2_ARG_MASK; +} + +static inline int pv_hypercall_arg_present(const struct record_info *ri, int arg) +{ + return (ri->d[0] >> (20 + 2*arg)) & 0x3; +} + +void pv_hypercall_gather_args(const struct record_info *ri, uint64_t *args); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c new file mode 100644 index 0000000..a0a3ac1 --- /dev/null +++ b/tools/xentrace/xenalyze.c @@ -0,0 +1,10407 @@ +/* + * xenalyze.c: Analyzing xentrace output + * + * Written by George Dunlap. + * + * Copyright (c) 2006-2007, XenSource Inc. + * Copyright (c) 2007-2008, Citrix Systems R&D Ltd, UK + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + */ +#define _XOPEN_SOURCE 600 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "analyze.h" +#include "mread.h" +#include "pv.h" +#include +#include +#include +#include + +struct mread_ctrl; + + +#define DEFAULT_CPU_HZ 2400000000LL +#define QHZ_FROM_HZ(_hz) (((_hz) << 10)/ 1000000000) + +#define ADDR_SPACE_BITS 48 +#define DEFAULT_SAMPLE_SIZE 10240 +#define DEFAULT_INTERVAL_LENGTH 1000 + +struct array_struct { + unsigned long long *values; + int count; +}; + +#define warn_once(_x...) \ + do { \ + static int _w=1; \ + if ( _w ) { \ + _w=0; \ + fprintf(warn, ##_x); \ + } \ + } while(0) \ + +/* -- Global variables -- */ +struct { + int fd; + struct mread_ctrl *mh; + struct symbol_struct * symbols; + char * symbol_file; + char * trace_file; + int output_defined; + loff_t file_size; + struct { + loff_t update_offset; + int pipe[2]; + FILE* out; + int pid; + } progress; +} G = { + .fd=-1, + .symbols = NULL, + .symbol_file = NULL, + .trace_file = NULL, + .output_defined = 0, + .file_size = 0, + .progress = { .update_offset = 0 }, +}; + +/* + Kinds of errors: + Unexpected values + - RIP with information in high bits (not all 0 or 1) + - exit reason too high + Unexpected record layout + - x64 bit set in PIO,PV_PTWR_EMULATION_PAE, + - Unknown minor type (PV_PTWR_EMULATION, RUNSTATE_CHANGE + - Wrong record size + - More than one bit set in evt.main field + Unexpected sequences + - wake tsc tracking + - TSC dependency loop + - Mismatch between non-running old event states + - Runstate continue while running on another pcpu + - lost_record_end seen in non-lost pcpu + - Unexpected non-CPU_CHANGE record during new_pcpu scan + - record tsc < interval start tsc + - lost_record tsc !> order tsc + Limited resources + - interrupt interval slots + - record cpu > MAX_CPUS + Algorithm asserts + - Duplicate CR3/domain values + - Logic holes + - domain runstates + - runstate / tsc skew + - vcpu_{prev,next}_update p->current{==,!=}null + - vcpu start conditions + - lost_cpu count higher than # of seen cpus / < 0 + - lost cpu has non-null p->current + Symbol file + -file doesn't open + -file not ordered + System + - short read + - malloc failed + Args + - Invalid cpu_hz value / suffix + - No trace file + - Can't open trace file +*/ +enum error_level { + ERR_NONE=0, + ERR_STRICT, /* Be unreasonably picky */ + ERR_WARN, /* Something midly unexpected */ + ERR_SANITY, /* Sanity checks: RIP with info in high bits */ + ERR_RECORD, /* Something that keeps you from processing the record */ + ERR_FILE, /* Probably caused by a corrupt file */ + ERR_LIMIT, /* Exceeded limits; data will be lost */ + ERR_MAX_TOLERABLE=ERR_LIMIT, + /* -- Unrecoverable past this point -- */ + ERR_ASSERT, /* Algoritm assert */ + ERR_SYSTEM, /* System error: cannot allocate memory, short read, &c */ +}; + +int verbosity = 5; + +struct { + unsigned + scatterplot_interrupt_eip:1, + scatterplot_cpi:1, + scatterplot_unpin_promote:1, + scatterplot_cr3_switch:1, + scatterplot_wake_to_halt:1, + scatterplot_io:1, + scatterplot_vmexit_eip:1, + scatterplot_runstate:1, + scatterplot_runstate_time:1, + scatterplot_pcpu:1, + scatterplot_extint_cycles:1, + scatterplot_rdtsc:1, + scatterplot_irq:1, + histogram_interrupt_eip:1, + interval_mode:1, + dump_all:1, + dump_raw_process:1, + dump_raw_reads:1, + dump_no_processing:1, + dump_ipi_latency:1, + dump_trace_volume_on_lost_record:1, + dump_show_power_states:1, + with_cr3_enumeration:1, + with_pio_enumeration:1, + with_mmio_enumeration:1, + with_interrupt_eip_enumeration:1, + show_default_domain_summary:1, + mmio_enumeration_skip_vga:1, + progress:1, + svm_mode:1, + summary:1, + report_pcpu:1, + tsc_loop_fatal:1, + summary_info; + long long cpu_qhz, cpu_hz; + int scatterplot_interrupt_vector; + int scatterplot_extint_cycles_vector; + int scatterplot_io_port; + int histogram_interrupt_vector; + unsigned long long histogram_interrupt_increment; + int interrupt_eip_enumeration_vector; + int default_guest_paging_levels; + int sample_size; + enum error_level tolerance; /* Tolerate up to this level of error */ + struct { + tsc_t cycles; + /* Used if interval is specified in seconds to delay calculating + * time_interval until all arguments have been processed (specifically, + * cpu_hz). */ + unsigned msec; + enum { + INTERVAL_CR3_SCHEDULE_TIME, + INTERVAL_CR3_SCHEDULE_ORDERED, + INTERVAL_CR3_SHORT_SUMMARY, + INTERVAL_DOMAIN_TOTAL_TIME, + INTERVAL_DOMAIN_SHORT_SUMMARY, + INTERVAL_DOMAIN_GUEST_INTERRUPT, + INTERVAL_DOMAIN_GRANT_MAPS + } output; + enum { + INTERVAL_MODE_CUSTOM, + INTERVAL_MODE_ARRAY, + INTERVAL_MODE_LIST + } mode; + enum { + INTERVAL_CHECK_NONE, + INTERVAL_CHECK_CR3, + INTERVAL_CHECK_DOMAIN + } check; + /* Options for specific interval output types */ + union { + struct array_struct array; + }; + int count; + } interval; +} opt = { + .scatterplot_interrupt_eip=0, + .scatterplot_cpi=0, + .scatterplot_unpin_promote=0, + .scatterplot_cr3_switch=0, + .scatterplot_wake_to_halt=0, + .scatterplot_vmexit_eip=0, + .scatterplot_runstate=0, + .scatterplot_runstate_time=0, + .scatterplot_pcpu=0, + .scatterplot_extint_cycles=0, + .scatterplot_rdtsc=0, + .scatterplot_irq=0, + .histogram_interrupt_eip=0, + .dump_all = 0, + .dump_raw_process = 0, + .dump_raw_reads = 0, + .dump_no_processing = 0, + .dump_ipi_latency = 0, + .dump_trace_volume_on_lost_record = 0, + .dump_show_power_states = 0, + .with_cr3_enumeration = 0, + .with_pio_enumeration = 1, + .with_mmio_enumeration = 0, + .with_interrupt_eip_enumeration = 0, + .show_default_domain_summary = 0, + .mmio_enumeration_skip_vga = 1, + .progress = 0, + .svm_mode = 0, + .summary = 0, + .report_pcpu = 0, + .tsc_loop_fatal = 0, + .cpu_hz = DEFAULT_CPU_HZ, + /* Pre-calculate a multiplier that makes the rest of the + * calculations easier */ + .cpu_qhz = QHZ_FROM_HZ(DEFAULT_CPU_HZ), + .default_guest_paging_levels = 2, + .sample_size = DEFAULT_SAMPLE_SIZE, + .tolerance = ERR_SANITY, + .interval = { .msec = DEFAULT_INTERVAL_LENGTH }, +}; + +FILE *warn = NULL; + +/* -- Summary data -- */ +struct cycle_framework { + tsc_t first_tsc, last_tsc, total_cycles; +}; + +struct interval_element { + int count; + long long cycles; + long long instructions; +}; + +struct event_cycle_summary { + int count, cycles_count; + long long cycles; + long long *cycles_sample; + struct interval_element interval; +}; + +struct cycle_summary { + int count; + unsigned long long cycles; + long long *sample; + struct interval_element interval; +}; + +struct weighted_cpi_summary { + int count; + unsigned long long instructions; + unsigned long long cycles; + float *cpi; + unsigned long long *cpi_weight; + struct interval_element interval; +}; + +/* -- Symbol list information -- */ +#define SYMBOL_ENTRIES_PER_STRUCT 1023 +#define SYMBOL_NAME_SIZE 124 +struct symbol_struct { + int count; + struct { + unsigned long long addr; + char name[SYMBOL_NAME_SIZE]; + } symbols[SYMBOL_ENTRIES_PER_STRUCT]; + struct symbol_struct *next; +}; + +void error(enum error_level l, struct record_info *ri); + +void parse_symbol_file(char *fn) { + unsigned long long last_addr = 0; + FILE * symbol_file; + struct symbol_struct ** p=&G.symbols; + + if((symbol_file=fopen(fn, "rb"))==NULL) { + fprintf(stderr, "Could not open symbol file %s\n", fn); + perror("open"); + error(ERR_SYSTEM, NULL); + } + while(!feof(symbol_file)) { + /* Allocate a new struct if we need it */ + if(!*p) { + *p = malloc(sizeof(**p)); + if(!*p) { + fprintf(stderr, "Malloc failed!\n"); + error(ERR_SYSTEM, NULL); + } + (*p)->count=0; + (*p)->next=NULL; + } + + /* FIXME -- use SYMBOL_NAME_SIZE */ + /* FIXME -- use regexp. This won't work for symbols with spaces (yes they exist) */ + (*p)->symbols[(*p)->count].addr = 0xDEADBEEF; + if ( fscanf(symbol_file, "%llx %128s", + &(*p)->symbols[(*p)->count].addr, + (*p)->symbols[(*p)->count].name) == 0 ) + break; + + + if( ((*p)->symbols[(*p)->count].addr > 0) + && ((*p)->symbols[(*p)->count].addr < last_addr) ) { + fprintf(stderr, "Symbol file not properly ordered: %llx %s < %llx!\n", + (*p)->symbols[(*p)->count].addr, + (*p)->symbols[(*p)->count].name, + last_addr); + /* Could be recovered from; just free existing strings and set symbols to NULL */ + error(ERR_ASSERT, NULL); + } else + last_addr = (*p)->symbols[(*p)->count].addr; + + (*p)->count++; + + /* If this struct is full, point to the next. It will be allocated + if needed. */ + if((*p)->count == SYMBOL_ENTRIES_PER_STRUCT) { + p=&((*p)->next); + } + } +} + +/* WARNING not thread safe */ +char * find_symbol(unsigned long long addr) { + struct symbol_struct * p=G.symbols; + int i; + char * lastname="ZERO"; + unsigned long long offset=addr; + static char name[128]; + + if(!p) { + name[0]=0; + return name; + } + + while(1) { + if(!p) + goto finish; + for(i=0; icount; i++) { + if(p->symbols[i].addr > addr) + goto finish; + else { + lastname=p->symbols[i].name; + offset=addr - p->symbols[i].addr; + } + } + p=p->next; + } + finish: + snprintf(name, 128, "(%s +%llx)", + lastname, offset); + return name; +} + +/* -- Eip list data -- */ +enum { + EIP_LIST_TYPE_NONE=0, + EIP_LIST_TYPE_MAX +}; + +struct eip_list_struct { + struct eip_list_struct *next; + unsigned long long eip; + struct event_cycle_summary summary; + int type; + void * extra; +}; + +struct { + void (*update)(struct eip_list_struct *, void *); + void (*new)(struct eip_list_struct *, void *); + void (*dump)(struct eip_list_struct *); +} eip_list_type[EIP_LIST_TYPE_MAX] = { + [EIP_LIST_TYPE_NONE] = { + .update=NULL, + .new=NULL, + .dump=NULL }, +}; + + +/* --- HVM class of events --- */ + +/* + * -- Algorithms -- + * + * Interrupt Wake-to-halt detection + * + * Purpose: To correlate device interrupts to vcpu runtime. + * + * Diagram: + * ... + * blocked -> runnable <- set to waking + * ... + * runnable -> running + * inj_virq A <- Note "waking" interrupt + * vmenter <- Start tsc of "wake-to-halt" interval. + Turn off 'waking'. + * ... + * inj_virq B <- Note alternate interrupt + * vmenter <- Start tsc of "interrupt-to-halt" interval + * ... + * vmexit <- End tsc of "x-to-halt" interval + * running -> blocked <- Process + * + * The "waking" interrupts we want to sub-classify into + * "wake-only" (when interrupt was the only interrupt from wake to halt) and + * "wake-all" (whether this was the only interrupt or not). + */ + +/* VMX data */ +#define EXIT_REASON_EXCEPTION_NMI 0 +#define EXIT_REASON_EXTERNAL_INTERRUPT 1 +#define EXIT_REASON_TRIPLE_FAULT 2 +#define EXIT_REASON_INIT 3 +#define EXIT_REASON_SIPI 4 +#define EXIT_REASON_IO_SMI 5 +#define EXIT_REASON_OTHER_SMI 6 +#define EXIT_REASON_PENDING_INTERRUPT 7 +#define EXIT_REASON_PENDING_VIRT_NMI 8 +#define EXIT_REASON_TASK_SWITCH 9 +#define EXIT_REASON_CPUID 10 +#define EXIT_REASON_GETSEC 11 +#define EXIT_REASON_HLT 12 +#define EXIT_REASON_INVD 13 +#define EXIT_REASON_INVLPG 14 +#define EXIT_REASON_RDPMC 15 +#define EXIT_REASON_RDTSC 16 +#define EXIT_REASON_RSM 17 +#define EXIT_REASON_VMCALL 18 +#define EXIT_REASON_VMCLEAR 19 +#define EXIT_REASON_VMLAUNCH 20 +#define EXIT_REASON_VMPTRLD 21 +#define EXIT_REASON_VMPTRST 22 +#define EXIT_REASON_VMREAD 23 +#define EXIT_REASON_VMRESUME 24 +#define EXIT_REASON_VMWRITE 25 +#define EXIT_REASON_VMOFF 26 +#define EXIT_REASON_VMON 27 +#define EXIT_REASON_CR_ACCESS 28 +#define EXIT_REASON_DR_ACCESS 29 +#define EXIT_REASON_IO_INSTRUCTION 30 +#define EXIT_REASON_MSR_READ 31 +#define EXIT_REASON_MSR_WRITE 32 +#define EXIT_REASON_INVALID_GUEST_STATE 33 +#define EXIT_REASON_MSR_LOADING 34 +#define EXIT_REASON_MWAIT_INSTRUCTION 36 +#define EXIT_REASON_MONITOR_TRAP_FLAG 37 +#define EXIT_REASON_MONITOR_INSTRUCTION 39 +#define EXIT_REASON_PAUSE_INSTRUCTION 40 +#define EXIT_REASON_MACHINE_CHECK 41 +#define EXIT_REASON_TPR_BELOW_THRESHOLD 43 +#define EXIT_REASON_APIC_ACCESS 44 +#define EXIT_REASON_ACCESS_GDTR_OR_IDTR 46 +#define EXIT_REASON_ACCESS_LDTR_OR_TR 47 +#define EXIT_REASON_EPT_VIOLATION 48 +#define EXIT_REASON_EPT_MISCONFIG 49 +#define EXIT_REASON_INVEPT 50 +#define EXIT_REASON_RDTSCP 51 +#define EXIT_REASON_VMX_PREEMPTION_TIMER_EXPIRED 52 +#define EXIT_REASON_INVVPID 53 +#define EXIT_REASON_WBINVD 54 +#define EXIT_REASON_XSETBV 55 + +#define HVM_VMX_EXIT_REASON_MAX (EXIT_REASON_XSETBV+1) + +char * hvm_vmx_exit_reason_name[HVM_VMX_EXIT_REASON_MAX] = { + [0] = "NONE", + [EXIT_REASON_EXCEPTION_NMI]="EXCEPTION_NMI", + [EXIT_REASON_EXTERNAL_INTERRUPT]="EXTERNAL_INTERRUPT", + [EXIT_REASON_TRIPLE_FAULT]="TRIPLE_FAULT", + [EXIT_REASON_INIT]="INIT", + [EXIT_REASON_SIPI]="SIPI", + [EXIT_REASON_IO_SMI]="IO_SMI", + [EXIT_REASON_OTHER_SMI]="OTHER_SMI", + [EXIT_REASON_PENDING_INTERRUPT]="PENDING_INTERRUPT", + [EXIT_REASON_PENDING_VIRT_NMI]="PENDING_VIRT_NMI", + [EXIT_REASON_TASK_SWITCH]="TASK_SWITCH", + [EXIT_REASON_CPUID]="CPUID", + [EXIT_REASON_GETSEC]="GETSEC", + [EXIT_REASON_HLT]="HLT", + [EXIT_REASON_INVD]="INVD", + [EXIT_REASON_INVLPG]="INVLPG", + [EXIT_REASON_RDPMC]="RDPMC", + [EXIT_REASON_RDTSC]="RDTSC", + [EXIT_REASON_RSM]="RSM", + [EXIT_REASON_VMCALL]="VMCALL", + [EXIT_REASON_VMCLEAR]="VMCLEAR", + [EXIT_REASON_VMLAUNCH]="VMLAUNCH", + [EXIT_REASON_VMPTRLD]="VMPTRLD", + [EXIT_REASON_VMPTRST]="VMPTRST", + [EXIT_REASON_VMREAD]="VMREAD", + [EXIT_REASON_VMRESUME]="VMRESUME", + [EXIT_REASON_VMWRITE]="VMWRITE", + [EXIT_REASON_VMOFF]="VMOFF", + [EXIT_REASON_VMON]="VMON", + [EXIT_REASON_CR_ACCESS]="CR_ACCESS", + [EXIT_REASON_DR_ACCESS]="DR_ACCESS", + [EXIT_REASON_IO_INSTRUCTION]="IO_INSTRUCTION", + [EXIT_REASON_MSR_READ]="MSR_READ", + [EXIT_REASON_MSR_WRITE]="MSR_WRITE", + [EXIT_REASON_INVALID_GUEST_STATE]="INVALID_GUEST_STATE", + [EXIT_REASON_MSR_LOADING]="MSR_LOADING", + [EXIT_REASON_MWAIT_INSTRUCTION]="MWAIT_INSTRUCTION", + [EXIT_REASON_MONITOR_TRAP_FLAG]="MONITOR_TRAP_FLAG", + [EXIT_REASON_MONITOR_INSTRUCTION]="MONITOR_INSTRUCTION", + [EXIT_REASON_PAUSE_INSTRUCTION]="PAUSE_INSTRUCTION", + [EXIT_REASON_MACHINE_CHECK]="MACHINE_CHECK", + [EXIT_REASON_TPR_BELOW_THRESHOLD]="TPR_BELOW_THRESHOLD", + [EXIT_REASON_APIC_ACCESS]="APIC_ACCESS", + [EXIT_REASON_EPT_VIOLATION]="EPT_VIOLATION", + [EXIT_REASON_EPT_MISCONFIG]="EPT_MISCONFIG", + [EXIT_REASON_INVEPT]="INVEPT", + [EXIT_REASON_RDTSCP]="RDTSCP", + [EXIT_REASON_VMX_PREEMPTION_TIMER_EXPIRED]="VMX_PREEMPTION_TIMER_EXPIRED", + [EXIT_REASON_INVVPID]="INVVPID", + [EXIT_REASON_WBINVD]="WBINVD", + [EXIT_REASON_XSETBV]="XSETBV", +}; + +/* SVM data */ +enum VMEXIT_EXITCODE +{ + /* control register read exitcodes */ + VMEXIT_CR0_READ = 0, + VMEXIT_CR1_READ = 1, + VMEXIT_CR2_READ = 2, + VMEXIT_CR3_READ = 3, + VMEXIT_CR4_READ = 4, + VMEXIT_CR5_READ = 5, + VMEXIT_CR6_READ = 6, + VMEXIT_CR7_READ = 7, + VMEXIT_CR8_READ = 8, + VMEXIT_CR9_READ = 9, + VMEXIT_CR10_READ = 10, + VMEXIT_CR11_READ = 11, + VMEXIT_CR12_READ = 12, + VMEXIT_CR13_READ = 13, + VMEXIT_CR14_READ = 14, + VMEXIT_CR15_READ = 15, + + /* control register write exitcodes */ + VMEXIT_CR0_WRITE = 16, + VMEXIT_CR1_WRITE = 17, + VMEXIT_CR2_WRITE = 18, + VMEXIT_CR3_WRITE = 19, + VMEXIT_CR4_WRITE = 20, + VMEXIT_CR5_WRITE = 21, + VMEXIT_CR6_WRITE = 22, + VMEXIT_CR7_WRITE = 23, + VMEXIT_CR8_WRITE = 24, + VMEXIT_CR9_WRITE = 25, + VMEXIT_CR10_WRITE = 26, + VMEXIT_CR11_WRITE = 27, + VMEXIT_CR12_WRITE = 28, + VMEXIT_CR13_WRITE = 29, + VMEXIT_CR14_WRITE = 30, + VMEXIT_CR15_WRITE = 31, + + /* debug register read exitcodes */ + VMEXIT_DR0_READ = 32, + VMEXIT_DR1_READ = 33, + VMEXIT_DR2_READ = 34, + VMEXIT_DR3_READ = 35, + VMEXIT_DR4_READ = 36, + VMEXIT_DR5_READ = 37, + VMEXIT_DR6_READ = 38, + VMEXIT_DR7_READ = 39, + VMEXIT_DR8_READ = 40, + VMEXIT_DR9_READ = 41, + VMEXIT_DR10_READ = 42, + VMEXIT_DR11_READ = 43, + VMEXIT_DR12_READ = 44, + VMEXIT_DR13_READ = 45, + VMEXIT_DR14_READ = 46, + VMEXIT_DR15_READ = 47, + + /* debug register write exitcodes */ + VMEXIT_DR0_WRITE = 48, + VMEXIT_DR1_WRITE = 49, + VMEXIT_DR2_WRITE = 50, + VMEXIT_DR3_WRITE = 51, + VMEXIT_DR4_WRITE = 52, + VMEXIT_DR5_WRITE = 53, + VMEXIT_DR6_WRITE = 54, + VMEXIT_DR7_WRITE = 55, + VMEXIT_DR8_WRITE = 56, + VMEXIT_DR9_WRITE = 57, + VMEXIT_DR10_WRITE = 58, + VMEXIT_DR11_WRITE = 59, + VMEXIT_DR12_WRITE = 60, + VMEXIT_DR13_WRITE = 61, + VMEXIT_DR14_WRITE = 62, + VMEXIT_DR15_WRITE = 63, + + /* processor exception exitcodes (VMEXIT_EXCP[0-31]) */ + VMEXIT_EXCEPTION_DE = 64, /* divide-by-zero-error */ + VMEXIT_EXCEPTION_DB = 65, /* debug */ + VMEXIT_EXCEPTION_NMI = 66, /* non-maskable-interrupt */ + VMEXIT_EXCEPTION_BP = 67, /* breakpoint */ + VMEXIT_EXCEPTION_OF = 68, /* overflow */ + VMEXIT_EXCEPTION_BR = 69, /* bound-range */ + VMEXIT_EXCEPTION_UD = 70, /* invalid-opcode*/ + VMEXIT_EXCEPTION_NM = 71, /* device-not-available */ + VMEXIT_EXCEPTION_DF = 72, /* double-fault */ + VMEXIT_EXCEPTION_09 = 73, /* unsupported (reserved) */ + VMEXIT_EXCEPTION_TS = 74, /* invalid-tss */ + VMEXIT_EXCEPTION_NP = 75, /* segment-not-present */ + VMEXIT_EXCEPTION_SS = 76, /* stack */ + VMEXIT_EXCEPTION_GP = 77, /* general-protection */ + VMEXIT_EXCEPTION_PF = 78, /* page-fault */ + VMEXIT_EXCEPTION_15 = 79, /* reserved */ + VMEXIT_EXCEPTION_MF = 80, /* x87 floating-point exception-pending */ + VMEXIT_EXCEPTION_AC = 81, /* alignment-check */ + VMEXIT_EXCEPTION_MC = 82, /* machine-check */ + VMEXIT_EXCEPTION_XF = 83, /* simd floating-point */ + + /* exceptions 20-31 (exitcodes 84-95) are reserved */ + + /* ...and the rest of the #VMEXITs */ + VMEXIT_INTR = 96, + VMEXIT_NMI = 97, + VMEXIT_SMI = 98, + VMEXIT_INIT = 99, + VMEXIT_VINTR = 100, + VMEXIT_CR0_SEL_WRITE = 101, + VMEXIT_IDTR_READ = 102, + VMEXIT_GDTR_READ = 103, + VMEXIT_LDTR_READ = 104, + VMEXIT_TR_READ = 105, + VMEXIT_IDTR_WRITE = 106, + VMEXIT_GDTR_WRITE = 107, + VMEXIT_LDTR_WRITE = 108, + VMEXIT_TR_WRITE = 109, + VMEXIT_RDTSC = 110, + VMEXIT_RDPMC = 111, + VMEXIT_PUSHF = 112, + VMEXIT_POPF = 113, + VMEXIT_CPUID = 114, + VMEXIT_RSM = 115, + VMEXIT_IRET = 116, + VMEXIT_SWINT = 117, + VMEXIT_INVD = 118, + VMEXIT_PAUSE = 119, + VMEXIT_HLT = 120, + VMEXIT_INVLPG = 121, + VMEXIT_INVLPGA = 122, + VMEXIT_IOIO = 123, + VMEXIT_MSR = 124, + VMEXIT_TASK_SWITCH = 125, + VMEXIT_FERR_FREEZE = 126, + VMEXIT_SHUTDOWN = 127, + VMEXIT_VMRUN = 128, + VMEXIT_VMMCALL = 129, + VMEXIT_VMLOAD = 130, + VMEXIT_VMSAVE = 131, + VMEXIT_STGI = 132, + VMEXIT_CLGI = 133, + VMEXIT_SKINIT = 134, + VMEXIT_RDTSCP = 135, + VMEXIT_ICEBP = 136, + VMEXIT_WBINVD = 137, + VMEXIT_MONITOR = 138, + VMEXIT_MWAIT = 139, + VMEXIT_MWAIT_CONDITIONAL= 140, + VMEXIT_NPF = 1024, /* nested paging fault */ + VMEXIT_INVALID = -1 +}; + +#define HVM_SVM_EXIT_REASON_MAX 1025 +char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX] = { + /* 0-15 */ + "VMEXIT_CR0_READ", + "VMEXIT_CR1_READ", + "VMEXIT_CR2_READ", + "VMEXIT_CR3_READ", + "VMEXIT_CR4_READ", + "VMEXIT_CR5_READ", + "VMEXIT_CR6_READ", + "VMEXIT_CR7_READ", + "VMEXIT_CR8_READ", + "VMEXIT_CR9_READ", + "VMEXIT_CR10_READ", + "VMEXIT_CR11_READ", + "VMEXIT_CR12_READ", + "VMEXIT_CR13_READ", + "VMEXIT_CR14_READ", + "VMEXIT_CR15_READ", + /* 16-31 */ + "VMEXIT_CR0_WRITE", + "VMEXIT_CR1_WRITE", + "VMEXIT_CR2_WRITE", + "VMEXIT_CR3_WRITE", + "VMEXIT_CR4_WRITE", + "VMEXIT_CR5_WRITE", + "VMEXIT_CR6_WRITE", + "VMEXIT_CR7_WRITE", + "VMEXIT_CR8_WRITE", + "VMEXIT_CR9_WRITE", + "VMEXIT_CR10_WRITE", + "VMEXIT_CR11_WRITE", + "VMEXIT_CR12_WRITE", + "VMEXIT_CR13_WRITE", + "VMEXIT_CR14_WRITE", + "VMEXIT_CR15_WRITE", + /* 32-47 */ + "VMEXIT_DR0_READ", + "VMEXIT_DR1_READ", + "VMEXIT_DR2_READ", + "VMEXIT_DR3_READ", + "VMEXIT_DR4_READ", + "VMEXIT_DR5_READ", + "VMEXIT_DR6_READ", + "VMEXIT_DR7_READ", + "VMEXIT_DR8_READ", + "VMEXIT_DR9_READ", + "VMEXIT_DR10_READ", + "VMEXIT_DR11_READ", + "VMEXIT_DR12_READ", + "VMEXIT_DR13_READ", + "VMEXIT_DR14_READ", + "VMEXIT_DR15_READ", + /* 48-63 */ + "VMEXIT_DR0_WRITE", + "VMEXIT_DR1_WRITE", + "VMEXIT_DR2_WRITE", + "VMEXIT_DR3_WRITE", + "VMEXIT_DR4_WRITE", + "VMEXIT_DR5_WRITE", + "VMEXIT_DR6_WRITE", + "VMEXIT_DR7_WRITE", + "VMEXIT_DR8_WRITE", + "VMEXIT_DR9_WRITE", + "VMEXIT_DR10_WRITE", + "VMEXIT_DR11_WRITE", + "VMEXIT_DR12_WRITE", + "VMEXIT_DR13_WRITE", + "VMEXIT_DR14_WRITE", + "VMEXIT_DR15_WRITE", + /* 64-83 */ + "VMEXIT_EXCEPTION_DE", + "VMEXIT_EXCEPTION_DB", + "VMEXIT_EXCEPTION_NMI", + "VMEXIT_EXCEPTION_BP", + "VMEXIT_EXCEPTION_OF", + "VMEXIT_EXCEPTION_BR", + "VMEXIT_EXCEPTION_UD", + "VMEXIT_EXCEPTION_NM", + "VMEXIT_EXCEPTION_DF", + "VMEXIT_EXCEPTION_09", + "VMEXIT_EXCEPTION_TS", + "VMEXIT_EXCEPTION_NP", + "VMEXIT_EXCEPTION_SS", + "VMEXIT_EXCEPTION_GP", + "VMEXIT_EXCEPTION_PF", + "VMEXIT_EXCEPTION_15", + "VMEXIT_EXCEPTION_MF", + "VMEXIT_EXCEPTION_AC", + "VMEXIT_EXCEPTION_MC", + "VMEXIT_EXCEPTION_XF", + /* 84-95 */ + "VMEXIT_EXCEPTION_20", + "VMEXIT_EXCEPTION_21", + "VMEXIT_EXCEPTION_22", + "VMEXIT_EXCEPTION_23", + "VMEXIT_EXCEPTION_24", + "VMEXIT_EXCEPTION_25", + "VMEXIT_EXCEPTION_26", + "VMEXIT_EXCEPTION_27", + "VMEXIT_EXCEPTION_28", + "VMEXIT_EXCEPTION_29", + "VMEXIT_EXCEPTION_30", + "VMEXIT_EXCEPTION_31", + /* 96-99 */ + "VMEXIT_INTR", + "VMEXIT_NMI", + "VMEXIT_SMI", + "VMEXIT_INIT", + /* 100-109 */ + "VMEXIT_VINTR", + "VMEXIT_CR0_SEL_WRITE", + "VMEXIT_IDTR_READ", + "VMEXIT_GDTR_READ", + "VMEXIT_LDTR_READ", + "VMEXIT_TR_READ", + "VMEXIT_IDTR_WRITE", + "VMEXIT_GDTR_WRITE", + "VMEXIT_LDTR_WRITE", + "VMEXIT_TR_WRITE", + /* 110-119 */ + "VMEXIT_RDTSC", + "VMEXIT_RDPMC", + "VMEXIT_PUSHF", + "VMEXIT_POPF", + "VMEXIT_CPUID", + "VMEXIT_RSM", + "VMEXIT_IRET", + "VMEXIT_SWINT", + "VMEXIT_INVD", + "VMEXIT_PAUSE", + /* 120-129 */ + "VMEXIT_HLT", + "VMEXIT_INVLPG", + "VMEXIT_INVLPGA", + "VMEXIT_IOIO", + "VMEXIT_MSR", + "VMEXIT_TASK_SWITCH", + "VMEXIT_FERR_FREEZE", + "VMEXIT_SHUTDOWN", + "VMEXIT_VMRUN", + "VMEXIT_VMMCALL", + /* 130-139 */ + "VMEXIT_VMLOAD", + "VMEXIT_VMSAVE", + "VMEXIT_STGI", + "VMEXIT_CLGI", + "VMEXIT_SKINIT", + "VMEXIT_RDTSCP", + "VMEXIT_ICEBP", + "VMEXIT_WBINVD", + "VMEXIT_MONITOR", + "VMEXIT_MWAIT", + /* 140 */ + "VMEXIT_MWAIT_CONDITIONAL", + [VMEXIT_NPF] = "VMEXIT_NPF", /* nested paging fault */ +}; + + +#if ( HVM_VMX_EXIT_REASON_MAX > HVM_SVM_EXIT_REASON_MAX ) +# define HVM_EXIT_REASON_MAX HVM_VMX_EXIT_REASON_MAX +# error - Strange! +#else +# define HVM_EXIT_REASON_MAX HVM_SVM_EXIT_REASON_MAX +#endif + +/* General hvm information */ +#define SPURIOUS_APIC_VECTOR 0xff +#define ERROR_APIC_VECTOR 0xfe +#define INVALIDATE_TLB_VECTOR 0xfd +#define EVENT_CHECK_VECTOR 0xfc +#define CALL_FUNCTION_VECTOR 0xfb +#define THERMAL_APIC_VECTOR 0xfa +#define LOCAL_TIMER_VECTOR 0xf9 + +#define EXTERNAL_INTERRUPT_MAX 256 + +/* Stringify numbers */ +char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] = { + [SPURIOUS_APIC_VECTOR] = "SPURIOS_APIC", + [ERROR_APIC_VECTOR] = "ERROR_APIC", + [INVALIDATE_TLB_VECTOR]= "INVALIDATE_TLB", + [EVENT_CHECK_VECTOR]= "EVENT_CHECK", + [CALL_FUNCTION_VECTOR]= "CALL_FUNCTION", + [THERMAL_APIC_VECTOR]= "THERMAL_APIC", + [LOCAL_TIMER_VECTOR] = "LOCAL_TIMER", +}; + +#define HVM_TRAP_MAX 20 + +char * hvm_trap_name[HVM_TRAP_MAX] = { + [0] = "Divide", + [1] = "RESERVED", + [2] = "NMI", + [3] = "Breakpoint", + [4] = "Overflow", + [5] = "BOUND", + [6] = "Invalid Op", + [7] = "Coprocessor not present", + [8] = "Double Fault", + [9] = "Coprocessor segment overrun", + [10] = "TSS", + [11] = "Segment not present", + [12] = "Stack-segment fault", + [13] = "GP", + [14] = "Page fault", + [15] = "RESERVED", + [16] = "FPU", + [17] = "Alignment check", + [18] = "Machine check", + [19] = "SIMD", +}; + + +enum { + HVM_EVENT_HANDLER_NONE = 0, + HVM_EVENT_HANDLER_PF_XEN = 1, + HVM_EVENT_HANDLER_PF_INJECT, + HVM_EVENT_HANDLER_INJ_EXC, + HVM_EVENT_HANDLER_INJ_VIRQ, + HVM_EVENT_HANDLER_REINJ_VIRQ, + HVM_EVENT_HANDLER_IO_READ, + HVM_EVENT_HANDLER_IO_WRITE, + HVM_EVENT_HANDLER_CR_READ, /* 8 */ + HVM_EVENT_HANDLER_CR_WRITE, + HVM_EVENT_HANDLER_DR_READ, + HVM_EVENT_HANDLER_DR_WRITE, + HVM_EVENT_HANDLER_MSR_READ, + HVM_EVENT_HANDLER_MSR_WRITE, + HVM_EVENT_HANDLER_CPUID, + HVM_EVENT_HANDLER_INTR, + HVM_EVENT_HANDLER_NMI, /* 16 */ + HVM_EVENT_HANDLER_SMI, + HVM_EVENT_HANDLER_VMCALL, + HVM_EVENT_HANDLER_HLT, + HVM_EVENT_HANDLER_INVLPG, + HVM_EVENT_HANDLER_MCE, + HVM_EVENT_HANDLER_IO_ASSIST, + HVM_EVENT_HANDLER_MMIO_ASSIST, + HVM_EVENT_HANDLER_CLTS, + HVM_EVENT_HANDLER_LMSW, + HVM_EVENT_RDTSC, + HVM_EVENT_INTR_WINDOW=0x20, /* Oops... skipped 0x1b-1f */ + HVM_EVENT_NPF, + HVM_EVENT_REALMODE_EMULATE, + HVM_EVENT_TRAP, + HVM_EVENT_TRAP_DEBUG, + HVM_EVENT_VLAPIC, + HVM_EVENT_HANDLER_MAX +}; +char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] = { + "(no handler)", + "pf_xen", + "pf_inject", + "inj_exc", + "inj_virq", + "reinj_virq", + "io_read", + "io_write", + "cr_read", /* 8 */ + "cr_write", + "dr_read", + "dr_write", + "msr_read", + "msr_write", + "cpuid", + "intr", + "nmi", /* 16 */ + "smi", + "vmcall", + "hlt", + "invlpg", + "mce", + "io_assist", + "mmio_assist", + "clts", /* 24 */ + "lmsw", + "rdtsc", + [HVM_EVENT_INTR_WINDOW]="intr_window", + "npf", + "realmode_emulate", + "trap", + "trap_debug", + "vlapic" +}; + +enum { + HVM_VOL_VMENTRY, + HVM_VOL_VMEXIT, + HVM_VOL_HANDLER, + HVM_VOL_MAX +}; + +enum { + GUEST_INTERRUPT_CASE_NONE, + /* This interrupt woke, no other interrupts until halt */ + GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ALONE, + /* This interrupt woke, maybe another interrupt before halt */ + GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ANY, + /* Time from interrupt (running) to halt */ + GUEST_INTERRUPT_CASE_INTERRUPT_TO_HALT, + GUEST_INTERRUPT_CASE_MAX, +}; + +char *guest_interrupt_case_name[] = { + [GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ALONE]="wake to halt alone", + /* This interrupt woke, maybe another interrupt before halt */ + [GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ANY] ="wake to halt any ", + /* Time from interrupt (running) to halt */ + [GUEST_INTERRUPT_CASE_INTERRUPT_TO_HALT] ="intr to halt ", +}; + +char *hvm_vol_name[HVM_VOL_MAX] = { + [HVM_VOL_VMENTRY]="vmentry", + [HVM_VOL_VMEXIT] ="vmexit", + [HVM_VOL_HANDLER]="handler", +}; + +enum { + HYPERCALL_set_trap_table = 0, + HYPERCALL_mmu_update, + HYPERCALL_set_gdt, + HYPERCALL_stack_switch, + HYPERCALL_set_callbacks, + HYPERCALL_fpu_taskswitch, + HYPERCALL_sched_op_compat, + HYPERCALL_platform_op, + HYPERCALL_set_debugreg, + HYPERCALL_get_debugreg, + HYPERCALL_update_descriptor, + HYPERCALL_memory_op=12, + HYPERCALL_multicall, + HYPERCALL_update_va_mapping, + HYPERCALL_set_timer_op, + HYPERCALL_event_channel_op_compat, + HYPERCALL_xen_version, + HYPERCALL_console_io, + HYPERCALL_physdev_op_compat, + HYPERCALL_grant_table_op, + HYPERCALL_vm_assist, + HYPERCALL_update_va_mapping_otherdomain, + HYPERCALL_iret, + HYPERCALL_vcpu_op, + HYPERCALL_set_segment_base, + HYPERCALL_mmuext_op, + HYPERCALL_acm_op, + HYPERCALL_nmi_op, + HYPERCALL_sched_op, + HYPERCALL_callback_op, + HYPERCALL_xenoprof_op, + HYPERCALL_event_channel_op, + HYPERCALL_physdev_op, + HYPERCALL_hvm_op, + HYPERCALL_sysctl, + HYPERCALL_domctl, + HYPERCALL_kexec_op, + HYPERCALL_MAX +}; + +char *hypercall_name[HYPERCALL_MAX] = { + [HYPERCALL_set_trap_table]="set_trap_table", + [HYPERCALL_mmu_update]="mmu_update", + [HYPERCALL_set_gdt]="set_gdt", + [HYPERCALL_stack_switch]="stack_switch", + [HYPERCALL_set_callbacks]="set_callbacks", + [HYPERCALL_fpu_taskswitch]="fpu_taskswitch", + [HYPERCALL_sched_op_compat]="sched_op(compat)", + [HYPERCALL_platform_op]="platform_op", + [HYPERCALL_set_debugreg]="set_debugreg", + [HYPERCALL_get_debugreg]="get_debugreg", + [HYPERCALL_update_descriptor]="update_descriptor", + [HYPERCALL_memory_op]="memory_op", + [HYPERCALL_multicall]="multicall", + [HYPERCALL_update_va_mapping]="update_va_mapping", + [HYPERCALL_set_timer_op]="set_timer_op", + [HYPERCALL_event_channel_op_compat]="evtchn_op(compat)", + [HYPERCALL_xen_version]="xen_version", + [HYPERCALL_console_io]="console_io", + [HYPERCALL_physdev_op_compat]="physdev_op(compat)", + [HYPERCALL_grant_table_op]="grant_table_op", + [HYPERCALL_vm_assist]="vm_assist", + [HYPERCALL_update_va_mapping_otherdomain]="update_va_mapping_otherdomain", + [HYPERCALL_iret]="iret", + [HYPERCALL_vcpu_op]="vcpu_op", + [HYPERCALL_set_segment_base]="set_segment_base", + [HYPERCALL_mmuext_op]="mmuext_op", + [HYPERCALL_acm_op]="acm_op", + [HYPERCALL_nmi_op]="nmi_op", + [HYPERCALL_sched_op]="sched_op", + [HYPERCALL_callback_op]="callback_op", + [HYPERCALL_xenoprof_op]="xenoprof_op", + [HYPERCALL_event_channel_op]="evtchn_op", + [HYPERCALL_physdev_op]="physdev_op", + [HYPERCALL_hvm_op]="hvm_op", + [HYPERCALL_sysctl]="sysctl", + [HYPERCALL_domctl]="domctl", + [HYPERCALL_kexec_op]="kexec_op" +}; + +enum { + PF_XEN_EMUL_LVL_0, + PF_XEN_EMUL_LVL_1, + PF_XEN_EMUL_LVL_2, + PF_XEN_EMUL_LVL_3, + PF_XEN_EMUL_LVL_4, + PF_XEN_EMUL_EARLY_UNSHADOW, + PF_XEN_EMUL_SET_CHANGED, + PF_XEN_EMUL_SET_UNCHANGED, + PF_XEN_EMUL_SET_FLUSH, + PF_XEN_EMUL_SET_ERROR, + PF_XEN_EMUL_PROMOTE, + PF_XEN_EMUL_DEMOTE, + PF_XEN_EMUL_PREALLOC_UNPIN, + PF_XEN_EMUL_PREALLOC_UNHOOK, + PF_XEN_EMUL_MAX, +}; + +char * pf_xen_emul_name[PF_XEN_EMUL_MAX] = { + [PF_XEN_EMUL_LVL_0]="non-linmap", + [PF_XEN_EMUL_LVL_1]="linmap l1", + [PF_XEN_EMUL_LVL_2]="linmap l2", + [PF_XEN_EMUL_LVL_3]="linmap l3", + [PF_XEN_EMUL_LVL_4]="linmap l4", + [PF_XEN_EMUL_EARLY_UNSHADOW]="early unshadow", + [PF_XEN_EMUL_SET_UNCHANGED]="set unchanged", + [PF_XEN_EMUL_SET_CHANGED]="set changed", + [PF_XEN_EMUL_SET_FLUSH]="set changed", + [PF_XEN_EMUL_SET_ERROR]="set changed", + [PF_XEN_EMUL_PROMOTE]="promote", + [PF_XEN_EMUL_DEMOTE]="demote", + [PF_XEN_EMUL_PREALLOC_UNPIN]="unpin", + [PF_XEN_EMUL_PREALLOC_UNHOOK]="unhook", +}; + +/* Rio only */ +enum { + PF_XEN_NON_EMUL_VA_USER, + PF_XEN_NON_EMUL_VA_KERNEL, + PF_XEN_NON_EMUL_EIP_USER, + PF_XEN_NON_EMUL_EIP_KERNEL, + PF_XEN_NON_EMUL_MAX, +}; + +char * pf_xen_non_emul_name[PF_XEN_NON_EMUL_MAX] = { + [PF_XEN_NON_EMUL_VA_USER]="va user", + [PF_XEN_NON_EMUL_VA_KERNEL]="va kernel", + [PF_XEN_NON_EMUL_EIP_USER]="eip user", + [PF_XEN_NON_EMUL_EIP_KERNEL]="eip kernel", +}; + +enum { + PF_XEN_FIXUP_PREALLOC_UNPIN, + PF_XEN_FIXUP_PREALLOC_UNHOOK, + PF_XEN_FIXUP_UNSYNC, + PF_XEN_FIXUP_OOS_ADD, + PF_XEN_FIXUP_OOS_EVICT, + PF_XEN_FIXUP_PROMOTE, + PF_XEN_FIXUP_UPDATE_ONLY, + PF_XEN_FIXUP_WRMAP, + PF_XEN_FIXUP_BRUTE_FORCE, + PF_XEN_FIXUP_MAX, +}; + +char * pf_xen_fixup_name[PF_XEN_FIXUP_MAX] = { + [PF_XEN_FIXUP_PREALLOC_UNPIN] = "unpin", + [PF_XEN_FIXUP_PREALLOC_UNHOOK] = "unhook", + [PF_XEN_FIXUP_UNSYNC] = "unsync", + [PF_XEN_FIXUP_OOS_ADD] = "oos-add", + [PF_XEN_FIXUP_OOS_EVICT] = "oos-evict", + [PF_XEN_FIXUP_PROMOTE] = "promote", + [PF_XEN_FIXUP_UPDATE_ONLY] = "update", + [PF_XEN_FIXUP_WRMAP] = "wrmap", + [PF_XEN_FIXUP_BRUTE_FORCE] = "wrmap-bf", +}; + +enum { + PF_XEN_NOT_SHADOW = 1, + PF_XEN_FAST_PROPAGATE, + PF_XEN_FAST_MMIO, + PF_XEN_FALSE_FAST_PATH, + PF_XEN_MMIO, + PF_XEN_FIXUP, + PF_XEN_DOMF_DYING, + PF_XEN_EMULATE, + PF_XEN_EMULATE_UNSHADOW_USER, + PF_XEN_EMULATE_UNSHADOW_EVTINJ, + PF_XEN_EMULATE_UNSHADOW_UNHANDLED, + PF_XEN_LAST_FAULT=PF_XEN_EMULATE_UNSHADOW_UNHANDLED, + PF_XEN_NON_EMULATE, + PF_XEN_NO_HANDLER, + PF_XEN_MAX, +}; + +#define SHADOW_WRMAP_BF 12 +#define SHADOW_PREALLOC_UNPIN 13 +#define SHADOW_RESYNC_FULL 14 +#define SHADOW_RESYNC_ONLY 15 + +char * pf_xen_name[PF_XEN_MAX] = { + [PF_XEN_NOT_SHADOW]="propagate", + [PF_XEN_FAST_PROPAGATE]="fast propagate", + [PF_XEN_FAST_MMIO]="fast mmio", + [PF_XEN_FALSE_FAST_PATH]="false fast path", + [PF_XEN_MMIO]="mmio", + [PF_XEN_FIXUP]="fixup", + [PF_XEN_DOMF_DYING]="dom dying", + [PF_XEN_EMULATE]="emulate", + [PF_XEN_EMULATE_UNSHADOW_USER]="unshadow:user-mode", + [PF_XEN_EMULATE_UNSHADOW_EVTINJ]="unshadow:evt inj", + [PF_XEN_EMULATE_UNSHADOW_UNHANDLED]="unshadow:unhandled instr", + [PF_XEN_NON_EMULATE]="fixup|mmio", + [PF_XEN_NO_HANDLER]="(no handler)", +}; + +#define CORR_VA_INVALID (0ULL-1) + +enum { + NONPF_MMIO_APIC, + NONPF_MMIO_NPF, + NONPF_MMIO_UNKNOWN, + NONPF_MMIO_MAX +}; + +struct mmio_info { + unsigned long long gpa; + unsigned long long va; /* Filled only by shadow */ + unsigned data; + unsigned data_valid:1, is_write:1; +}; + +struct pf_xen_extra { + unsigned long long va; + union { + unsigned flags; + struct { + unsigned flag_set_ad:1, + flag_set_a:1, + flag_shadow_l1_get_ref:1, + flag_shadow_l1_put_ref:1, + flag_l2_propagate:1, + flag_set_changed:1, + flag_set_flush:1, + flag_set_error:1, + flag_demote:1, + flag_promote:1, + flag_wrmap:1, + flag_wrmap_guess_found:1, + flag_wrmap_brute_force:1, + flag_early_unshadow:1, + flag_emulation_2nd_pt_written:1, + flag_emulation_last_failed:1, + flag_emulate_full_pt:1, + flag_prealloc_unhook:1, + flag_unsync:1, + flag_oos_fixup_add:1, + flag_oos_fixup_evict:1; + }; + }; /* Miami + ; fixup & emulate */ + unsigned int error_code; /* Rio only */ + + /* Calculated */ + int pf_case; /* Rio */ + + /* MMIO only */ + unsigned long long gpa; + unsigned int data; + + /* Emulate only */ + unsigned long long gl1e; /* Miami + */ + unsigned long long wval; /* Miami */ + unsigned long long corresponding_va; + unsigned int pt_index[5], pt_is_lo; + int pt_level; + + /* Other */ + unsigned long long gfn; + + /* Flags */ + unsigned corr_valid:1, + corr_is_kernel:1, + va_is_kernel:1; +}; + +struct pcpu_info; + +#define GUEST_INTERRUPT_MAX 350 +#define FAKE_VECTOR 349 +#define CR_MAX 9 +#define RESYNCS_MAX 17 +#define PF_XEN_FIXUP_UNSYNC_RESYNC_MAX 2 + +struct hvm_data; + +struct hvm_summary_handler_node { + void (*handler)(struct hvm_data *, void* data); + void *data; + struct hvm_summary_handler_node *next; +}; + +struct hvm_data { + /* Summary information */ + int init; + int vmexit_valid; + int summary_info; + struct vcpu_data *v; /* up-pointer */ + + /* SVM / VMX compatibility. FIXME - should be global */ + char ** exit_reason_name; + int exit_reason_max; + struct hvm_summary_handler_node *exit_reason_summary_handler_list[HVM_EXIT_REASON_MAX]; + + /* Information about particular exit reasons */ + struct { + struct event_cycle_summary exit_reason[HVM_EXIT_REASON_MAX]; + int extint[EXTERNAL_INTERRUPT_MAX+1]; + int *extint_histogram; + struct event_cycle_summary trap[HVM_TRAP_MAX]; + struct event_cycle_summary pf_xen[PF_XEN_MAX]; + struct event_cycle_summary pf_xen_emul[PF_XEN_EMUL_MAX]; + struct event_cycle_summary pf_xen_emul_early_unshadow[5]; + struct event_cycle_summary pf_xen_non_emul[PF_XEN_NON_EMUL_MAX]; + struct event_cycle_summary pf_xen_fixup[PF_XEN_FIXUP_MAX]; + struct event_cycle_summary pf_xen_fixup_unsync_resync[PF_XEN_FIXUP_UNSYNC_RESYNC_MAX+1]; + struct event_cycle_summary cr_write[CR_MAX]; + struct event_cycle_summary cr3_write_resyncs[RESYNCS_MAX+1]; + struct event_cycle_summary vmcall[HYPERCALL_MAX+1]; + struct event_cycle_summary generic[HVM_EVENT_HANDLER_MAX]; + struct event_cycle_summary mmio[NONPF_MMIO_MAX]; + struct hvm_gi_struct { + int count; + struct cycle_summary runtime[GUEST_INTERRUPT_CASE_MAX]; + /* OK, not summary info, but still... */ + int is_wake; + tsc_t start_tsc; + } guest_interrupt[GUEST_INTERRUPT_MAX + 1]; + /* IPI Latency */ + struct event_cycle_summary ipi_latency; + int ipi_count[256]; + struct { + struct io_address *mmio, *pio; + } io; + } summary; + + /* In-flight accumulation information */ + struct { + union { + struct { + unsigned port:31, + is_write:1; + unsigned int val; + } io; + struct pf_xen_extra pf_xen; + struct { + unsigned cr; + unsigned long long val; + int repromote; + } cr_write; + struct { + unsigned addr; + unsigned long long val; + } msr; + struct { + unsigned int event; + uint32_t d[4]; + } generic; + struct { + unsigned eax; + } vmcall; + struct { + unsigned vec; + } intr; + }; + /* MMIO gets its separate area, since many exits may use it */ + struct mmio_info mmio; + }inflight; + int resyncs; + void (*post_process)(struct hvm_data *); + tsc_t exit_tsc, arc_cycles, entry_tsc; + unsigned long long rip; + unsigned exit_reason, event_handler; + int short_summary_done:1, prealloc_unpin:1, wrmap_bf:1; + + /* Immediate processing */ + void *d; + + /* Wake-to-halt detection. See comment above. */ + struct { + unsigned waking:1; + /* Wake vector: keep track of time from vmentry until: + next halt, or next interrupt */ + int vector, interrupts, interrupts_wanting_tsc; + } w2h; + + /* Historical info */ + tsc_t last_rdtsc; +}; + +enum { + HVM_SHORT_SUMMARY_EMULATE, + HVM_SHORT_SUMMARY_UNSYNC, + HVM_SHORT_SUMMARY_FIXUP, + HVM_SHORT_SUMMARY_MMIO, + HVM_SHORT_SUMMARY_PROPAGATE, + HVM_SHORT_SUMMARY_CR3, + HVM_SHORT_SUMMARY_VMCALL, + HVM_SHORT_SUMMARY_INTERRUPT, + HVM_SHORT_SUMMARY_HLT, + HVM_SHORT_SUMMARY_OTHER, + HVM_SHORT_SUMMARY_MAX, +}; + +char *hvm_short_summary_name[HVM_SHORT_SUMMARY_MAX] = { + [HVM_SHORT_SUMMARY_EMULATE] ="emulate", + [HVM_SHORT_SUMMARY_UNSYNC] ="unsync", + [HVM_SHORT_SUMMARY_FIXUP] ="fixup", + [HVM_SHORT_SUMMARY_MMIO] ="mmio", + [HVM_SHORT_SUMMARY_PROPAGATE]="propagate", + [HVM_SHORT_SUMMARY_CR3] ="cr3", + [HVM_SHORT_SUMMARY_VMCALL] ="vmcall", + [HVM_SHORT_SUMMARY_INTERRUPT]="intr", + [HVM_SHORT_SUMMARY_HLT] ="hlt", + [HVM_SHORT_SUMMARY_OTHER] ="other", +}; + +struct hvm_short_summary_struct { + struct cycle_summary s[HVM_SHORT_SUMMARY_MAX]; +}; + +void init_hvm_data(struct hvm_data *h, struct vcpu_data *v) { + int i; + + if(h->init) + return; + + h->v = v; + + h->init = 1; + + if(opt.svm_mode) { + h->exit_reason_max = HVM_SVM_EXIT_REASON_MAX; + h->exit_reason_name = hvm_svm_exit_reason_name; + } else { + h->exit_reason_max = HVM_VMX_EXIT_REASON_MAX; + h->exit_reason_name = hvm_vmx_exit_reason_name; + } + + if(opt.histogram_interrupt_eip) { + int count = ((1ULL<summary.extint_histogram = malloc(size); + if(h->summary.extint_histogram) + bzero(h->summary.extint_histogram, size); + else { + fprintf(stderr, "FATAL: Could not allocate %zd bytes for interrupt histogram!\n", + size); + error(ERR_SYSTEM, NULL); + } + + } + for(i=0; isummary.guest_interrupt[i].count=0; +} + +/* PV data */ +enum { + PV_HYPERCALL=1, + PV_TRAP=3, + PV_PAGE_FAULT, + PV_FORCED_INVALID_OP, + PV_EMULATE_PRIVOP, + PV_EMULATE_4GB, + PV_MATH_STATE_RESTORE, + PV_PAGING_FIXUP, + PV_GDT_LDT_MAPPING_FAULT, + PV_PTWR_EMULATION, + PV_PTWR_EMULATION_PAE, + PV_HYPERCALL_V2 = 13, + PV_HYPERCALL_SUBCALL = 14, + PV_MAX +}; + +char *pv_name[PV_MAX] = { + [PV_HYPERCALL]="hypercall", + [PV_TRAP]="trap", + [PV_PAGE_FAULT]="page_fault", + [PV_FORCED_INVALID_OP]="forced_invalid_op", + [PV_EMULATE_PRIVOP]="emulate privop", + [PV_EMULATE_4GB]="emulate 4g", + [PV_MATH_STATE_RESTORE]="math state restore", + [PV_PAGING_FIXUP]="paging fixup", + [PV_GDT_LDT_MAPPING_FAULT]="gdt/ldt mapping fault", + [PV_PTWR_EMULATION]="ptwr", + [PV_PTWR_EMULATION_PAE]="ptwr(pae)", + [PV_HYPERCALL_V2]="hypercall", + [PV_HYPERCALL_SUBCALL]="hypercall (subcall)", +}; + +#define PV_HYPERCALL_MAX 56 +#define PV_TRAP_MAX 20 + +struct pv_data { + unsigned summary_info:1; + int count[PV_MAX]; + int hypercall_count[PV_HYPERCALL_MAX]; + int trap_count[PV_TRAP_MAX]; +}; + +/* Sched data */ + +enum { + SCHED_DOM_ADD=1, + SCHED_DOM_REM, + SCHED_SLEEP, + SCHED_WAKE, + SCHED_YIELD, + SCHED_BLOCK, + SCHED_SHUTDOWN, + SCHED_CTL, + SCHED_ADJDOM, + SCHED_SWITCH, + SCHED_S_TIMER_FN, + SCHED_T_TIMER_FN, + SCHED_DOM_TIMER_FN, + SCHED_SWITCH_INFPREV, + SCHED_SWITCH_INFNEXT, + SCHED_SHUTDOWN_CODE, + SCHED_MAX +}; + +enum { + RUNSTATE_RUNNING=0, + RUNSTATE_RUNNABLE, + RUNSTATE_BLOCKED, + RUNSTATE_OFFLINE, + RUNSTATE_LOST, + RUNSTATE_QUEUED, + RUNSTATE_INIT, + RUNSTATE_MAX +}; + +int runstate_graph[RUNSTATE_MAX] = +{ + [RUNSTATE_BLOCKED]=0, + [RUNSTATE_OFFLINE]=1, + [RUNSTATE_RUNNABLE]=2, + [RUNSTATE_RUNNING]=3, + [RUNSTATE_LOST]=-1, + [RUNSTATE_QUEUED]=-2, + [RUNSTATE_INIT]=-2, +}; + +char * runstate_name[RUNSTATE_MAX]={ + [RUNSTATE_RUNNING]= "running", + [RUNSTATE_RUNNABLE]="runnable", + [RUNSTATE_BLOCKED]= "blocked", /* to be blocked */ + [RUNSTATE_OFFLINE]= "offline", + [RUNSTATE_QUEUED]= "queued", + [RUNSTATE_INIT]= "init", + [RUNSTATE_LOST]= "lost", +}; + +enum { + RUNNABLE_STATE_INVALID, + RUNNABLE_STATE_WAKE, + RUNNABLE_STATE_PREEMPT, + RUNNABLE_STATE_OTHER, + RUNNABLE_STATE_MAX +}; + +char * runnable_state_name[RUNNABLE_STATE_MAX]={ + [RUNNABLE_STATE_INVALID]="invalid", /* Should never show up */ + [RUNNABLE_STATE_WAKE]="wake", + [RUNNABLE_STATE_PREEMPT]="preempt", + [RUNNABLE_STATE_OTHER]="other", +}; + +/* Memory data */ +enum { + MEM_PAGE_GRANT_MAP = 1, + MEM_PAGE_GRANT_UNMAP, + MEM_PAGE_GRANT_TRANSFER, + MEM_SET_P2M_ENTRY, + MEM_DECREASE_RESERVATION, + MEM_POD_POPULATE = 16, + MEM_POD_ZERO_RECLAIM, + MEM_POD_SUPERPAGE_SPLINTER, + MEM_MAX +}; + +char *mem_name[MEM_MAX] = { + [MEM_PAGE_GRANT_MAP] = "grant-map", + [MEM_PAGE_GRANT_UNMAP] = "grant-unmap", + [MEM_PAGE_GRANT_TRANSFER] = "grant-transfer", + [MEM_SET_P2M_ENTRY] = "set-p2m", + [MEM_DECREASE_RESERVATION] = "decrease-reservation", + [MEM_POD_POPULATE] = "pod-populate", + [MEM_POD_ZERO_RECLAIM] = "pod-zero-reclaim", + [MEM_POD_SUPERPAGE_SPLINTER] = "pod-superpage-splinter", +}; + +/* Per-unit information. */ + +struct cr3_value_struct { + struct cr3_value_struct * next; + struct cr3_value_struct * gnext; + unsigned long long gmfn; + int cr3_id; + unsigned long long first_time, last_time, run_time; + struct cycle_summary total_time, guest_time, hv_time; + int switch_count, flush_count; + + struct hvm_short_summary_struct hvm; + + struct { + int now; + int count; + } prealloc_unpin; + + struct { + unsigned callback:1; + unsigned flush_count, switch_count; + unsigned fixup_user, emulate_corr_user; + } destroy; +}; + +#ifndef MAX_CPUS +#define MAX_CPUS 256 +#endif +typedef uint32_t cpu_mask_t; + +#define IDLE_DOMAIN 32767 +#define DEFAULT_DOMAIN 32768 + +#define MAX_VLAPIC_LIST 8 +struct vlapic_struct { + struct { + struct outstanding_ipi { + tsc_t first_tsc; + int vec, count; + int injected, valid; + } list[MAX_VLAPIC_LIST]; + } outstanding; +}; + +struct vcpu_data { + int vid; + struct domain_data *d; /* up-pointer */ + unsigned activated:1; + + int guest_paging_levels; + + /* Schedule info */ + struct { + int state; + int runnable_state; /* Only valid when state==RUNSTATE_RUNNABLE */ + tsc_t tsc; + /* TSC skew detection/correction */ + struct last_oldstate_struct { + int wrong, actual, pid; + tsc_t tsc; + } last_oldstate; + /* Performance counters */ + unsigned long long p1_start, p2_start; + } runstate; + struct pcpu_info *p; + tsc_t pcpu_tsc; + + /* Hardware tracking */ + struct { + long long val; + tsc_t start_time; + struct cr3_value_struct *data; + } cr3; + + /* IPI latency tracking */ + struct vlapic_struct vlapic; + + /* Summary info */ + struct cycle_framework f; + struct cycle_summary runstates[RUNSTATE_MAX]; + struct cycle_summary runnable_states[RUNNABLE_STATE_MAX]; + struct weighted_cpi_summary cpi; + struct cycle_summary cpu_affinity_all, + cpu_affinity_pcpu[MAX_CPUS]; + enum { + VCPU_DATA_NONE=0, + VCPU_DATA_HVM, + VCPU_DATA_PV + } data_type; + union { + struct hvm_data hvm; + struct pv_data pv; + }; +}; + +enum { + DOMAIN_RUNSTATE_BLOCKED=0, + DOMAIN_RUNSTATE_PARTIAL_RUN, + DOMAIN_RUNSTATE_FULL_RUN, + DOMAIN_RUNSTATE_PARTIAL_CONTENTION, + DOMAIN_RUNSTATE_CONCURRENCY_HAZARD, + DOMAIN_RUNSTATE_FULL_CONTENTION, + DOMAIN_RUNSTATE_LOST, + DOMAIN_RUNSTATE_MAX +}; + +char * domain_runstate_name[] = { + [DOMAIN_RUNSTATE_BLOCKED]="blocked", + [DOMAIN_RUNSTATE_PARTIAL_RUN]="partial run", + [DOMAIN_RUNSTATE_FULL_RUN]="full run", + [DOMAIN_RUNSTATE_PARTIAL_CONTENTION]="partial contention", + [DOMAIN_RUNSTATE_CONCURRENCY_HAZARD]="concurrency_hazard", + [DOMAIN_RUNSTATE_FULL_CONTENTION]="full_contention", + [DOMAIN_RUNSTATE_LOST]="lost", +}; + +enum { + POD_RECLAIM_CONTEXT_UNKNOWN=0, + POD_RECLAIM_CONTEXT_FAULT, + POD_RECLAIM_CONTEXT_BALLOON, + POD_RECLAIM_CONTEXT_MAX +}; + +char * pod_reclaim_context_name[] = { + [POD_RECLAIM_CONTEXT_UNKNOWN]="unknown", + [POD_RECLAIM_CONTEXT_FAULT]="fault", + [POD_RECLAIM_CONTEXT_BALLOON]="balloon", +}; + +#define POD_ORDER_MAX 4 + +struct domain_data { + struct domain_data *next; + int did; + struct vcpu_data *vcpu[MAX_CPUS]; + + int max_vid; + + int runstate; + tsc_t runstate_tsc; + struct cycle_summary total_time; + struct cycle_summary runstates[DOMAIN_RUNSTATE_MAX]; + struct cr3_value_struct *cr3_value_head; + struct eip_list_struct *emulate_eip_list; + struct eip_list_struct *interrupt_eip_list; + + int guest_interrupt[GUEST_INTERRUPT_MAX+1]; + struct hvm_short_summary_struct hvm_short; + struct { + int done[MEM_MAX]; + int done_interval[MEM_MAX]; + + int done_for[MEM_MAX]; + int done_for_interval[MEM_MAX]; + } memops; + + struct { + int reclaim_order[POD_ORDER_MAX]; + int reclaim_context[POD_RECLAIM_CONTEXT_MAX]; + int reclaim_context_order[POD_RECLAIM_CONTEXT_MAX][POD_ORDER_MAX]; + /* FIXME: Do a full cycle summary */ + int populate_order[POD_ORDER_MAX]; + } pod; +}; + +struct domain_data * domain_list=NULL; + +struct domain_data default_domain; + +enum { + TOPLEVEL_GEN=0, + TOPLEVEL_SCHED, + TOPLEVEL_DOM0OP, + TOPLEVEL_HVM, + TOPLEVEL_MEM, + TOPLEVEL_PV, + TOPLEVEL_SHADOW, + TOPLEVEL_HW, + TOPLEVEL_MAX=TOPLEVEL_HW+1, +}; + +char * toplevel_name[TOPLEVEL_MAX] = { + [TOPLEVEL_GEN]="gen", + [TOPLEVEL_SCHED]="sched", + [TOPLEVEL_DOM0OP]="dom0op", + [TOPLEVEL_HVM]="hvm", + [TOPLEVEL_MEM]="mem", + [TOPLEVEL_PV]="pv", + [TOPLEVEL_SHADOW]="shadow", + [TOPLEVEL_HW]="hw", +}; + +struct trace_volume { + unsigned long long toplevel[TOPLEVEL_MAX]; + unsigned long long sched_verbose; + unsigned long long hvm[HVM_VOL_MAX]; +} volume; + +#define UPDATE_VOLUME(_p,_x,_s) \ + do { \ + (_p)->volume.total._x += _s; \ + (_p)->volume.last_buffer._x += _s; \ + } while(0) + +void volume_clear(struct trace_volume *vol) +{ + bzero(vol, sizeof(*vol)); +} + +void volume_summary(struct trace_volume *vol) +{ + int j, k; + for(j=0; jtoplevel[j]) { + printf(" %-6s: %10lld\n", + toplevel_name[j], vol->toplevel[j]); + switch(j) { + case TOPLEVEL_SCHED: + if(vol->sched_verbose) + printf(" +-verbose: %10lld\n", + vol->sched_verbose); + break; + case TOPLEVEL_HVM: + for(k=0; khvm[k]) + printf(" +-%-7s: %10lld\n", + hvm_vol_name[k], vol->hvm[k]); + } + + break; + } + } +} + +struct pcpu_info { + /* Information about this pcpu */ + unsigned active:1, summary:1; + int pid; + + /* Information related to scanning thru the file */ + tsc_t first_tsc, last_tsc, order_tsc; + loff_t file_offset; + loff_t next_cpu_change_offset; + struct record_info ri; + int last_cpu_change_pid; + int power_state; + + /* Information related to tsc skew detection / correction */ + struct { + tsc_t offset; + cpu_mask_t downstream; /* To detect cycles in dependencies */ + } tsc_skew; + + /* Information related to domain tracking */ + struct vcpu_data * current; + struct { + unsigned active:1, + domain_valid:1, + seen_valid_schedule:1; /* Seen an actual schedule since lost records */ + unsigned did:16,vid:16; + tsc_t tsc; + } lost_record; + + /* Record volume */ + struct { + tsc_t buffer_first_tsc, + buffer_dom0_runstate_tsc, + buffer_dom0_runstate_cycles[RUNSTATE_MAX]; + int buffer_dom0_runstate; + unsigned buffer_size; + struct trace_volume total, last_buffer; + } volume; + + /* Time report */ + struct { + tsc_t tsc; + struct cycle_summary idle, running, lost; + } time; +}; + +void __fill_in_record_info(struct pcpu_info *p); + +#define INTERVAL_DOMAIN_GUEST_INTERRUPT_MAX 10 + +struct { + int max_active_pcpu; + loff_t last_epoch_offset; + int early_eof; + int lost_cpus; + tsc_t now; + struct cycle_framework f; + tsc_t buffer_trace_virq_tsc; + struct pcpu_info pcpu[MAX_CPUS]; + + struct { + int id; + /* Invariant: head null => tail null; head !null => tail valid */ + struct cr3_value_struct *head, **tail; + } cr3; + + struct { + tsc_t start_tsc; + /* Information about specific interval output types */ + union { + struct { + struct interval_element ** values; + int count; + } array; + struct { + struct interval_list *head, **tail; + } list; + struct cr3_value_struct *cr3; + struct { + struct domain_data *d; + int guest_vector[INTERVAL_DOMAIN_GUEST_INTERRUPT_MAX]; + } domain; + }; + } interval; +} P = { 0 }; + +/* Function prototypes */ +char * pcpu_string(int pcpu); +void pcpu_string_draw(struct pcpu_info *p); +void process_generic(struct record_info *ri); +void dump_generic(FILE *f, struct record_info *ri); +ssize_t __read_record(struct trace_record *rec, loff_t offset); +void error(enum error_level l, struct record_info *ri); +void update_io_address(struct io_address ** list, unsigned int pa, int dir, + tsc_t arc_cycles, unsigned int va); +int check_extra_words(struct record_info *ri, int expected_size, const char *record); +int vcpu_set_data_type(struct vcpu_data *v, int type); + +void cpumask_init(cpu_mask_t *c) { + *c = 0UL; +} + +void cpumask_clear(cpu_mask_t *c, int cpu) { + *c &= ~(1UL << cpu); +} + +void cpumask_set(cpu_mask_t *c, int cpu) { + *c |= (1UL << cpu); +} + +int cpumask_isset(const cpu_mask_t *c, int cpu) { + if(*c & (1UL<time = ((c - P.f.first_tsc) << 10) / opt.cpu_qhz; + t->s = t->time / 1000000000; + t->ns = t->time - (t->s * 1000000000); +} + +void abs_cycles_to_time(unsigned long long ac, struct time_struct *t) { + if(ac > P.f.first_tsc) { + /* t->time = ((ac - P.f.first_tsc) * 1000) / (opt.cpu_hz / 1000000 ); */ + /* t->s = t->time / 1000000000; */ + /* t->ns = t->time % 1000000000; */ + t->time = ((ac - P.f.first_tsc) << 10) / opt.cpu_qhz; + t->s = t->time / 1000000000; + t->ns = t->time - (t->s * 1000000000); + } else { + t->time = t->s = t->ns = 0; + } +} + +tsc_t abs_cycles_to_global(unsigned long long ac) { + if(ac > P.f.first_tsc) + return ac - P.f.first_tsc; + else + return 0; +} + +void scatterplot_vs_time(tsc_t atsc, long long y) { + struct time_struct t; + + abs_cycles_to_time(atsc, &t); + + printf("%u.%09u %lld\n", t.s, t.ns, y); +} + +/* -- Summary Code -- */ + +/* With compliments to "Numerical Recipes in C", which provided the algorithm + * and basic template for this function. */ +long long percentile(long long * A, int N, int ple) { + int I, J, L, R, K; + + long long X, W; + + /* No samples! */ + if ( N == 0 ) + return 0; + + /* Find K, the element # we want */ + K=N*ple/100; + + /* Set the left and right boundaries of the current search space */ + L=0; R=N-1; + + while(L < R) { + /* X: The value to order everything higher / lower than */ + X=A[K]; + + /* Starting at the left and the right... */ + I=L; + J=R; + + do { + /* Find the first element on the left that is out-of-order w/ X */ + while(A[I]> 1; + /* X: The value to order everything higher / lower than */ + X=A[K]; + + /* Starting at the left and the right... */ + I=L; I_weight = L_weight; + J=R; J_weight = R_weight; + + do { + /* Find the first element on the left that is out-of-order w/ X */ + while(A[I]> 1; + /* X: The value to order everything higher / lower than */ + X=A[K]; + + /* Starting at the left and the right... */ + I=L; I_weight = L_weight; + J=R; J_weight = R_weight; + + do { + /* Find the first element on the left that is out-of-order w/ X */ + while(A[I]cycles, f->total_cycles); +} + +static inline double summary_percent_global(struct event_cycle_summary *s) { + return __summary_percent(s, &P.f); +} + +static inline void update_summary(struct event_cycle_summary *s, long long c) { +/* We don't know ahead of time how many samples there are, and working + * with dynamic stuff is a pain, and unnecessary. This algorithm will + * generate a sample set that approximates an even sample. We can + * then take the percentiles on this, and get an approximate value. */ + if(c) { + if(opt.sample_size) { + int lap = (s->cycles_count/opt.sample_size)+1, + index =s->cycles_count % opt.sample_size; + if((index - (lap/3))%lap == 0) { + if(!s->cycles_sample) { + s->cycles_sample = malloc(sizeof(*s->cycles_sample) * opt.sample_size); + if(!s->cycles_sample) { + fprintf(stderr, "%s: malloc failed!\n", __func__); + error(ERR_SYSTEM, NULL); + } + } + s->cycles_sample[index]=c; + } + } + s->cycles_count++; + s->cycles += c; + + s->interval.count++; + s->interval.cycles += c; + } + s->count++; +} + +static inline void clear_interval_summary(struct event_cycle_summary *s) { + s->interval.count = 0; + s->interval.cycles = 0; +} + +static inline void update_cycles(struct cycle_summary *s, long long c) { +/* We don't know ahead of time how many samples there are, and working + * with dynamic stuff is a pain, and unnecessary. This algorithm will + * generate a sample set that approximates an even sample. We can + * then take the percentiles on this, and get an approximate value. */ + int lap, index; + + if ( c == 0 ) + { + fprintf(warn, "%s: cycles 0! Not updating...\n", + __func__); + return; + } + + if ( opt.sample_size ) { + lap = (s->count/opt.sample_size)+1; + index =s->count % opt.sample_size; + + if((index - (lap/3))%lap == 0) { + if(!s->sample) { + s->sample = malloc(sizeof(*s->sample) * opt.sample_size); + if(!s->sample) { + fprintf(stderr, "%s: malloc failed!\n", __func__); + error(ERR_SYSTEM, NULL); + } + } + s->sample[index] = c; + } + } + + if(c > 0) { + s->cycles += c; + s->interval.cycles += c; + } else { + s->cycles += -c; + s->interval.cycles += -c; + } + s->count++; + s->interval.count++; +} + +static inline void clear_interval_cycles(struct interval_element *e) { + e->cycles = 0; + e->count = 0; + e->instructions = 0; +} + +static inline void update_cpi(struct weighted_cpi_summary *s, + unsigned long long i, + unsigned long long c) { +/* We don't know ahead of time how many samples there are, and working + * with dynamic stuff is a pain, and unnecessary. This algorithm will + * generate a sample set that approximates an even sample. We can + * then take the percentiles on this, and get an approximate value. */ + int lap, index; + + if ( opt.sample_size ) { + lap = (s->count/opt.sample_size)+1; + index =s->count % opt.sample_size; + + if((index - (lap/3))%lap == 0) { + if(!s->cpi) { + assert(!s->cpi_weight); + + s->cpi = malloc(sizeof(*s->cpi) * opt.sample_size); + s->cpi_weight = malloc(sizeof(*s->cpi_weight) * opt.sample_size); + if(!s->cpi || !s->cpi_weight) { + fprintf(stderr, "%s: malloc failed!\n", __func__); + error(ERR_SYSTEM, NULL); + } + } + assert(s->cpi_weight); + + s->cpi[index] = (float) c / i; + s->cpi_weight[index]=c; + } + } + + s->instructions += i; + s->cycles += c; + s->count++; + + s->interval.instructions += i; + s->interval.cycles += c; + s->interval.count++; +} + +static inline void clear_interval_cpi(struct weighted_cpi_summary *s) { + s->interval.cycles = 0; + s->interval.count = 0; + s->interval.instructions = 0; +} + +static inline void print_cpu_affinity(struct cycle_summary *s, char *p) { + if(s->count) { + long long avg; + + avg = s->cycles / s->count; + + if ( opt.sample_size ) { + long long p5, p50, p95; + int data_size = s->count; + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = percentile(s->sample, data_size, 50); + p5 = percentile(s->sample, data_size, 5); + p95 = percentile(s->sample, data_size, 95); + + printf("%s: %7d %6lld {%6lld|%6lld|%6lld}\n", + p, s->count, avg, p5, p50, p95); + } else { + printf("%s: %7d %6lld\n", + p, s->count, avg); + } + } +} + +static inline void print_cpi_summary(struct weighted_cpi_summary *s) { + if(s->count) { + float avg; + + avg = (float)s->cycles / s->instructions; + + if ( opt.sample_size ) { + float p5, p50, p95; + int data_size = s->count; + + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = weighted_percentile(s->cpi, s->cpi_weight, data_size, 50); + p5 = weighted_percentile(s->cpi, s->cpi_weight, data_size, 5); + p95 = weighted_percentile(s->cpi, s->cpi_weight, data_size, 95); + + printf(" CPI summary: %2.2f {%2.2f|%2.2f|%2.2f}\n", + avg, p5, p50, p95); + } else { + printf(" CPI summary: %2.2f\n", avg); + } + } +} + +static inline void print_cycle_percent_summary(struct cycle_summary *s, + tsc_t total, char *p) { + if(s->count) { + long long avg; + double percent, seconds; + + avg = s->cycles / s->count; + + seconds = ((double)s->cycles) / opt.cpu_hz; + + percent = ((double)(s->cycles * 100)) / total; + + if ( opt.sample_size ) { + long long p5, p50, p95; + int data_size = s->count; + + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = self_weighted_percentile(s->sample, data_size, 50); + p5 = self_weighted_percentile(s->sample, data_size, 5); + p95 = self_weighted_percentile(s->sample, data_size, 95); + + printf("%s: %7d %5.2lfs %5.2lf%% %6lld {%6lld|%6lld|%6lld}\n", + p, s->count, + seconds, + percent, + avg, p5, p50, p95); + } else { + printf("%s: %7d %5.2lfs %5.2lf%% %6lld\n", + p, s->count, + seconds, + percent, + avg); + } + } +} + +static inline void print_cycle_summary(struct cycle_summary *s, char *p) { + if(s->count) { + long long avg; + + avg = s->cycles / s->count; + + if ( opt.sample_size ) { + long long p5, p50, p95; + int data_size = s->count; + + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = self_weighted_percentile(s->sample, data_size, 50); + p5 = self_weighted_percentile(s->sample, data_size, 5); + p95 = self_weighted_percentile(s->sample, data_size, 95); + + printf("%s: %7d %5.2lfs %6lld {%6lld|%6lld|%6lld}\n", + p, s->count, ((double)s->cycles)/opt.cpu_hz, + avg, p5, p50, p95); + } else { + printf("%s: %7d %5.2lfs %6lld\n", + p, s->count, ((double)s->cycles)/opt.cpu_hz, avg); + } + } +} + +#define PRINT_SUMMARY(_s, _p...) \ + do { \ + if((_s).count) { \ + if ( opt.sample_size ) { \ + unsigned long long p5, p50, p95; \ + int data_size=(_s).cycles_count; \ + if(data_size > opt.sample_size) \ + data_size=opt.sample_size; \ + p50=percentile((_s).cycles_sample, data_size, 50); \ + p5=percentile((_s).cycles_sample, data_size, 5); \ + p95=percentile((_s).cycles_sample, data_size, 95); \ + printf(_p); \ + printf(" %7d %5.2lfs %5.2lf%% %5lld cyc {%5lld|%5lld|%5lld}\n", \ + (_s).count, \ + ((double)(_s).cycles)/opt.cpu_hz, \ + summary_percent_global(&(_s)), \ + (_s).cycles_count ? (_s).cycles / (_s).cycles_count:0, \ + p5, p50, p95); \ + } else { \ + printf(_p); \ + printf(" %7d %5.2lfs %5.2lf%% %5lld cyc\n", \ + (_s).count, \ + ((double)(_s).cycles)/opt.cpu_hz, \ + summary_percent_global(&(_s)), \ + (_s).cycles_count ? (_s).cycles / (_s).cycles_count:0); \ + } \ + } \ + } while(0) + +#define INTERVAL_DESC_MAX 31 +struct interval_list { + struct interval_element *elem; + struct interval_list *next; + char desc[INTERVAL_DESC_MAX+1]; /* +1 for the null terminator */ +}; + +void __interval_cycle_percent_output(struct interval_element *e, tsc_t cycles) { + printf(" %.02lf", + __cycles_percent(e->cycles, cycles)); + clear_interval_cycles(e); +} + +void interval_cycle_percent_output(struct interval_element *e) { + __interval_cycle_percent_output(e, opt.interval.cycles); +} + +void interval_time_output(void) { + struct time_struct t; + abs_cycles_to_time(P.interval.start_tsc, &t); + + printf("%u.%09u", t.s, t.ns); +} + +void interval_table_output(void) { + int i; + + interval_time_output(); + + if(opt.interval.mode == INTERVAL_MODE_ARRAY) { + for(i=0; inext) + interval_cycle_percent_output(p->elem); + } + printf("\n"); +} + +void interval_table_tail(void) { + struct interval_list *p; + + printf("time"); + + for(p=P.interval.list.head; p; p = p->next) + printf(" %s", p->desc); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:25:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I1z-0005hD-BU; Wed, 17 Jun 2015 18:25:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1w-0005gk-Pb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:45 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 71/79-18947-8ABB1855; Wed, 17 Jun 2015 18:25:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1434565539!24296126!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 555 invoked from network); 17 Jun 2015 18:25:40 -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; 17 Jun 2015 18:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I1r-0002FZ-4X for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I1q-00071M-Vb for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:39 +0000 Date: Wed, 17 Jun 2015 18:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: add to tools/xentrace/ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd19a9976e7ce63bf07f8af1b9b5e8bb5812d51d Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:38 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:34:59 2015 +0100 xenalyze: add to tools/xentrace/ This merges xenalyze.hg, changeset 150:24308507be1d, into tools/xentrace/xenalyze.c to have the tool and public/trace.h in one place. Adjust code to use public/trace.h instead of private trace.h Signed-off-by: Olaf Hering Acked-by: Wei Liu Acked-by: George Dunlap Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu [ ijc -- wrap $(BIN) install in a check in case it is empty (which it is on !x86, avoid BIN += since it results in BIN = ' ' on !x86 ] --- .gitignore | 1 + tools/xentrace/Makefile | 9 +- tools/xentrace/analyze.h | 107 + tools/xentrace/mread.c | 160 + tools/xentrace/mread.h | 18 + tools/xentrace/pv.h | 41 + tools/xentrace/xenalyze.c |10407 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 10742 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3bc9cd9..3f42ded 100644 --- a/.gitignore +++ b/.gitignore @@ -173,6 +173,7 @@ tools/misc/gtracestat tools/misc/xenlockprof tools/misc/lowmemd tools/misc/xencov +tools/xentrace/xenalyze tools/pygrub/build/* tools/python/build/* tools/security/secpol_tool diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 5360960..7d874a3 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -6,7 +6,8 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) -BIN = +BIN-$(CONFIG_X86) = xenalyze +BIN = $(BIN-y) SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format @@ -26,6 +27,9 @@ install: build [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) +ifneq ($(BIN),) + $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) +endif $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) @@ -48,5 +52,8 @@ xenctx: xenctx.o xentrace_setsize: setsize.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) +xenalyze: xenalyze.o mread.o + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS) + -include $(DEPS) diff --git a/tools/xentrace/analyze.h b/tools/xentrace/analyze.h new file mode 100644 index 0000000..40ee551 --- /dev/null +++ b/tools/xentrace/analyze.h @@ -0,0 +1,107 @@ +#ifndef __ANALYZE_H +# define __ANALYZE_H + +#include + +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + +#define TRC_GEN_MAIN 0 +#define TRC_SCHED_MAIN 1 +#define TRC_DOM0OP_MAIN 2 +#define TRC_HVM_MAIN 3 +#define TRC_MEM_MAIN 4 +#define TRC_PV_MAIN 5 +#define TRC_SHADOW_MAIN 6 +#define TRC_HW_MAIN 7 + +#define TRC_LOST_RECORDS_END (TRC_GEN + 50) + +#define NR_CPUS 128 +#if __x86_64__ +# define BITS_PER_LONG 64 +#else +# define BITS_PER_LONG 32 +#endif + +#define BITS_TO_LONGS(bits) \ + (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) +#define DECLARE_BITMAP(name,bits) \ + unsigned long name[BITS_TO_LONGS(bits)] +typedef struct cpumask{ DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t; + +enum { + TRCE_SFLAG_SET_AD, + TRCE_SFLAG_SET_A, + TRCE_SFLAG_SHADOW_L1_GET_REF, + TRCE_SFLAG_SHADOW_L1_PUT_REF, + TRCE_SFLAG_L2_PROPAGATE, + TRCE_SFLAG_SET_CHANGED, + TRCE_SFLAG_SET_FLUSH, + TRCE_SFLAG_SET_ERROR, + TRCE_SFLAG_DEMOTE, + TRCE_SFLAG_PROMOTE, + TRCE_SFLAG_WRMAP, + TRCE_SFLAG_WRMAP_GUESS_FOUND, + TRCE_SFLAG_WRMAP_BRUTE_FORCE, + TRCE_SFLAG_EARLY_UNSHADOW, + TRCE_SFLAG_EMULATION_2ND_PT_WRITTEN, + TRCE_SFLAG_EMULATION_LAST_FAILED, + TRCE_SFLAG_EMULATE_FULL_PT, + TRCE_SFLAG_PREALLOC_UNPIN, + TRCE_SFLAG_PREALLOC_UNHOOK +}; + +#define TRC_HVM_OP_DESTROY_PROC (TRC_HVM_HANDLER + 0x100) + +typedef unsigned long long tsc_t; + +/* -- on-disk trace buffer definitions -- */ +struct trace_record { + union { + struct { + unsigned event:28, + extra_words:3, + cycle_flag:1; + union { + struct { + uint32_t tsc_lo, tsc_hi; + uint32_t data[7]; + } tsc; + struct { + uint32_t data[7]; + } notsc; + } u; + }; + uint32_t raw[8]; + }; +}; + +/* -- General info about a current record -- */ +struct time_struct { + unsigned long long time; + unsigned int s, ns; +}; + +#define DUMP_HEADER_MAX 256 + +struct record_info { + int cpu; + tsc_t tsc; + union { + unsigned event; + struct { + unsigned minor:12, + sub:4, + main:12, + unused:4; + } evt; + }; + int extra_words; + int size; + uint32_t *d; + char dump_header[DUMP_HEADER_MAX]; + struct time_struct t; + struct trace_record rec; +}; + +#endif diff --git a/tools/xentrace/mread.c b/tools/xentrace/mread.c new file mode 100644 index 0000000..a63d16c --- /dev/null +++ b/tools/xentrace/mread.c @@ -0,0 +1,160 @@ +#include +#include +#include +#include +#include +#include +#include +#include "mread.h" + +mread_handle_t mread_init(int fd) +{ + struct stat64 s; + mread_handle_t h; + + h=malloc(sizeof(struct mread_ctrl)); + + if (!h) + { + perror("malloc"); + exit(1); + } + + bzero(h, sizeof(struct mread_ctrl)); + + h->fd = fd; + + fstat64(fd, &s); + h->file_size = s.st_size; + + return h; +} + +ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, loff_t offset) +{ + /* Idea: have a "cache" of N mmaped regions. If the offset is + * in one of the regions, just copy it. If not, evict one of the + * regions and map the appropriate range. + * + * Basic algorithm: + * - See if the offset is in one of the regions + * - If not, map it + * - evict an old region + * - map the new region + * - Copy + */ + char * b=NULL; + int bind=-1; + loff_t boffset=0; + ssize_t bsize; + +#define dprintf(x...) +//#define dprintf fprintf + + dprintf(warn, "%s: offset %llx len %d\n", __func__, + offset, len); + if ( offset > h->file_size ) + { + dprintf(warn, " offset > file size %llx, returning 0\n", + h->file_size); + return 0; + } + if ( offset + len > h->file_size ) + { + dprintf(warn, " offset+len > file size %llx, truncating\n", + h->file_size); + len = h->file_size - offset; + } + + /* Try to find the offset in our range */ + dprintf(warn, " Trying last, %d\n", last); + if ( h->map[h->last].buffer + && (offset & MREAD_BUF_MASK) == h->map[h->last].start_offset ) + { + bind=h->last; + goto copy; + } + + /* Scan to see if it's anywhere else */ + dprintf(warn, " Scanning\n"); + for(bind=0; bindmap[bind].buffer + && (offset & MREAD_BUF_MASK) == h->map[bind].start_offset ) + { + dprintf(warn, " Found, index %d\n", bind); + break; + } + + /* If we didn't find it, evict someone and map it */ + if ( bind == MREAD_MAPS ) + { + dprintf(warn, " Clock\n"); + while(1) + { + h->clock++; + if(h->clock >= MREAD_MAPS) + h->clock=0; + dprintf(warn, " %d\n", h->clock); + if(h->map[h->clock].buffer == NULL) + { + dprintf(warn, " Buffer null, using\n"); + break; + } + if(!h->map[h->clock].accessed) + { + dprintf(warn, " Not accessed, using\n"); + break; + } + h->map[h->clock].accessed=0; + } + if(h->map[h->clock].buffer) + { + dprintf(warn, " Unmapping\n"); + munmap(h->map[h->clock].buffer, MREAD_BUF_SIZE); + } + /* FIXME: Try MAP_HUGETLB? */ + /* FIXME: Make sure this works on large files... */ + h->map[h->clock].start_offset = offset & MREAD_BUF_MASK; + dprintf(warn, " Mapping %llx from offset %llx\n", + MREAD_BUF_SIZE, h->map[h->clock].start_offset); + h->map[h->clock].buffer = mmap(NULL, MREAD_BUF_SIZE, PROT_READ, + MAP_SHARED, + h->fd, + h->map[h->clock].start_offset); + dprintf(warn, " mmap returned %p\n", h->map[h->clock].buffer); + if ( h->map[h->clock].buffer == MAP_FAILED ) + { + h->map[h->clock].buffer = NULL; + perror("mmap"); + exit(1); + } + bind = h->clock; + } + + h->last=bind; +copy: + h->map[bind].accessed=1; + b=h->map[bind].buffer; + boffset=offset - h->map[bind].start_offset; + if ( boffset + len > MREAD_BUF_SIZE ) + bsize = MREAD_BUF_SIZE - boffset; + else + bsize = len; + dprintf(warn, " Using index %d, buffer at %p, buffer offset %llx len %d\n", + bind, b, boffset, bsize); + + bcopy(b+boffset, rec, bsize); + + /* Handle the boundary case; make sure this is after doing anything + * with the static variables*/ + if ( len > bsize ) + { + dprintf(warn, " Finishing up by reading l %d o %llx\n", + len-bsize, offset+bsize); + mread64(h, rec+bsize, len-bsize, offset+bsize); + } + + /* FIXME: ?? */ + return len; +#undef dprintf +} diff --git a/tools/xentrace/mread.h b/tools/xentrace/mread.h new file mode 100644 index 0000000..8df41a8 --- /dev/null +++ b/tools/xentrace/mread.h @@ -0,0 +1,18 @@ +#define MREAD_MAPS 8 +#define MREAD_BUF_SHIFT 9 +#define PAGE_SHIFT 12 +#define MREAD_BUF_SIZE (1ULL<<(PAGE_SHIFT+MREAD_BUF_SHIFT)) +#define MREAD_BUF_MASK (~(MREAD_BUF_SIZE-1)) +typedef struct mread_ctrl { + int fd; + loff_t file_size; + struct mread_buffer { + char * buffer; + loff_t start_offset; + int accessed; + } map[MREAD_MAPS]; + int clock, last; +} *mread_handle_t; + +mread_handle_t mread_init(int fd); +ssize_t mread64(mread_handle_t h, void *dst, ssize_t len, loff_t offset); diff --git a/tools/xentrace/pv.h b/tools/xentrace/pv.h new file mode 100644 index 0000000..3e6ad77 --- /dev/null +++ b/tools/xentrace/pv.h @@ -0,0 +1,41 @@ +/* + * PV event decoding. + * + * Copyright (C) 2012 Citrix Systems R&D Ltd. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + */ +#ifndef __PV_H + +#include "analyze.h" +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define ARG_MISSING 0x0 +#define ARG_32BIT 0x1 +#define ARG_64BIT 0x2 + +#define MMU_UPDATE_PREEMPTED (~(~0U>>1)) + +static inline uint32_t pv_hypercall_op(const struct record_info *ri) +{ + return ri->d[0] & ~TRC_PV_HYPERCALL_V2_ARG_MASK; +} + +static inline int pv_hypercall_arg_present(const struct record_info *ri, int arg) +{ + return (ri->d[0] >> (20 + 2*arg)) & 0x3; +} + +void pv_hypercall_gather_args(const struct record_info *ri, uint64_t *args); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c new file mode 100644 index 0000000..a0a3ac1 --- /dev/null +++ b/tools/xentrace/xenalyze.c @@ -0,0 +1,10407 @@ +/* + * xenalyze.c: Analyzing xentrace output + * + * Written by George Dunlap. + * + * Copyright (c) 2006-2007, XenSource Inc. + * Copyright (c) 2007-2008, Citrix Systems R&D Ltd, UK + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + */ +#define _XOPEN_SOURCE 600 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "analyze.h" +#include "mread.h" +#include "pv.h" +#include +#include +#include +#include + +struct mread_ctrl; + + +#define DEFAULT_CPU_HZ 2400000000LL +#define QHZ_FROM_HZ(_hz) (((_hz) << 10)/ 1000000000) + +#define ADDR_SPACE_BITS 48 +#define DEFAULT_SAMPLE_SIZE 10240 +#define DEFAULT_INTERVAL_LENGTH 1000 + +struct array_struct { + unsigned long long *values; + int count; +}; + +#define warn_once(_x...) \ + do { \ + static int _w=1; \ + if ( _w ) { \ + _w=0; \ + fprintf(warn, ##_x); \ + } \ + } while(0) \ + +/* -- Global variables -- */ +struct { + int fd; + struct mread_ctrl *mh; + struct symbol_struct * symbols; + char * symbol_file; + char * trace_file; + int output_defined; + loff_t file_size; + struct { + loff_t update_offset; + int pipe[2]; + FILE* out; + int pid; + } progress; +} G = { + .fd=-1, + .symbols = NULL, + .symbol_file = NULL, + .trace_file = NULL, + .output_defined = 0, + .file_size = 0, + .progress = { .update_offset = 0 }, +}; + +/* + Kinds of errors: + Unexpected values + - RIP with information in high bits (not all 0 or 1) + - exit reason too high + Unexpected record layout + - x64 bit set in PIO,PV_PTWR_EMULATION_PAE, + - Unknown minor type (PV_PTWR_EMULATION, RUNSTATE_CHANGE + - Wrong record size + - More than one bit set in evt.main field + Unexpected sequences + - wake tsc tracking + - TSC dependency loop + - Mismatch between non-running old event states + - Runstate continue while running on another pcpu + - lost_record_end seen in non-lost pcpu + - Unexpected non-CPU_CHANGE record during new_pcpu scan + - record tsc < interval start tsc + - lost_record tsc !> order tsc + Limited resources + - interrupt interval slots + - record cpu > MAX_CPUS + Algorithm asserts + - Duplicate CR3/domain values + - Logic holes + - domain runstates + - runstate / tsc skew + - vcpu_{prev,next}_update p->current{==,!=}null + - vcpu start conditions + - lost_cpu count higher than # of seen cpus / < 0 + - lost cpu has non-null p->current + Symbol file + -file doesn't open + -file not ordered + System + - short read + - malloc failed + Args + - Invalid cpu_hz value / suffix + - No trace file + - Can't open trace file +*/ +enum error_level { + ERR_NONE=0, + ERR_STRICT, /* Be unreasonably picky */ + ERR_WARN, /* Something midly unexpected */ + ERR_SANITY, /* Sanity checks: RIP with info in high bits */ + ERR_RECORD, /* Something that keeps you from processing the record */ + ERR_FILE, /* Probably caused by a corrupt file */ + ERR_LIMIT, /* Exceeded limits; data will be lost */ + ERR_MAX_TOLERABLE=ERR_LIMIT, + /* -- Unrecoverable past this point -- */ + ERR_ASSERT, /* Algoritm assert */ + ERR_SYSTEM, /* System error: cannot allocate memory, short read, &c */ +}; + +int verbosity = 5; + +struct { + unsigned + scatterplot_interrupt_eip:1, + scatterplot_cpi:1, + scatterplot_unpin_promote:1, + scatterplot_cr3_switch:1, + scatterplot_wake_to_halt:1, + scatterplot_io:1, + scatterplot_vmexit_eip:1, + scatterplot_runstate:1, + scatterplot_runstate_time:1, + scatterplot_pcpu:1, + scatterplot_extint_cycles:1, + scatterplot_rdtsc:1, + scatterplot_irq:1, + histogram_interrupt_eip:1, + interval_mode:1, + dump_all:1, + dump_raw_process:1, + dump_raw_reads:1, + dump_no_processing:1, + dump_ipi_latency:1, + dump_trace_volume_on_lost_record:1, + dump_show_power_states:1, + with_cr3_enumeration:1, + with_pio_enumeration:1, + with_mmio_enumeration:1, + with_interrupt_eip_enumeration:1, + show_default_domain_summary:1, + mmio_enumeration_skip_vga:1, + progress:1, + svm_mode:1, + summary:1, + report_pcpu:1, + tsc_loop_fatal:1, + summary_info; + long long cpu_qhz, cpu_hz; + int scatterplot_interrupt_vector; + int scatterplot_extint_cycles_vector; + int scatterplot_io_port; + int histogram_interrupt_vector; + unsigned long long histogram_interrupt_increment; + int interrupt_eip_enumeration_vector; + int default_guest_paging_levels; + int sample_size; + enum error_level tolerance; /* Tolerate up to this level of error */ + struct { + tsc_t cycles; + /* Used if interval is specified in seconds to delay calculating + * time_interval until all arguments have been processed (specifically, + * cpu_hz). */ + unsigned msec; + enum { + INTERVAL_CR3_SCHEDULE_TIME, + INTERVAL_CR3_SCHEDULE_ORDERED, + INTERVAL_CR3_SHORT_SUMMARY, + INTERVAL_DOMAIN_TOTAL_TIME, + INTERVAL_DOMAIN_SHORT_SUMMARY, + INTERVAL_DOMAIN_GUEST_INTERRUPT, + INTERVAL_DOMAIN_GRANT_MAPS + } output; + enum { + INTERVAL_MODE_CUSTOM, + INTERVAL_MODE_ARRAY, + INTERVAL_MODE_LIST + } mode; + enum { + INTERVAL_CHECK_NONE, + INTERVAL_CHECK_CR3, + INTERVAL_CHECK_DOMAIN + } check; + /* Options for specific interval output types */ + union { + struct array_struct array; + }; + int count; + } interval; +} opt = { + .scatterplot_interrupt_eip=0, + .scatterplot_cpi=0, + .scatterplot_unpin_promote=0, + .scatterplot_cr3_switch=0, + .scatterplot_wake_to_halt=0, + .scatterplot_vmexit_eip=0, + .scatterplot_runstate=0, + .scatterplot_runstate_time=0, + .scatterplot_pcpu=0, + .scatterplot_extint_cycles=0, + .scatterplot_rdtsc=0, + .scatterplot_irq=0, + .histogram_interrupt_eip=0, + .dump_all = 0, + .dump_raw_process = 0, + .dump_raw_reads = 0, + .dump_no_processing = 0, + .dump_ipi_latency = 0, + .dump_trace_volume_on_lost_record = 0, + .dump_show_power_states = 0, + .with_cr3_enumeration = 0, + .with_pio_enumeration = 1, + .with_mmio_enumeration = 0, + .with_interrupt_eip_enumeration = 0, + .show_default_domain_summary = 0, + .mmio_enumeration_skip_vga = 1, + .progress = 0, + .svm_mode = 0, + .summary = 0, + .report_pcpu = 0, + .tsc_loop_fatal = 0, + .cpu_hz = DEFAULT_CPU_HZ, + /* Pre-calculate a multiplier that makes the rest of the + * calculations easier */ + .cpu_qhz = QHZ_FROM_HZ(DEFAULT_CPU_HZ), + .default_guest_paging_levels = 2, + .sample_size = DEFAULT_SAMPLE_SIZE, + .tolerance = ERR_SANITY, + .interval = { .msec = DEFAULT_INTERVAL_LENGTH }, +}; + +FILE *warn = NULL; + +/* -- Summary data -- */ +struct cycle_framework { + tsc_t first_tsc, last_tsc, total_cycles; +}; + +struct interval_element { + int count; + long long cycles; + long long instructions; +}; + +struct event_cycle_summary { + int count, cycles_count; + long long cycles; + long long *cycles_sample; + struct interval_element interval; +}; + +struct cycle_summary { + int count; + unsigned long long cycles; + long long *sample; + struct interval_element interval; +}; + +struct weighted_cpi_summary { + int count; + unsigned long long instructions; + unsigned long long cycles; + float *cpi; + unsigned long long *cpi_weight; + struct interval_element interval; +}; + +/* -- Symbol list information -- */ +#define SYMBOL_ENTRIES_PER_STRUCT 1023 +#define SYMBOL_NAME_SIZE 124 +struct symbol_struct { + int count; + struct { + unsigned long long addr; + char name[SYMBOL_NAME_SIZE]; + } symbols[SYMBOL_ENTRIES_PER_STRUCT]; + struct symbol_struct *next; +}; + +void error(enum error_level l, struct record_info *ri); + +void parse_symbol_file(char *fn) { + unsigned long long last_addr = 0; + FILE * symbol_file; + struct symbol_struct ** p=&G.symbols; + + if((symbol_file=fopen(fn, "rb"))==NULL) { + fprintf(stderr, "Could not open symbol file %s\n", fn); + perror("open"); + error(ERR_SYSTEM, NULL); + } + while(!feof(symbol_file)) { + /* Allocate a new struct if we need it */ + if(!*p) { + *p = malloc(sizeof(**p)); + if(!*p) { + fprintf(stderr, "Malloc failed!\n"); + error(ERR_SYSTEM, NULL); + } + (*p)->count=0; + (*p)->next=NULL; + } + + /* FIXME -- use SYMBOL_NAME_SIZE */ + /* FIXME -- use regexp. This won't work for symbols with spaces (yes they exist) */ + (*p)->symbols[(*p)->count].addr = 0xDEADBEEF; + if ( fscanf(symbol_file, "%llx %128s", + &(*p)->symbols[(*p)->count].addr, + (*p)->symbols[(*p)->count].name) == 0 ) + break; + + + if( ((*p)->symbols[(*p)->count].addr > 0) + && ((*p)->symbols[(*p)->count].addr < last_addr) ) { + fprintf(stderr, "Symbol file not properly ordered: %llx %s < %llx!\n", + (*p)->symbols[(*p)->count].addr, + (*p)->symbols[(*p)->count].name, + last_addr); + /* Could be recovered from; just free existing strings and set symbols to NULL */ + error(ERR_ASSERT, NULL); + } else + last_addr = (*p)->symbols[(*p)->count].addr; + + (*p)->count++; + + /* If this struct is full, point to the next. It will be allocated + if needed. */ + if((*p)->count == SYMBOL_ENTRIES_PER_STRUCT) { + p=&((*p)->next); + } + } +} + +/* WARNING not thread safe */ +char * find_symbol(unsigned long long addr) { + struct symbol_struct * p=G.symbols; + int i; + char * lastname="ZERO"; + unsigned long long offset=addr; + static char name[128]; + + if(!p) { + name[0]=0; + return name; + } + + while(1) { + if(!p) + goto finish; + for(i=0; icount; i++) { + if(p->symbols[i].addr > addr) + goto finish; + else { + lastname=p->symbols[i].name; + offset=addr - p->symbols[i].addr; + } + } + p=p->next; + } + finish: + snprintf(name, 128, "(%s +%llx)", + lastname, offset); + return name; +} + +/* -- Eip list data -- */ +enum { + EIP_LIST_TYPE_NONE=0, + EIP_LIST_TYPE_MAX +}; + +struct eip_list_struct { + struct eip_list_struct *next; + unsigned long long eip; + struct event_cycle_summary summary; + int type; + void * extra; +}; + +struct { + void (*update)(struct eip_list_struct *, void *); + void (*new)(struct eip_list_struct *, void *); + void (*dump)(struct eip_list_struct *); +} eip_list_type[EIP_LIST_TYPE_MAX] = { + [EIP_LIST_TYPE_NONE] = { + .update=NULL, + .new=NULL, + .dump=NULL }, +}; + + +/* --- HVM class of events --- */ + +/* + * -- Algorithms -- + * + * Interrupt Wake-to-halt detection + * + * Purpose: To correlate device interrupts to vcpu runtime. + * + * Diagram: + * ... + * blocked -> runnable <- set to waking + * ... + * runnable -> running + * inj_virq A <- Note "waking" interrupt + * vmenter <- Start tsc of "wake-to-halt" interval. + Turn off 'waking'. + * ... + * inj_virq B <- Note alternate interrupt + * vmenter <- Start tsc of "interrupt-to-halt" interval + * ... + * vmexit <- End tsc of "x-to-halt" interval + * running -> blocked <- Process + * + * The "waking" interrupts we want to sub-classify into + * "wake-only" (when interrupt was the only interrupt from wake to halt) and + * "wake-all" (whether this was the only interrupt or not). + */ + +/* VMX data */ +#define EXIT_REASON_EXCEPTION_NMI 0 +#define EXIT_REASON_EXTERNAL_INTERRUPT 1 +#define EXIT_REASON_TRIPLE_FAULT 2 +#define EXIT_REASON_INIT 3 +#define EXIT_REASON_SIPI 4 +#define EXIT_REASON_IO_SMI 5 +#define EXIT_REASON_OTHER_SMI 6 +#define EXIT_REASON_PENDING_INTERRUPT 7 +#define EXIT_REASON_PENDING_VIRT_NMI 8 +#define EXIT_REASON_TASK_SWITCH 9 +#define EXIT_REASON_CPUID 10 +#define EXIT_REASON_GETSEC 11 +#define EXIT_REASON_HLT 12 +#define EXIT_REASON_INVD 13 +#define EXIT_REASON_INVLPG 14 +#define EXIT_REASON_RDPMC 15 +#define EXIT_REASON_RDTSC 16 +#define EXIT_REASON_RSM 17 +#define EXIT_REASON_VMCALL 18 +#define EXIT_REASON_VMCLEAR 19 +#define EXIT_REASON_VMLAUNCH 20 +#define EXIT_REASON_VMPTRLD 21 +#define EXIT_REASON_VMPTRST 22 +#define EXIT_REASON_VMREAD 23 +#define EXIT_REASON_VMRESUME 24 +#define EXIT_REASON_VMWRITE 25 +#define EXIT_REASON_VMOFF 26 +#define EXIT_REASON_VMON 27 +#define EXIT_REASON_CR_ACCESS 28 +#define EXIT_REASON_DR_ACCESS 29 +#define EXIT_REASON_IO_INSTRUCTION 30 +#define EXIT_REASON_MSR_READ 31 +#define EXIT_REASON_MSR_WRITE 32 +#define EXIT_REASON_INVALID_GUEST_STATE 33 +#define EXIT_REASON_MSR_LOADING 34 +#define EXIT_REASON_MWAIT_INSTRUCTION 36 +#define EXIT_REASON_MONITOR_TRAP_FLAG 37 +#define EXIT_REASON_MONITOR_INSTRUCTION 39 +#define EXIT_REASON_PAUSE_INSTRUCTION 40 +#define EXIT_REASON_MACHINE_CHECK 41 +#define EXIT_REASON_TPR_BELOW_THRESHOLD 43 +#define EXIT_REASON_APIC_ACCESS 44 +#define EXIT_REASON_ACCESS_GDTR_OR_IDTR 46 +#define EXIT_REASON_ACCESS_LDTR_OR_TR 47 +#define EXIT_REASON_EPT_VIOLATION 48 +#define EXIT_REASON_EPT_MISCONFIG 49 +#define EXIT_REASON_INVEPT 50 +#define EXIT_REASON_RDTSCP 51 +#define EXIT_REASON_VMX_PREEMPTION_TIMER_EXPIRED 52 +#define EXIT_REASON_INVVPID 53 +#define EXIT_REASON_WBINVD 54 +#define EXIT_REASON_XSETBV 55 + +#define HVM_VMX_EXIT_REASON_MAX (EXIT_REASON_XSETBV+1) + +char * hvm_vmx_exit_reason_name[HVM_VMX_EXIT_REASON_MAX] = { + [0] = "NONE", + [EXIT_REASON_EXCEPTION_NMI]="EXCEPTION_NMI", + [EXIT_REASON_EXTERNAL_INTERRUPT]="EXTERNAL_INTERRUPT", + [EXIT_REASON_TRIPLE_FAULT]="TRIPLE_FAULT", + [EXIT_REASON_INIT]="INIT", + [EXIT_REASON_SIPI]="SIPI", + [EXIT_REASON_IO_SMI]="IO_SMI", + [EXIT_REASON_OTHER_SMI]="OTHER_SMI", + [EXIT_REASON_PENDING_INTERRUPT]="PENDING_INTERRUPT", + [EXIT_REASON_PENDING_VIRT_NMI]="PENDING_VIRT_NMI", + [EXIT_REASON_TASK_SWITCH]="TASK_SWITCH", + [EXIT_REASON_CPUID]="CPUID", + [EXIT_REASON_GETSEC]="GETSEC", + [EXIT_REASON_HLT]="HLT", + [EXIT_REASON_INVD]="INVD", + [EXIT_REASON_INVLPG]="INVLPG", + [EXIT_REASON_RDPMC]="RDPMC", + [EXIT_REASON_RDTSC]="RDTSC", + [EXIT_REASON_RSM]="RSM", + [EXIT_REASON_VMCALL]="VMCALL", + [EXIT_REASON_VMCLEAR]="VMCLEAR", + [EXIT_REASON_VMLAUNCH]="VMLAUNCH", + [EXIT_REASON_VMPTRLD]="VMPTRLD", + [EXIT_REASON_VMPTRST]="VMPTRST", + [EXIT_REASON_VMREAD]="VMREAD", + [EXIT_REASON_VMRESUME]="VMRESUME", + [EXIT_REASON_VMWRITE]="VMWRITE", + [EXIT_REASON_VMOFF]="VMOFF", + [EXIT_REASON_VMON]="VMON", + [EXIT_REASON_CR_ACCESS]="CR_ACCESS", + [EXIT_REASON_DR_ACCESS]="DR_ACCESS", + [EXIT_REASON_IO_INSTRUCTION]="IO_INSTRUCTION", + [EXIT_REASON_MSR_READ]="MSR_READ", + [EXIT_REASON_MSR_WRITE]="MSR_WRITE", + [EXIT_REASON_INVALID_GUEST_STATE]="INVALID_GUEST_STATE", + [EXIT_REASON_MSR_LOADING]="MSR_LOADING", + [EXIT_REASON_MWAIT_INSTRUCTION]="MWAIT_INSTRUCTION", + [EXIT_REASON_MONITOR_TRAP_FLAG]="MONITOR_TRAP_FLAG", + [EXIT_REASON_MONITOR_INSTRUCTION]="MONITOR_INSTRUCTION", + [EXIT_REASON_PAUSE_INSTRUCTION]="PAUSE_INSTRUCTION", + [EXIT_REASON_MACHINE_CHECK]="MACHINE_CHECK", + [EXIT_REASON_TPR_BELOW_THRESHOLD]="TPR_BELOW_THRESHOLD", + [EXIT_REASON_APIC_ACCESS]="APIC_ACCESS", + [EXIT_REASON_EPT_VIOLATION]="EPT_VIOLATION", + [EXIT_REASON_EPT_MISCONFIG]="EPT_MISCONFIG", + [EXIT_REASON_INVEPT]="INVEPT", + [EXIT_REASON_RDTSCP]="RDTSCP", + [EXIT_REASON_VMX_PREEMPTION_TIMER_EXPIRED]="VMX_PREEMPTION_TIMER_EXPIRED", + [EXIT_REASON_INVVPID]="INVVPID", + [EXIT_REASON_WBINVD]="WBINVD", + [EXIT_REASON_XSETBV]="XSETBV", +}; + +/* SVM data */ +enum VMEXIT_EXITCODE +{ + /* control register read exitcodes */ + VMEXIT_CR0_READ = 0, + VMEXIT_CR1_READ = 1, + VMEXIT_CR2_READ = 2, + VMEXIT_CR3_READ = 3, + VMEXIT_CR4_READ = 4, + VMEXIT_CR5_READ = 5, + VMEXIT_CR6_READ = 6, + VMEXIT_CR7_READ = 7, + VMEXIT_CR8_READ = 8, + VMEXIT_CR9_READ = 9, + VMEXIT_CR10_READ = 10, + VMEXIT_CR11_READ = 11, + VMEXIT_CR12_READ = 12, + VMEXIT_CR13_READ = 13, + VMEXIT_CR14_READ = 14, + VMEXIT_CR15_READ = 15, + + /* control register write exitcodes */ + VMEXIT_CR0_WRITE = 16, + VMEXIT_CR1_WRITE = 17, + VMEXIT_CR2_WRITE = 18, + VMEXIT_CR3_WRITE = 19, + VMEXIT_CR4_WRITE = 20, + VMEXIT_CR5_WRITE = 21, + VMEXIT_CR6_WRITE = 22, + VMEXIT_CR7_WRITE = 23, + VMEXIT_CR8_WRITE = 24, + VMEXIT_CR9_WRITE = 25, + VMEXIT_CR10_WRITE = 26, + VMEXIT_CR11_WRITE = 27, + VMEXIT_CR12_WRITE = 28, + VMEXIT_CR13_WRITE = 29, + VMEXIT_CR14_WRITE = 30, + VMEXIT_CR15_WRITE = 31, + + /* debug register read exitcodes */ + VMEXIT_DR0_READ = 32, + VMEXIT_DR1_READ = 33, + VMEXIT_DR2_READ = 34, + VMEXIT_DR3_READ = 35, + VMEXIT_DR4_READ = 36, + VMEXIT_DR5_READ = 37, + VMEXIT_DR6_READ = 38, + VMEXIT_DR7_READ = 39, + VMEXIT_DR8_READ = 40, + VMEXIT_DR9_READ = 41, + VMEXIT_DR10_READ = 42, + VMEXIT_DR11_READ = 43, + VMEXIT_DR12_READ = 44, + VMEXIT_DR13_READ = 45, + VMEXIT_DR14_READ = 46, + VMEXIT_DR15_READ = 47, + + /* debug register write exitcodes */ + VMEXIT_DR0_WRITE = 48, + VMEXIT_DR1_WRITE = 49, + VMEXIT_DR2_WRITE = 50, + VMEXIT_DR3_WRITE = 51, + VMEXIT_DR4_WRITE = 52, + VMEXIT_DR5_WRITE = 53, + VMEXIT_DR6_WRITE = 54, + VMEXIT_DR7_WRITE = 55, + VMEXIT_DR8_WRITE = 56, + VMEXIT_DR9_WRITE = 57, + VMEXIT_DR10_WRITE = 58, + VMEXIT_DR11_WRITE = 59, + VMEXIT_DR12_WRITE = 60, + VMEXIT_DR13_WRITE = 61, + VMEXIT_DR14_WRITE = 62, + VMEXIT_DR15_WRITE = 63, + + /* processor exception exitcodes (VMEXIT_EXCP[0-31]) */ + VMEXIT_EXCEPTION_DE = 64, /* divide-by-zero-error */ + VMEXIT_EXCEPTION_DB = 65, /* debug */ + VMEXIT_EXCEPTION_NMI = 66, /* non-maskable-interrupt */ + VMEXIT_EXCEPTION_BP = 67, /* breakpoint */ + VMEXIT_EXCEPTION_OF = 68, /* overflow */ + VMEXIT_EXCEPTION_BR = 69, /* bound-range */ + VMEXIT_EXCEPTION_UD = 70, /* invalid-opcode*/ + VMEXIT_EXCEPTION_NM = 71, /* device-not-available */ + VMEXIT_EXCEPTION_DF = 72, /* double-fault */ + VMEXIT_EXCEPTION_09 = 73, /* unsupported (reserved) */ + VMEXIT_EXCEPTION_TS = 74, /* invalid-tss */ + VMEXIT_EXCEPTION_NP = 75, /* segment-not-present */ + VMEXIT_EXCEPTION_SS = 76, /* stack */ + VMEXIT_EXCEPTION_GP = 77, /* general-protection */ + VMEXIT_EXCEPTION_PF = 78, /* page-fault */ + VMEXIT_EXCEPTION_15 = 79, /* reserved */ + VMEXIT_EXCEPTION_MF = 80, /* x87 floating-point exception-pending */ + VMEXIT_EXCEPTION_AC = 81, /* alignment-check */ + VMEXIT_EXCEPTION_MC = 82, /* machine-check */ + VMEXIT_EXCEPTION_XF = 83, /* simd floating-point */ + + /* exceptions 20-31 (exitcodes 84-95) are reserved */ + + /* ...and the rest of the #VMEXITs */ + VMEXIT_INTR = 96, + VMEXIT_NMI = 97, + VMEXIT_SMI = 98, + VMEXIT_INIT = 99, + VMEXIT_VINTR = 100, + VMEXIT_CR0_SEL_WRITE = 101, + VMEXIT_IDTR_READ = 102, + VMEXIT_GDTR_READ = 103, + VMEXIT_LDTR_READ = 104, + VMEXIT_TR_READ = 105, + VMEXIT_IDTR_WRITE = 106, + VMEXIT_GDTR_WRITE = 107, + VMEXIT_LDTR_WRITE = 108, + VMEXIT_TR_WRITE = 109, + VMEXIT_RDTSC = 110, + VMEXIT_RDPMC = 111, + VMEXIT_PUSHF = 112, + VMEXIT_POPF = 113, + VMEXIT_CPUID = 114, + VMEXIT_RSM = 115, + VMEXIT_IRET = 116, + VMEXIT_SWINT = 117, + VMEXIT_INVD = 118, + VMEXIT_PAUSE = 119, + VMEXIT_HLT = 120, + VMEXIT_INVLPG = 121, + VMEXIT_INVLPGA = 122, + VMEXIT_IOIO = 123, + VMEXIT_MSR = 124, + VMEXIT_TASK_SWITCH = 125, + VMEXIT_FERR_FREEZE = 126, + VMEXIT_SHUTDOWN = 127, + VMEXIT_VMRUN = 128, + VMEXIT_VMMCALL = 129, + VMEXIT_VMLOAD = 130, + VMEXIT_VMSAVE = 131, + VMEXIT_STGI = 132, + VMEXIT_CLGI = 133, + VMEXIT_SKINIT = 134, + VMEXIT_RDTSCP = 135, + VMEXIT_ICEBP = 136, + VMEXIT_WBINVD = 137, + VMEXIT_MONITOR = 138, + VMEXIT_MWAIT = 139, + VMEXIT_MWAIT_CONDITIONAL= 140, + VMEXIT_NPF = 1024, /* nested paging fault */ + VMEXIT_INVALID = -1 +}; + +#define HVM_SVM_EXIT_REASON_MAX 1025 +char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX] = { + /* 0-15 */ + "VMEXIT_CR0_READ", + "VMEXIT_CR1_READ", + "VMEXIT_CR2_READ", + "VMEXIT_CR3_READ", + "VMEXIT_CR4_READ", + "VMEXIT_CR5_READ", + "VMEXIT_CR6_READ", + "VMEXIT_CR7_READ", + "VMEXIT_CR8_READ", + "VMEXIT_CR9_READ", + "VMEXIT_CR10_READ", + "VMEXIT_CR11_READ", + "VMEXIT_CR12_READ", + "VMEXIT_CR13_READ", + "VMEXIT_CR14_READ", + "VMEXIT_CR15_READ", + /* 16-31 */ + "VMEXIT_CR0_WRITE", + "VMEXIT_CR1_WRITE", + "VMEXIT_CR2_WRITE", + "VMEXIT_CR3_WRITE", + "VMEXIT_CR4_WRITE", + "VMEXIT_CR5_WRITE", + "VMEXIT_CR6_WRITE", + "VMEXIT_CR7_WRITE", + "VMEXIT_CR8_WRITE", + "VMEXIT_CR9_WRITE", + "VMEXIT_CR10_WRITE", + "VMEXIT_CR11_WRITE", + "VMEXIT_CR12_WRITE", + "VMEXIT_CR13_WRITE", + "VMEXIT_CR14_WRITE", + "VMEXIT_CR15_WRITE", + /* 32-47 */ + "VMEXIT_DR0_READ", + "VMEXIT_DR1_READ", + "VMEXIT_DR2_READ", + "VMEXIT_DR3_READ", + "VMEXIT_DR4_READ", + "VMEXIT_DR5_READ", + "VMEXIT_DR6_READ", + "VMEXIT_DR7_READ", + "VMEXIT_DR8_READ", + "VMEXIT_DR9_READ", + "VMEXIT_DR10_READ", + "VMEXIT_DR11_READ", + "VMEXIT_DR12_READ", + "VMEXIT_DR13_READ", + "VMEXIT_DR14_READ", + "VMEXIT_DR15_READ", + /* 48-63 */ + "VMEXIT_DR0_WRITE", + "VMEXIT_DR1_WRITE", + "VMEXIT_DR2_WRITE", + "VMEXIT_DR3_WRITE", + "VMEXIT_DR4_WRITE", + "VMEXIT_DR5_WRITE", + "VMEXIT_DR6_WRITE", + "VMEXIT_DR7_WRITE", + "VMEXIT_DR8_WRITE", + "VMEXIT_DR9_WRITE", + "VMEXIT_DR10_WRITE", + "VMEXIT_DR11_WRITE", + "VMEXIT_DR12_WRITE", + "VMEXIT_DR13_WRITE", + "VMEXIT_DR14_WRITE", + "VMEXIT_DR15_WRITE", + /* 64-83 */ + "VMEXIT_EXCEPTION_DE", + "VMEXIT_EXCEPTION_DB", + "VMEXIT_EXCEPTION_NMI", + "VMEXIT_EXCEPTION_BP", + "VMEXIT_EXCEPTION_OF", + "VMEXIT_EXCEPTION_BR", + "VMEXIT_EXCEPTION_UD", + "VMEXIT_EXCEPTION_NM", + "VMEXIT_EXCEPTION_DF", + "VMEXIT_EXCEPTION_09", + "VMEXIT_EXCEPTION_TS", + "VMEXIT_EXCEPTION_NP", + "VMEXIT_EXCEPTION_SS", + "VMEXIT_EXCEPTION_GP", + "VMEXIT_EXCEPTION_PF", + "VMEXIT_EXCEPTION_15", + "VMEXIT_EXCEPTION_MF", + "VMEXIT_EXCEPTION_AC", + "VMEXIT_EXCEPTION_MC", + "VMEXIT_EXCEPTION_XF", + /* 84-95 */ + "VMEXIT_EXCEPTION_20", + "VMEXIT_EXCEPTION_21", + "VMEXIT_EXCEPTION_22", + "VMEXIT_EXCEPTION_23", + "VMEXIT_EXCEPTION_24", + "VMEXIT_EXCEPTION_25", + "VMEXIT_EXCEPTION_26", + "VMEXIT_EXCEPTION_27", + "VMEXIT_EXCEPTION_28", + "VMEXIT_EXCEPTION_29", + "VMEXIT_EXCEPTION_30", + "VMEXIT_EXCEPTION_31", + /* 96-99 */ + "VMEXIT_INTR", + "VMEXIT_NMI", + "VMEXIT_SMI", + "VMEXIT_INIT", + /* 100-109 */ + "VMEXIT_VINTR", + "VMEXIT_CR0_SEL_WRITE", + "VMEXIT_IDTR_READ", + "VMEXIT_GDTR_READ", + "VMEXIT_LDTR_READ", + "VMEXIT_TR_READ", + "VMEXIT_IDTR_WRITE", + "VMEXIT_GDTR_WRITE", + "VMEXIT_LDTR_WRITE", + "VMEXIT_TR_WRITE", + /* 110-119 */ + "VMEXIT_RDTSC", + "VMEXIT_RDPMC", + "VMEXIT_PUSHF", + "VMEXIT_POPF", + "VMEXIT_CPUID", + "VMEXIT_RSM", + "VMEXIT_IRET", + "VMEXIT_SWINT", + "VMEXIT_INVD", + "VMEXIT_PAUSE", + /* 120-129 */ + "VMEXIT_HLT", + "VMEXIT_INVLPG", + "VMEXIT_INVLPGA", + "VMEXIT_IOIO", + "VMEXIT_MSR", + "VMEXIT_TASK_SWITCH", + "VMEXIT_FERR_FREEZE", + "VMEXIT_SHUTDOWN", + "VMEXIT_VMRUN", + "VMEXIT_VMMCALL", + /* 130-139 */ + "VMEXIT_VMLOAD", + "VMEXIT_VMSAVE", + "VMEXIT_STGI", + "VMEXIT_CLGI", + "VMEXIT_SKINIT", + "VMEXIT_RDTSCP", + "VMEXIT_ICEBP", + "VMEXIT_WBINVD", + "VMEXIT_MONITOR", + "VMEXIT_MWAIT", + /* 140 */ + "VMEXIT_MWAIT_CONDITIONAL", + [VMEXIT_NPF] = "VMEXIT_NPF", /* nested paging fault */ +}; + + +#if ( HVM_VMX_EXIT_REASON_MAX > HVM_SVM_EXIT_REASON_MAX ) +# define HVM_EXIT_REASON_MAX HVM_VMX_EXIT_REASON_MAX +# error - Strange! +#else +# define HVM_EXIT_REASON_MAX HVM_SVM_EXIT_REASON_MAX +#endif + +/* General hvm information */ +#define SPURIOUS_APIC_VECTOR 0xff +#define ERROR_APIC_VECTOR 0xfe +#define INVALIDATE_TLB_VECTOR 0xfd +#define EVENT_CHECK_VECTOR 0xfc +#define CALL_FUNCTION_VECTOR 0xfb +#define THERMAL_APIC_VECTOR 0xfa +#define LOCAL_TIMER_VECTOR 0xf9 + +#define EXTERNAL_INTERRUPT_MAX 256 + +/* Stringify numbers */ +char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] = { + [SPURIOUS_APIC_VECTOR] = "SPURIOS_APIC", + [ERROR_APIC_VECTOR] = "ERROR_APIC", + [INVALIDATE_TLB_VECTOR]= "INVALIDATE_TLB", + [EVENT_CHECK_VECTOR]= "EVENT_CHECK", + [CALL_FUNCTION_VECTOR]= "CALL_FUNCTION", + [THERMAL_APIC_VECTOR]= "THERMAL_APIC", + [LOCAL_TIMER_VECTOR] = "LOCAL_TIMER", +}; + +#define HVM_TRAP_MAX 20 + +char * hvm_trap_name[HVM_TRAP_MAX] = { + [0] = "Divide", + [1] = "RESERVED", + [2] = "NMI", + [3] = "Breakpoint", + [4] = "Overflow", + [5] = "BOUND", + [6] = "Invalid Op", + [7] = "Coprocessor not present", + [8] = "Double Fault", + [9] = "Coprocessor segment overrun", + [10] = "TSS", + [11] = "Segment not present", + [12] = "Stack-segment fault", + [13] = "GP", + [14] = "Page fault", + [15] = "RESERVED", + [16] = "FPU", + [17] = "Alignment check", + [18] = "Machine check", + [19] = "SIMD", +}; + + +enum { + HVM_EVENT_HANDLER_NONE = 0, + HVM_EVENT_HANDLER_PF_XEN = 1, + HVM_EVENT_HANDLER_PF_INJECT, + HVM_EVENT_HANDLER_INJ_EXC, + HVM_EVENT_HANDLER_INJ_VIRQ, + HVM_EVENT_HANDLER_REINJ_VIRQ, + HVM_EVENT_HANDLER_IO_READ, + HVM_EVENT_HANDLER_IO_WRITE, + HVM_EVENT_HANDLER_CR_READ, /* 8 */ + HVM_EVENT_HANDLER_CR_WRITE, + HVM_EVENT_HANDLER_DR_READ, + HVM_EVENT_HANDLER_DR_WRITE, + HVM_EVENT_HANDLER_MSR_READ, + HVM_EVENT_HANDLER_MSR_WRITE, + HVM_EVENT_HANDLER_CPUID, + HVM_EVENT_HANDLER_INTR, + HVM_EVENT_HANDLER_NMI, /* 16 */ + HVM_EVENT_HANDLER_SMI, + HVM_EVENT_HANDLER_VMCALL, + HVM_EVENT_HANDLER_HLT, + HVM_EVENT_HANDLER_INVLPG, + HVM_EVENT_HANDLER_MCE, + HVM_EVENT_HANDLER_IO_ASSIST, + HVM_EVENT_HANDLER_MMIO_ASSIST, + HVM_EVENT_HANDLER_CLTS, + HVM_EVENT_HANDLER_LMSW, + HVM_EVENT_RDTSC, + HVM_EVENT_INTR_WINDOW=0x20, /* Oops... skipped 0x1b-1f */ + HVM_EVENT_NPF, + HVM_EVENT_REALMODE_EMULATE, + HVM_EVENT_TRAP, + HVM_EVENT_TRAP_DEBUG, + HVM_EVENT_VLAPIC, + HVM_EVENT_HANDLER_MAX +}; +char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] = { + "(no handler)", + "pf_xen", + "pf_inject", + "inj_exc", + "inj_virq", + "reinj_virq", + "io_read", + "io_write", + "cr_read", /* 8 */ + "cr_write", + "dr_read", + "dr_write", + "msr_read", + "msr_write", + "cpuid", + "intr", + "nmi", /* 16 */ + "smi", + "vmcall", + "hlt", + "invlpg", + "mce", + "io_assist", + "mmio_assist", + "clts", /* 24 */ + "lmsw", + "rdtsc", + [HVM_EVENT_INTR_WINDOW]="intr_window", + "npf", + "realmode_emulate", + "trap", + "trap_debug", + "vlapic" +}; + +enum { + HVM_VOL_VMENTRY, + HVM_VOL_VMEXIT, + HVM_VOL_HANDLER, + HVM_VOL_MAX +}; + +enum { + GUEST_INTERRUPT_CASE_NONE, + /* This interrupt woke, no other interrupts until halt */ + GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ALONE, + /* This interrupt woke, maybe another interrupt before halt */ + GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ANY, + /* Time from interrupt (running) to halt */ + GUEST_INTERRUPT_CASE_INTERRUPT_TO_HALT, + GUEST_INTERRUPT_CASE_MAX, +}; + +char *guest_interrupt_case_name[] = { + [GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ALONE]="wake to halt alone", + /* This interrupt woke, maybe another interrupt before halt */ + [GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ANY] ="wake to halt any ", + /* Time from interrupt (running) to halt */ + [GUEST_INTERRUPT_CASE_INTERRUPT_TO_HALT] ="intr to halt ", +}; + +char *hvm_vol_name[HVM_VOL_MAX] = { + [HVM_VOL_VMENTRY]="vmentry", + [HVM_VOL_VMEXIT] ="vmexit", + [HVM_VOL_HANDLER]="handler", +}; + +enum { + HYPERCALL_set_trap_table = 0, + HYPERCALL_mmu_update, + HYPERCALL_set_gdt, + HYPERCALL_stack_switch, + HYPERCALL_set_callbacks, + HYPERCALL_fpu_taskswitch, + HYPERCALL_sched_op_compat, + HYPERCALL_platform_op, + HYPERCALL_set_debugreg, + HYPERCALL_get_debugreg, + HYPERCALL_update_descriptor, + HYPERCALL_memory_op=12, + HYPERCALL_multicall, + HYPERCALL_update_va_mapping, + HYPERCALL_set_timer_op, + HYPERCALL_event_channel_op_compat, + HYPERCALL_xen_version, + HYPERCALL_console_io, + HYPERCALL_physdev_op_compat, + HYPERCALL_grant_table_op, + HYPERCALL_vm_assist, + HYPERCALL_update_va_mapping_otherdomain, + HYPERCALL_iret, + HYPERCALL_vcpu_op, + HYPERCALL_set_segment_base, + HYPERCALL_mmuext_op, + HYPERCALL_acm_op, + HYPERCALL_nmi_op, + HYPERCALL_sched_op, + HYPERCALL_callback_op, + HYPERCALL_xenoprof_op, + HYPERCALL_event_channel_op, + HYPERCALL_physdev_op, + HYPERCALL_hvm_op, + HYPERCALL_sysctl, + HYPERCALL_domctl, + HYPERCALL_kexec_op, + HYPERCALL_MAX +}; + +char *hypercall_name[HYPERCALL_MAX] = { + [HYPERCALL_set_trap_table]="set_trap_table", + [HYPERCALL_mmu_update]="mmu_update", + [HYPERCALL_set_gdt]="set_gdt", + [HYPERCALL_stack_switch]="stack_switch", + [HYPERCALL_set_callbacks]="set_callbacks", + [HYPERCALL_fpu_taskswitch]="fpu_taskswitch", + [HYPERCALL_sched_op_compat]="sched_op(compat)", + [HYPERCALL_platform_op]="platform_op", + [HYPERCALL_set_debugreg]="set_debugreg", + [HYPERCALL_get_debugreg]="get_debugreg", + [HYPERCALL_update_descriptor]="update_descriptor", + [HYPERCALL_memory_op]="memory_op", + [HYPERCALL_multicall]="multicall", + [HYPERCALL_update_va_mapping]="update_va_mapping", + [HYPERCALL_set_timer_op]="set_timer_op", + [HYPERCALL_event_channel_op_compat]="evtchn_op(compat)", + [HYPERCALL_xen_version]="xen_version", + [HYPERCALL_console_io]="console_io", + [HYPERCALL_physdev_op_compat]="physdev_op(compat)", + [HYPERCALL_grant_table_op]="grant_table_op", + [HYPERCALL_vm_assist]="vm_assist", + [HYPERCALL_update_va_mapping_otherdomain]="update_va_mapping_otherdomain", + [HYPERCALL_iret]="iret", + [HYPERCALL_vcpu_op]="vcpu_op", + [HYPERCALL_set_segment_base]="set_segment_base", + [HYPERCALL_mmuext_op]="mmuext_op", + [HYPERCALL_acm_op]="acm_op", + [HYPERCALL_nmi_op]="nmi_op", + [HYPERCALL_sched_op]="sched_op", + [HYPERCALL_callback_op]="callback_op", + [HYPERCALL_xenoprof_op]="xenoprof_op", + [HYPERCALL_event_channel_op]="evtchn_op", + [HYPERCALL_physdev_op]="physdev_op", + [HYPERCALL_hvm_op]="hvm_op", + [HYPERCALL_sysctl]="sysctl", + [HYPERCALL_domctl]="domctl", + [HYPERCALL_kexec_op]="kexec_op" +}; + +enum { + PF_XEN_EMUL_LVL_0, + PF_XEN_EMUL_LVL_1, + PF_XEN_EMUL_LVL_2, + PF_XEN_EMUL_LVL_3, + PF_XEN_EMUL_LVL_4, + PF_XEN_EMUL_EARLY_UNSHADOW, + PF_XEN_EMUL_SET_CHANGED, + PF_XEN_EMUL_SET_UNCHANGED, + PF_XEN_EMUL_SET_FLUSH, + PF_XEN_EMUL_SET_ERROR, + PF_XEN_EMUL_PROMOTE, + PF_XEN_EMUL_DEMOTE, + PF_XEN_EMUL_PREALLOC_UNPIN, + PF_XEN_EMUL_PREALLOC_UNHOOK, + PF_XEN_EMUL_MAX, +}; + +char * pf_xen_emul_name[PF_XEN_EMUL_MAX] = { + [PF_XEN_EMUL_LVL_0]="non-linmap", + [PF_XEN_EMUL_LVL_1]="linmap l1", + [PF_XEN_EMUL_LVL_2]="linmap l2", + [PF_XEN_EMUL_LVL_3]="linmap l3", + [PF_XEN_EMUL_LVL_4]="linmap l4", + [PF_XEN_EMUL_EARLY_UNSHADOW]="early unshadow", + [PF_XEN_EMUL_SET_UNCHANGED]="set unchanged", + [PF_XEN_EMUL_SET_CHANGED]="set changed", + [PF_XEN_EMUL_SET_FLUSH]="set changed", + [PF_XEN_EMUL_SET_ERROR]="set changed", + [PF_XEN_EMUL_PROMOTE]="promote", + [PF_XEN_EMUL_DEMOTE]="demote", + [PF_XEN_EMUL_PREALLOC_UNPIN]="unpin", + [PF_XEN_EMUL_PREALLOC_UNHOOK]="unhook", +}; + +/* Rio only */ +enum { + PF_XEN_NON_EMUL_VA_USER, + PF_XEN_NON_EMUL_VA_KERNEL, + PF_XEN_NON_EMUL_EIP_USER, + PF_XEN_NON_EMUL_EIP_KERNEL, + PF_XEN_NON_EMUL_MAX, +}; + +char * pf_xen_non_emul_name[PF_XEN_NON_EMUL_MAX] = { + [PF_XEN_NON_EMUL_VA_USER]="va user", + [PF_XEN_NON_EMUL_VA_KERNEL]="va kernel", + [PF_XEN_NON_EMUL_EIP_USER]="eip user", + [PF_XEN_NON_EMUL_EIP_KERNEL]="eip kernel", +}; + +enum { + PF_XEN_FIXUP_PREALLOC_UNPIN, + PF_XEN_FIXUP_PREALLOC_UNHOOK, + PF_XEN_FIXUP_UNSYNC, + PF_XEN_FIXUP_OOS_ADD, + PF_XEN_FIXUP_OOS_EVICT, + PF_XEN_FIXUP_PROMOTE, + PF_XEN_FIXUP_UPDATE_ONLY, + PF_XEN_FIXUP_WRMAP, + PF_XEN_FIXUP_BRUTE_FORCE, + PF_XEN_FIXUP_MAX, +}; + +char * pf_xen_fixup_name[PF_XEN_FIXUP_MAX] = { + [PF_XEN_FIXUP_PREALLOC_UNPIN] = "unpin", + [PF_XEN_FIXUP_PREALLOC_UNHOOK] = "unhook", + [PF_XEN_FIXUP_UNSYNC] = "unsync", + [PF_XEN_FIXUP_OOS_ADD] = "oos-add", + [PF_XEN_FIXUP_OOS_EVICT] = "oos-evict", + [PF_XEN_FIXUP_PROMOTE] = "promote", + [PF_XEN_FIXUP_UPDATE_ONLY] = "update", + [PF_XEN_FIXUP_WRMAP] = "wrmap", + [PF_XEN_FIXUP_BRUTE_FORCE] = "wrmap-bf", +}; + +enum { + PF_XEN_NOT_SHADOW = 1, + PF_XEN_FAST_PROPAGATE, + PF_XEN_FAST_MMIO, + PF_XEN_FALSE_FAST_PATH, + PF_XEN_MMIO, + PF_XEN_FIXUP, + PF_XEN_DOMF_DYING, + PF_XEN_EMULATE, + PF_XEN_EMULATE_UNSHADOW_USER, + PF_XEN_EMULATE_UNSHADOW_EVTINJ, + PF_XEN_EMULATE_UNSHADOW_UNHANDLED, + PF_XEN_LAST_FAULT=PF_XEN_EMULATE_UNSHADOW_UNHANDLED, + PF_XEN_NON_EMULATE, + PF_XEN_NO_HANDLER, + PF_XEN_MAX, +}; + +#define SHADOW_WRMAP_BF 12 +#define SHADOW_PREALLOC_UNPIN 13 +#define SHADOW_RESYNC_FULL 14 +#define SHADOW_RESYNC_ONLY 15 + +char * pf_xen_name[PF_XEN_MAX] = { + [PF_XEN_NOT_SHADOW]="propagate", + [PF_XEN_FAST_PROPAGATE]="fast propagate", + [PF_XEN_FAST_MMIO]="fast mmio", + [PF_XEN_FALSE_FAST_PATH]="false fast path", + [PF_XEN_MMIO]="mmio", + [PF_XEN_FIXUP]="fixup", + [PF_XEN_DOMF_DYING]="dom dying", + [PF_XEN_EMULATE]="emulate", + [PF_XEN_EMULATE_UNSHADOW_USER]="unshadow:user-mode", + [PF_XEN_EMULATE_UNSHADOW_EVTINJ]="unshadow:evt inj", + [PF_XEN_EMULATE_UNSHADOW_UNHANDLED]="unshadow:unhandled instr", + [PF_XEN_NON_EMULATE]="fixup|mmio", + [PF_XEN_NO_HANDLER]="(no handler)", +}; + +#define CORR_VA_INVALID (0ULL-1) + +enum { + NONPF_MMIO_APIC, + NONPF_MMIO_NPF, + NONPF_MMIO_UNKNOWN, + NONPF_MMIO_MAX +}; + +struct mmio_info { + unsigned long long gpa; + unsigned long long va; /* Filled only by shadow */ + unsigned data; + unsigned data_valid:1, is_write:1; +}; + +struct pf_xen_extra { + unsigned long long va; + union { + unsigned flags; + struct { + unsigned flag_set_ad:1, + flag_set_a:1, + flag_shadow_l1_get_ref:1, + flag_shadow_l1_put_ref:1, + flag_l2_propagate:1, + flag_set_changed:1, + flag_set_flush:1, + flag_set_error:1, + flag_demote:1, + flag_promote:1, + flag_wrmap:1, + flag_wrmap_guess_found:1, + flag_wrmap_brute_force:1, + flag_early_unshadow:1, + flag_emulation_2nd_pt_written:1, + flag_emulation_last_failed:1, + flag_emulate_full_pt:1, + flag_prealloc_unhook:1, + flag_unsync:1, + flag_oos_fixup_add:1, + flag_oos_fixup_evict:1; + }; + }; /* Miami + ; fixup & emulate */ + unsigned int error_code; /* Rio only */ + + /* Calculated */ + int pf_case; /* Rio */ + + /* MMIO only */ + unsigned long long gpa; + unsigned int data; + + /* Emulate only */ + unsigned long long gl1e; /* Miami + */ + unsigned long long wval; /* Miami */ + unsigned long long corresponding_va; + unsigned int pt_index[5], pt_is_lo; + int pt_level; + + /* Other */ + unsigned long long gfn; + + /* Flags */ + unsigned corr_valid:1, + corr_is_kernel:1, + va_is_kernel:1; +}; + +struct pcpu_info; + +#define GUEST_INTERRUPT_MAX 350 +#define FAKE_VECTOR 349 +#define CR_MAX 9 +#define RESYNCS_MAX 17 +#define PF_XEN_FIXUP_UNSYNC_RESYNC_MAX 2 + +struct hvm_data; + +struct hvm_summary_handler_node { + void (*handler)(struct hvm_data *, void* data); + void *data; + struct hvm_summary_handler_node *next; +}; + +struct hvm_data { + /* Summary information */ + int init; + int vmexit_valid; + int summary_info; + struct vcpu_data *v; /* up-pointer */ + + /* SVM / VMX compatibility. FIXME - should be global */ + char ** exit_reason_name; + int exit_reason_max; + struct hvm_summary_handler_node *exit_reason_summary_handler_list[HVM_EXIT_REASON_MAX]; + + /* Information about particular exit reasons */ + struct { + struct event_cycle_summary exit_reason[HVM_EXIT_REASON_MAX]; + int extint[EXTERNAL_INTERRUPT_MAX+1]; + int *extint_histogram; + struct event_cycle_summary trap[HVM_TRAP_MAX]; + struct event_cycle_summary pf_xen[PF_XEN_MAX]; + struct event_cycle_summary pf_xen_emul[PF_XEN_EMUL_MAX]; + struct event_cycle_summary pf_xen_emul_early_unshadow[5]; + struct event_cycle_summary pf_xen_non_emul[PF_XEN_NON_EMUL_MAX]; + struct event_cycle_summary pf_xen_fixup[PF_XEN_FIXUP_MAX]; + struct event_cycle_summary pf_xen_fixup_unsync_resync[PF_XEN_FIXUP_UNSYNC_RESYNC_MAX+1]; + struct event_cycle_summary cr_write[CR_MAX]; + struct event_cycle_summary cr3_write_resyncs[RESYNCS_MAX+1]; + struct event_cycle_summary vmcall[HYPERCALL_MAX+1]; + struct event_cycle_summary generic[HVM_EVENT_HANDLER_MAX]; + struct event_cycle_summary mmio[NONPF_MMIO_MAX]; + struct hvm_gi_struct { + int count; + struct cycle_summary runtime[GUEST_INTERRUPT_CASE_MAX]; + /* OK, not summary info, but still... */ + int is_wake; + tsc_t start_tsc; + } guest_interrupt[GUEST_INTERRUPT_MAX + 1]; + /* IPI Latency */ + struct event_cycle_summary ipi_latency; + int ipi_count[256]; + struct { + struct io_address *mmio, *pio; + } io; + } summary; + + /* In-flight accumulation information */ + struct { + union { + struct { + unsigned port:31, + is_write:1; + unsigned int val; + } io; + struct pf_xen_extra pf_xen; + struct { + unsigned cr; + unsigned long long val; + int repromote; + } cr_write; + struct { + unsigned addr; + unsigned long long val; + } msr; + struct { + unsigned int event; + uint32_t d[4]; + } generic; + struct { + unsigned eax; + } vmcall; + struct { + unsigned vec; + } intr; + }; + /* MMIO gets its separate area, since many exits may use it */ + struct mmio_info mmio; + }inflight; + int resyncs; + void (*post_process)(struct hvm_data *); + tsc_t exit_tsc, arc_cycles, entry_tsc; + unsigned long long rip; + unsigned exit_reason, event_handler; + int short_summary_done:1, prealloc_unpin:1, wrmap_bf:1; + + /* Immediate processing */ + void *d; + + /* Wake-to-halt detection. See comment above. */ + struct { + unsigned waking:1; + /* Wake vector: keep track of time from vmentry until: + next halt, or next interrupt */ + int vector, interrupts, interrupts_wanting_tsc; + } w2h; + + /* Historical info */ + tsc_t last_rdtsc; +}; + +enum { + HVM_SHORT_SUMMARY_EMULATE, + HVM_SHORT_SUMMARY_UNSYNC, + HVM_SHORT_SUMMARY_FIXUP, + HVM_SHORT_SUMMARY_MMIO, + HVM_SHORT_SUMMARY_PROPAGATE, + HVM_SHORT_SUMMARY_CR3, + HVM_SHORT_SUMMARY_VMCALL, + HVM_SHORT_SUMMARY_INTERRUPT, + HVM_SHORT_SUMMARY_HLT, + HVM_SHORT_SUMMARY_OTHER, + HVM_SHORT_SUMMARY_MAX, +}; + +char *hvm_short_summary_name[HVM_SHORT_SUMMARY_MAX] = { + [HVM_SHORT_SUMMARY_EMULATE] ="emulate", + [HVM_SHORT_SUMMARY_UNSYNC] ="unsync", + [HVM_SHORT_SUMMARY_FIXUP] ="fixup", + [HVM_SHORT_SUMMARY_MMIO] ="mmio", + [HVM_SHORT_SUMMARY_PROPAGATE]="propagate", + [HVM_SHORT_SUMMARY_CR3] ="cr3", + [HVM_SHORT_SUMMARY_VMCALL] ="vmcall", + [HVM_SHORT_SUMMARY_INTERRUPT]="intr", + [HVM_SHORT_SUMMARY_HLT] ="hlt", + [HVM_SHORT_SUMMARY_OTHER] ="other", +}; + +struct hvm_short_summary_struct { + struct cycle_summary s[HVM_SHORT_SUMMARY_MAX]; +}; + +void init_hvm_data(struct hvm_data *h, struct vcpu_data *v) { + int i; + + if(h->init) + return; + + h->v = v; + + h->init = 1; + + if(opt.svm_mode) { + h->exit_reason_max = HVM_SVM_EXIT_REASON_MAX; + h->exit_reason_name = hvm_svm_exit_reason_name; + } else { + h->exit_reason_max = HVM_VMX_EXIT_REASON_MAX; + h->exit_reason_name = hvm_vmx_exit_reason_name; + } + + if(opt.histogram_interrupt_eip) { + int count = ((1ULL<summary.extint_histogram = malloc(size); + if(h->summary.extint_histogram) + bzero(h->summary.extint_histogram, size); + else { + fprintf(stderr, "FATAL: Could not allocate %zd bytes for interrupt histogram!\n", + size); + error(ERR_SYSTEM, NULL); + } + + } + for(i=0; isummary.guest_interrupt[i].count=0; +} + +/* PV data */ +enum { + PV_HYPERCALL=1, + PV_TRAP=3, + PV_PAGE_FAULT, + PV_FORCED_INVALID_OP, + PV_EMULATE_PRIVOP, + PV_EMULATE_4GB, + PV_MATH_STATE_RESTORE, + PV_PAGING_FIXUP, + PV_GDT_LDT_MAPPING_FAULT, + PV_PTWR_EMULATION, + PV_PTWR_EMULATION_PAE, + PV_HYPERCALL_V2 = 13, + PV_HYPERCALL_SUBCALL = 14, + PV_MAX +}; + +char *pv_name[PV_MAX] = { + [PV_HYPERCALL]="hypercall", + [PV_TRAP]="trap", + [PV_PAGE_FAULT]="page_fault", + [PV_FORCED_INVALID_OP]="forced_invalid_op", + [PV_EMULATE_PRIVOP]="emulate privop", + [PV_EMULATE_4GB]="emulate 4g", + [PV_MATH_STATE_RESTORE]="math state restore", + [PV_PAGING_FIXUP]="paging fixup", + [PV_GDT_LDT_MAPPING_FAULT]="gdt/ldt mapping fault", + [PV_PTWR_EMULATION]="ptwr", + [PV_PTWR_EMULATION_PAE]="ptwr(pae)", + [PV_HYPERCALL_V2]="hypercall", + [PV_HYPERCALL_SUBCALL]="hypercall (subcall)", +}; + +#define PV_HYPERCALL_MAX 56 +#define PV_TRAP_MAX 20 + +struct pv_data { + unsigned summary_info:1; + int count[PV_MAX]; + int hypercall_count[PV_HYPERCALL_MAX]; + int trap_count[PV_TRAP_MAX]; +}; + +/* Sched data */ + +enum { + SCHED_DOM_ADD=1, + SCHED_DOM_REM, + SCHED_SLEEP, + SCHED_WAKE, + SCHED_YIELD, + SCHED_BLOCK, + SCHED_SHUTDOWN, + SCHED_CTL, + SCHED_ADJDOM, + SCHED_SWITCH, + SCHED_S_TIMER_FN, + SCHED_T_TIMER_FN, + SCHED_DOM_TIMER_FN, + SCHED_SWITCH_INFPREV, + SCHED_SWITCH_INFNEXT, + SCHED_SHUTDOWN_CODE, + SCHED_MAX +}; + +enum { + RUNSTATE_RUNNING=0, + RUNSTATE_RUNNABLE, + RUNSTATE_BLOCKED, + RUNSTATE_OFFLINE, + RUNSTATE_LOST, + RUNSTATE_QUEUED, + RUNSTATE_INIT, + RUNSTATE_MAX +}; + +int runstate_graph[RUNSTATE_MAX] = +{ + [RUNSTATE_BLOCKED]=0, + [RUNSTATE_OFFLINE]=1, + [RUNSTATE_RUNNABLE]=2, + [RUNSTATE_RUNNING]=3, + [RUNSTATE_LOST]=-1, + [RUNSTATE_QUEUED]=-2, + [RUNSTATE_INIT]=-2, +}; + +char * runstate_name[RUNSTATE_MAX]={ + [RUNSTATE_RUNNING]= "running", + [RUNSTATE_RUNNABLE]="runnable", + [RUNSTATE_BLOCKED]= "blocked", /* to be blocked */ + [RUNSTATE_OFFLINE]= "offline", + [RUNSTATE_QUEUED]= "queued", + [RUNSTATE_INIT]= "init", + [RUNSTATE_LOST]= "lost", +}; + +enum { + RUNNABLE_STATE_INVALID, + RUNNABLE_STATE_WAKE, + RUNNABLE_STATE_PREEMPT, + RUNNABLE_STATE_OTHER, + RUNNABLE_STATE_MAX +}; + +char * runnable_state_name[RUNNABLE_STATE_MAX]={ + [RUNNABLE_STATE_INVALID]="invalid", /* Should never show up */ + [RUNNABLE_STATE_WAKE]="wake", + [RUNNABLE_STATE_PREEMPT]="preempt", + [RUNNABLE_STATE_OTHER]="other", +}; + +/* Memory data */ +enum { + MEM_PAGE_GRANT_MAP = 1, + MEM_PAGE_GRANT_UNMAP, + MEM_PAGE_GRANT_TRANSFER, + MEM_SET_P2M_ENTRY, + MEM_DECREASE_RESERVATION, + MEM_POD_POPULATE = 16, + MEM_POD_ZERO_RECLAIM, + MEM_POD_SUPERPAGE_SPLINTER, + MEM_MAX +}; + +char *mem_name[MEM_MAX] = { + [MEM_PAGE_GRANT_MAP] = "grant-map", + [MEM_PAGE_GRANT_UNMAP] = "grant-unmap", + [MEM_PAGE_GRANT_TRANSFER] = "grant-transfer", + [MEM_SET_P2M_ENTRY] = "set-p2m", + [MEM_DECREASE_RESERVATION] = "decrease-reservation", + [MEM_POD_POPULATE] = "pod-populate", + [MEM_POD_ZERO_RECLAIM] = "pod-zero-reclaim", + [MEM_POD_SUPERPAGE_SPLINTER] = "pod-superpage-splinter", +}; + +/* Per-unit information. */ + +struct cr3_value_struct { + struct cr3_value_struct * next; + struct cr3_value_struct * gnext; + unsigned long long gmfn; + int cr3_id; + unsigned long long first_time, last_time, run_time; + struct cycle_summary total_time, guest_time, hv_time; + int switch_count, flush_count; + + struct hvm_short_summary_struct hvm; + + struct { + int now; + int count; + } prealloc_unpin; + + struct { + unsigned callback:1; + unsigned flush_count, switch_count; + unsigned fixup_user, emulate_corr_user; + } destroy; +}; + +#ifndef MAX_CPUS +#define MAX_CPUS 256 +#endif +typedef uint32_t cpu_mask_t; + +#define IDLE_DOMAIN 32767 +#define DEFAULT_DOMAIN 32768 + +#define MAX_VLAPIC_LIST 8 +struct vlapic_struct { + struct { + struct outstanding_ipi { + tsc_t first_tsc; + int vec, count; + int injected, valid; + } list[MAX_VLAPIC_LIST]; + } outstanding; +}; + +struct vcpu_data { + int vid; + struct domain_data *d; /* up-pointer */ + unsigned activated:1; + + int guest_paging_levels; + + /* Schedule info */ + struct { + int state; + int runnable_state; /* Only valid when state==RUNSTATE_RUNNABLE */ + tsc_t tsc; + /* TSC skew detection/correction */ + struct last_oldstate_struct { + int wrong, actual, pid; + tsc_t tsc; + } last_oldstate; + /* Performance counters */ + unsigned long long p1_start, p2_start; + } runstate; + struct pcpu_info *p; + tsc_t pcpu_tsc; + + /* Hardware tracking */ + struct { + long long val; + tsc_t start_time; + struct cr3_value_struct *data; + } cr3; + + /* IPI latency tracking */ + struct vlapic_struct vlapic; + + /* Summary info */ + struct cycle_framework f; + struct cycle_summary runstates[RUNSTATE_MAX]; + struct cycle_summary runnable_states[RUNNABLE_STATE_MAX]; + struct weighted_cpi_summary cpi; + struct cycle_summary cpu_affinity_all, + cpu_affinity_pcpu[MAX_CPUS]; + enum { + VCPU_DATA_NONE=0, + VCPU_DATA_HVM, + VCPU_DATA_PV + } data_type; + union { + struct hvm_data hvm; + struct pv_data pv; + }; +}; + +enum { + DOMAIN_RUNSTATE_BLOCKED=0, + DOMAIN_RUNSTATE_PARTIAL_RUN, + DOMAIN_RUNSTATE_FULL_RUN, + DOMAIN_RUNSTATE_PARTIAL_CONTENTION, + DOMAIN_RUNSTATE_CONCURRENCY_HAZARD, + DOMAIN_RUNSTATE_FULL_CONTENTION, + DOMAIN_RUNSTATE_LOST, + DOMAIN_RUNSTATE_MAX +}; + +char * domain_runstate_name[] = { + [DOMAIN_RUNSTATE_BLOCKED]="blocked", + [DOMAIN_RUNSTATE_PARTIAL_RUN]="partial run", + [DOMAIN_RUNSTATE_FULL_RUN]="full run", + [DOMAIN_RUNSTATE_PARTIAL_CONTENTION]="partial contention", + [DOMAIN_RUNSTATE_CONCURRENCY_HAZARD]="concurrency_hazard", + [DOMAIN_RUNSTATE_FULL_CONTENTION]="full_contention", + [DOMAIN_RUNSTATE_LOST]="lost", +}; + +enum { + POD_RECLAIM_CONTEXT_UNKNOWN=0, + POD_RECLAIM_CONTEXT_FAULT, + POD_RECLAIM_CONTEXT_BALLOON, + POD_RECLAIM_CONTEXT_MAX +}; + +char * pod_reclaim_context_name[] = { + [POD_RECLAIM_CONTEXT_UNKNOWN]="unknown", + [POD_RECLAIM_CONTEXT_FAULT]="fault", + [POD_RECLAIM_CONTEXT_BALLOON]="balloon", +}; + +#define POD_ORDER_MAX 4 + +struct domain_data { + struct domain_data *next; + int did; + struct vcpu_data *vcpu[MAX_CPUS]; + + int max_vid; + + int runstate; + tsc_t runstate_tsc; + struct cycle_summary total_time; + struct cycle_summary runstates[DOMAIN_RUNSTATE_MAX]; + struct cr3_value_struct *cr3_value_head; + struct eip_list_struct *emulate_eip_list; + struct eip_list_struct *interrupt_eip_list; + + int guest_interrupt[GUEST_INTERRUPT_MAX+1]; + struct hvm_short_summary_struct hvm_short; + struct { + int done[MEM_MAX]; + int done_interval[MEM_MAX]; + + int done_for[MEM_MAX]; + int done_for_interval[MEM_MAX]; + } memops; + + struct { + int reclaim_order[POD_ORDER_MAX]; + int reclaim_context[POD_RECLAIM_CONTEXT_MAX]; + int reclaim_context_order[POD_RECLAIM_CONTEXT_MAX][POD_ORDER_MAX]; + /* FIXME: Do a full cycle summary */ + int populate_order[POD_ORDER_MAX]; + } pod; +}; + +struct domain_data * domain_list=NULL; + +struct domain_data default_domain; + +enum { + TOPLEVEL_GEN=0, + TOPLEVEL_SCHED, + TOPLEVEL_DOM0OP, + TOPLEVEL_HVM, + TOPLEVEL_MEM, + TOPLEVEL_PV, + TOPLEVEL_SHADOW, + TOPLEVEL_HW, + TOPLEVEL_MAX=TOPLEVEL_HW+1, +}; + +char * toplevel_name[TOPLEVEL_MAX] = { + [TOPLEVEL_GEN]="gen", + [TOPLEVEL_SCHED]="sched", + [TOPLEVEL_DOM0OP]="dom0op", + [TOPLEVEL_HVM]="hvm", + [TOPLEVEL_MEM]="mem", + [TOPLEVEL_PV]="pv", + [TOPLEVEL_SHADOW]="shadow", + [TOPLEVEL_HW]="hw", +}; + +struct trace_volume { + unsigned long long toplevel[TOPLEVEL_MAX]; + unsigned long long sched_verbose; + unsigned long long hvm[HVM_VOL_MAX]; +} volume; + +#define UPDATE_VOLUME(_p,_x,_s) \ + do { \ + (_p)->volume.total._x += _s; \ + (_p)->volume.last_buffer._x += _s; \ + } while(0) + +void volume_clear(struct trace_volume *vol) +{ + bzero(vol, sizeof(*vol)); +} + +void volume_summary(struct trace_volume *vol) +{ + int j, k; + for(j=0; jtoplevel[j]) { + printf(" %-6s: %10lld\n", + toplevel_name[j], vol->toplevel[j]); + switch(j) { + case TOPLEVEL_SCHED: + if(vol->sched_verbose) + printf(" +-verbose: %10lld\n", + vol->sched_verbose); + break; + case TOPLEVEL_HVM: + for(k=0; khvm[k]) + printf(" +-%-7s: %10lld\n", + hvm_vol_name[k], vol->hvm[k]); + } + + break; + } + } +} + +struct pcpu_info { + /* Information about this pcpu */ + unsigned active:1, summary:1; + int pid; + + /* Information related to scanning thru the file */ + tsc_t first_tsc, last_tsc, order_tsc; + loff_t file_offset; + loff_t next_cpu_change_offset; + struct record_info ri; + int last_cpu_change_pid; + int power_state; + + /* Information related to tsc skew detection / correction */ + struct { + tsc_t offset; + cpu_mask_t downstream; /* To detect cycles in dependencies */ + } tsc_skew; + + /* Information related to domain tracking */ + struct vcpu_data * current; + struct { + unsigned active:1, + domain_valid:1, + seen_valid_schedule:1; /* Seen an actual schedule since lost records */ + unsigned did:16,vid:16; + tsc_t tsc; + } lost_record; + + /* Record volume */ + struct { + tsc_t buffer_first_tsc, + buffer_dom0_runstate_tsc, + buffer_dom0_runstate_cycles[RUNSTATE_MAX]; + int buffer_dom0_runstate; + unsigned buffer_size; + struct trace_volume total, last_buffer; + } volume; + + /* Time report */ + struct { + tsc_t tsc; + struct cycle_summary idle, running, lost; + } time; +}; + +void __fill_in_record_info(struct pcpu_info *p); + +#define INTERVAL_DOMAIN_GUEST_INTERRUPT_MAX 10 + +struct { + int max_active_pcpu; + loff_t last_epoch_offset; + int early_eof; + int lost_cpus; + tsc_t now; + struct cycle_framework f; + tsc_t buffer_trace_virq_tsc; + struct pcpu_info pcpu[MAX_CPUS]; + + struct { + int id; + /* Invariant: head null => tail null; head !null => tail valid */ + struct cr3_value_struct *head, **tail; + } cr3; + + struct { + tsc_t start_tsc; + /* Information about specific interval output types */ + union { + struct { + struct interval_element ** values; + int count; + } array; + struct { + struct interval_list *head, **tail; + } list; + struct cr3_value_struct *cr3; + struct { + struct domain_data *d; + int guest_vector[INTERVAL_DOMAIN_GUEST_INTERRUPT_MAX]; + } domain; + }; + } interval; +} P = { 0 }; + +/* Function prototypes */ +char * pcpu_string(int pcpu); +void pcpu_string_draw(struct pcpu_info *p); +void process_generic(struct record_info *ri); +void dump_generic(FILE *f, struct record_info *ri); +ssize_t __read_record(struct trace_record *rec, loff_t offset); +void error(enum error_level l, struct record_info *ri); +void update_io_address(struct io_address ** list, unsigned int pa, int dir, + tsc_t arc_cycles, unsigned int va); +int check_extra_words(struct record_info *ri, int expected_size, const char *record); +int vcpu_set_data_type(struct vcpu_data *v, int type); + +void cpumask_init(cpu_mask_t *c) { + *c = 0UL; +} + +void cpumask_clear(cpu_mask_t *c, int cpu) { + *c &= ~(1UL << cpu); +} + +void cpumask_set(cpu_mask_t *c, int cpu) { + *c |= (1UL << cpu); +} + +int cpumask_isset(const cpu_mask_t *c, int cpu) { + if(*c & (1UL<time = ((c - P.f.first_tsc) << 10) / opt.cpu_qhz; + t->s = t->time / 1000000000; + t->ns = t->time - (t->s * 1000000000); +} + +void abs_cycles_to_time(unsigned long long ac, struct time_struct *t) { + if(ac > P.f.first_tsc) { + /* t->time = ((ac - P.f.first_tsc) * 1000) / (opt.cpu_hz / 1000000 ); */ + /* t->s = t->time / 1000000000; */ + /* t->ns = t->time % 1000000000; */ + t->time = ((ac - P.f.first_tsc) << 10) / opt.cpu_qhz; + t->s = t->time / 1000000000; + t->ns = t->time - (t->s * 1000000000); + } else { + t->time = t->s = t->ns = 0; + } +} + +tsc_t abs_cycles_to_global(unsigned long long ac) { + if(ac > P.f.first_tsc) + return ac - P.f.first_tsc; + else + return 0; +} + +void scatterplot_vs_time(tsc_t atsc, long long y) { + struct time_struct t; + + abs_cycles_to_time(atsc, &t); + + printf("%u.%09u %lld\n", t.s, t.ns, y); +} + +/* -- Summary Code -- */ + +/* With compliments to "Numerical Recipes in C", which provided the algorithm + * and basic template for this function. */ +long long percentile(long long * A, int N, int ple) { + int I, J, L, R, K; + + long long X, W; + + /* No samples! */ + if ( N == 0 ) + return 0; + + /* Find K, the element # we want */ + K=N*ple/100; + + /* Set the left and right boundaries of the current search space */ + L=0; R=N-1; + + while(L < R) { + /* X: The value to order everything higher / lower than */ + X=A[K]; + + /* Starting at the left and the right... */ + I=L; + J=R; + + do { + /* Find the first element on the left that is out-of-order w/ X */ + while(A[I]> 1; + /* X: The value to order everything higher / lower than */ + X=A[K]; + + /* Starting at the left and the right... */ + I=L; I_weight = L_weight; + J=R; J_weight = R_weight; + + do { + /* Find the first element on the left that is out-of-order w/ X */ + while(A[I]> 1; + /* X: The value to order everything higher / lower than */ + X=A[K]; + + /* Starting at the left and the right... */ + I=L; I_weight = L_weight; + J=R; J_weight = R_weight; + + do { + /* Find the first element on the left that is out-of-order w/ X */ + while(A[I]cycles, f->total_cycles); +} + +static inline double summary_percent_global(struct event_cycle_summary *s) { + return __summary_percent(s, &P.f); +} + +static inline void update_summary(struct event_cycle_summary *s, long long c) { +/* We don't know ahead of time how many samples there are, and working + * with dynamic stuff is a pain, and unnecessary. This algorithm will + * generate a sample set that approximates an even sample. We can + * then take the percentiles on this, and get an approximate value. */ + if(c) { + if(opt.sample_size) { + int lap = (s->cycles_count/opt.sample_size)+1, + index =s->cycles_count % opt.sample_size; + if((index - (lap/3))%lap == 0) { + if(!s->cycles_sample) { + s->cycles_sample = malloc(sizeof(*s->cycles_sample) * opt.sample_size); + if(!s->cycles_sample) { + fprintf(stderr, "%s: malloc failed!\n", __func__); + error(ERR_SYSTEM, NULL); + } + } + s->cycles_sample[index]=c; + } + } + s->cycles_count++; + s->cycles += c; + + s->interval.count++; + s->interval.cycles += c; + } + s->count++; +} + +static inline void clear_interval_summary(struct event_cycle_summary *s) { + s->interval.count = 0; + s->interval.cycles = 0; +} + +static inline void update_cycles(struct cycle_summary *s, long long c) { +/* We don't know ahead of time how many samples there are, and working + * with dynamic stuff is a pain, and unnecessary. This algorithm will + * generate a sample set that approximates an even sample. We can + * then take the percentiles on this, and get an approximate value. */ + int lap, index; + + if ( c == 0 ) + { + fprintf(warn, "%s: cycles 0! Not updating...\n", + __func__); + return; + } + + if ( opt.sample_size ) { + lap = (s->count/opt.sample_size)+1; + index =s->count % opt.sample_size; + + if((index - (lap/3))%lap == 0) { + if(!s->sample) { + s->sample = malloc(sizeof(*s->sample) * opt.sample_size); + if(!s->sample) { + fprintf(stderr, "%s: malloc failed!\n", __func__); + error(ERR_SYSTEM, NULL); + } + } + s->sample[index] = c; + } + } + + if(c > 0) { + s->cycles += c; + s->interval.cycles += c; + } else { + s->cycles += -c; + s->interval.cycles += -c; + } + s->count++; + s->interval.count++; +} + +static inline void clear_interval_cycles(struct interval_element *e) { + e->cycles = 0; + e->count = 0; + e->instructions = 0; +} + +static inline void update_cpi(struct weighted_cpi_summary *s, + unsigned long long i, + unsigned long long c) { +/* We don't know ahead of time how many samples there are, and working + * with dynamic stuff is a pain, and unnecessary. This algorithm will + * generate a sample set that approximates an even sample. We can + * then take the percentiles on this, and get an approximate value. */ + int lap, index; + + if ( opt.sample_size ) { + lap = (s->count/opt.sample_size)+1; + index =s->count % opt.sample_size; + + if((index - (lap/3))%lap == 0) { + if(!s->cpi) { + assert(!s->cpi_weight); + + s->cpi = malloc(sizeof(*s->cpi) * opt.sample_size); + s->cpi_weight = malloc(sizeof(*s->cpi_weight) * opt.sample_size); + if(!s->cpi || !s->cpi_weight) { + fprintf(stderr, "%s: malloc failed!\n", __func__); + error(ERR_SYSTEM, NULL); + } + } + assert(s->cpi_weight); + + s->cpi[index] = (float) c / i; + s->cpi_weight[index]=c; + } + } + + s->instructions += i; + s->cycles += c; + s->count++; + + s->interval.instructions += i; + s->interval.cycles += c; + s->interval.count++; +} + +static inline void clear_interval_cpi(struct weighted_cpi_summary *s) { + s->interval.cycles = 0; + s->interval.count = 0; + s->interval.instructions = 0; +} + +static inline void print_cpu_affinity(struct cycle_summary *s, char *p) { + if(s->count) { + long long avg; + + avg = s->cycles / s->count; + + if ( opt.sample_size ) { + long long p5, p50, p95; + int data_size = s->count; + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = percentile(s->sample, data_size, 50); + p5 = percentile(s->sample, data_size, 5); + p95 = percentile(s->sample, data_size, 95); + + printf("%s: %7d %6lld {%6lld|%6lld|%6lld}\n", + p, s->count, avg, p5, p50, p95); + } else { + printf("%s: %7d %6lld\n", + p, s->count, avg); + } + } +} + +static inline void print_cpi_summary(struct weighted_cpi_summary *s) { + if(s->count) { + float avg; + + avg = (float)s->cycles / s->instructions; + + if ( opt.sample_size ) { + float p5, p50, p95; + int data_size = s->count; + + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = weighted_percentile(s->cpi, s->cpi_weight, data_size, 50); + p5 = weighted_percentile(s->cpi, s->cpi_weight, data_size, 5); + p95 = weighted_percentile(s->cpi, s->cpi_weight, data_size, 95); + + printf(" CPI summary: %2.2f {%2.2f|%2.2f|%2.2f}\n", + avg, p5, p50, p95); + } else { + printf(" CPI summary: %2.2f\n", avg); + } + } +} + +static inline void print_cycle_percent_summary(struct cycle_summary *s, + tsc_t total, char *p) { + if(s->count) { + long long avg; + double percent, seconds; + + avg = s->cycles / s->count; + + seconds = ((double)s->cycles) / opt.cpu_hz; + + percent = ((double)(s->cycles * 100)) / total; + + if ( opt.sample_size ) { + long long p5, p50, p95; + int data_size = s->count; + + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = self_weighted_percentile(s->sample, data_size, 50); + p5 = self_weighted_percentile(s->sample, data_size, 5); + p95 = self_weighted_percentile(s->sample, data_size, 95); + + printf("%s: %7d %5.2lfs %5.2lf%% %6lld {%6lld|%6lld|%6lld}\n", + p, s->count, + seconds, + percent, + avg, p5, p50, p95); + } else { + printf("%s: %7d %5.2lfs %5.2lf%% %6lld\n", + p, s->count, + seconds, + percent, + avg); + } + } +} + +static inline void print_cycle_summary(struct cycle_summary *s, char *p) { + if(s->count) { + long long avg; + + avg = s->cycles / s->count; + + if ( opt.sample_size ) { + long long p5, p50, p95; + int data_size = s->count; + + if(data_size > opt.sample_size) + data_size = opt.sample_size; + + p50 = self_weighted_percentile(s->sample, data_size, 50); + p5 = self_weighted_percentile(s->sample, data_size, 5); + p95 = self_weighted_percentile(s->sample, data_size, 95); + + printf("%s: %7d %5.2lfs %6lld {%6lld|%6lld|%6lld}\n", + p, s->count, ((double)s->cycles)/opt.cpu_hz, + avg, p5, p50, p95); + } else { + printf("%s: %7d %5.2lfs %6lld\n", + p, s->count, ((double)s->cycles)/opt.cpu_hz, avg); + } + } +} + +#define PRINT_SUMMARY(_s, _p...) \ + do { \ + if((_s).count) { \ + if ( opt.sample_size ) { \ + unsigned long long p5, p50, p95; \ + int data_size=(_s).cycles_count; \ + if(data_size > opt.sample_size) \ + data_size=opt.sample_size; \ + p50=percentile((_s).cycles_sample, data_size, 50); \ + p5=percentile((_s).cycles_sample, data_size, 5); \ + p95=percentile((_s).cycles_sample, data_size, 95); \ + printf(_p); \ + printf(" %7d %5.2lfs %5.2lf%% %5lld cyc {%5lld|%5lld|%5lld}\n", \ + (_s).count, \ + ((double)(_s).cycles)/opt.cpu_hz, \ + summary_percent_global(&(_s)), \ + (_s).cycles_count ? (_s).cycles / (_s).cycles_count:0, \ + p5, p50, p95); \ + } else { \ + printf(_p); \ + printf(" %7d %5.2lfs %5.2lf%% %5lld cyc\n", \ + (_s).count, \ + ((double)(_s).cycles)/opt.cpu_hz, \ + summary_percent_global(&(_s)), \ + (_s).cycles_count ? (_s).cycles / (_s).cycles_count:0); \ + } \ + } \ + } while(0) + +#define INTERVAL_DESC_MAX 31 +struct interval_list { + struct interval_element *elem; + struct interval_list *next; + char desc[INTERVAL_DESC_MAX+1]; /* +1 for the null terminator */ +}; + +void __interval_cycle_percent_output(struct interval_element *e, tsc_t cycles) { + printf(" %.02lf", + __cycles_percent(e->cycles, cycles)); + clear_interval_cycles(e); +} + +void interval_cycle_percent_output(struct interval_element *e) { + __interval_cycle_percent_output(e, opt.interval.cycles); +} + +void interval_time_output(void) { + struct time_struct t; + abs_cycles_to_time(P.interval.start_tsc, &t); + + printf("%u.%09u", t.s, t.ns); +} + +void interval_table_output(void) { + int i; + + interval_time_output(); + + if(opt.interval.mode == INTERVAL_MODE_ARRAY) { + for(i=0; inext) + interval_cycle_percent_output(p->elem); + } + printf("\n"); +} + +void interval_table_tail(void) { + struct interval_list *p; + + printf("time"); + + for(p=P.interval.list.head; p; p = p->next) + printf(" %s", p->desc); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:25:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I25-0005ib-IJ; Wed, 17 Jun 2015 18:25:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I23-0005iI-R5 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:51 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id FD/A8-13047-FABB1855; Wed, 17 Jun 2015 18:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565549!24309603!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31550 invoked from network); 17 Jun 2015 18:25:50 -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; 17 Jun 2015 18:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I21-0002Fd-BJ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I21-00071i-8p for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:49 +0000 Date: Wed, 17 Jun 2015 18:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: print newline after unknown hvm 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 7d915be030bda89b2c5027cd008df0a061844bd2 Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:39 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:22 2015 +0100 xenalyze: print newline after unknown hvm events Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index a0a3ac1..8b5e1dc 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -5435,7 +5435,7 @@ void hvm_process(struct pcpu_info *p) hvm_vmentry_process(ri, &p->current->hvm); break; default: - fprintf(warn, "Unknown hvm event: %x", ri->event); + fprintf(warn, "Unknown hvm event: %x\n", ri->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 Wed Jun 17 18:25:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:25: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 1Z5I25-0005ib-IJ; Wed, 17 Jun 2015 18:25:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I23-0005iI-R5 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:51 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id FD/A8-13047-FABB1855; Wed, 17 Jun 2015 18:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565549!24309603!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31550 invoked from network); 17 Jun 2015 18:25:50 -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; 17 Jun 2015 18:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I21-0002Fd-BJ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I21-00071i-8p for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:49 +0000 Date: Wed, 17 Jun 2015 18:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: print newline after unknown hvm 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 7d915be030bda89b2c5027cd008df0a061844bd2 Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:39 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:22 2015 +0100 xenalyze: print newline after unknown hvm events Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index a0a3ac1..8b5e1dc 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -5435,7 +5435,7 @@ void hvm_process(struct pcpu_info *p) hvm_vmentry_process(ri, &p->current->hvm); break; default: - fprintf(warn, "Unknown hvm event: %x", ri->event); + fprintf(warn, "Unknown hvm event: %x\n", ri->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 Wed Jun 17 18:26:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2E-0005kY-Ks; Wed, 17 Jun 2015 18:26:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2D-0005kK-W3 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:02 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 57/BB-21300-9BBB1855; Wed, 17 Jun 2015 18:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434565559!24309197!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2118 invoked from network); 17 Jun 2015 18:26:00 -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; 17 Jun 2015 18:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2B-0002Fs-Gg for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2B-000724-Fk for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:59 +0000 Date: Wed, 17 Jun 2015 18:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: include odd mmio states in default output X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7771b46244d5929e9c6fba3ffb10c927a0b43b8d Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:40 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:23 2015 +0100 xenalyze: include odd mmio states in default output Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 8b5e1dc..fef8aea 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -3740,7 +3740,7 @@ void hvm_mmio_assist_postprocess(struct hvm_data *h) static int warned = 0; if (!warned) { - fprintf(stderr, "%s: Strange, MMIO with unexpected exit reason %d\n", + fprintf(warn, "%s: Strange, MMIO with unexpected exit reason %d\n", __func__, h->exit_reason); warned=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 Wed Jun 17 18:26:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2E-0005kY-Ks; Wed, 17 Jun 2015 18:26:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2D-0005kK-W3 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:02 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 57/BB-21300-9BBB1855; Wed, 17 Jun 2015 18:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434565559!24309197!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2118 invoked from network); 17 Jun 2015 18:26:00 -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; 17 Jun 2015 18:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2B-0002Fs-Gg for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2B-000724-Fk for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:25:59 +0000 Date: Wed, 17 Jun 2015 18:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: include odd mmio states in default output X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7771b46244d5929e9c6fba3ffb10c927a0b43b8d Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:40 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:23 2015 +0100 xenalyze: include odd mmio states in default output Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 8b5e1dc..fef8aea 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -3740,7 +3740,7 @@ void hvm_mmio_assist_postprocess(struct hvm_data *h) static int warned = 0; if (!warned) { - fprintf(stderr, "%s: Strange, MMIO with unexpected exit reason %d\n", + fprintf(warn, "%s: Strange, MMIO with unexpected exit reason %d\n", __func__, h->exit_reason); warned=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 Wed Jun 17 18:26:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2O-0005mw-NJ; Wed, 17 Jun 2015 18:26:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2O-0005mj-21 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:12 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 61/00-03895-3CBB1855; Wed, 17 Jun 2015 18:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1434565569!17191873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16946 invoked from network); 17 Jun 2015 18:26: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; 17 Jun 2015 18:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2L-0002GT-MQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2L-00073X-L7 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:09 +0000 Date: Wed, 17 Jun 2015 18:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: handle TRC_TRACE_WRAP_BUFFER X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcb3bcf49d8c53da7eb05abaddd79523cf6a878f Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:41 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:24 2015 +0100 xenalyze: handle TRC_TRACE_WRAP_BUFFER Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index fef8aea..15c51d9 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -8469,6 +8469,8 @@ void base_process(struct pcpu_info *p) { struct record_info *ri = &p->ri; switch(ri->event) { + case TRC_TRACE_WRAP_BUFFER: + break; case TRC_LOST_RECORDS: process_lost_records(p); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:26:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2O-0005mw-NJ; Wed, 17 Jun 2015 18:26:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2O-0005mj-21 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:12 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 61/00-03895-3CBB1855; Wed, 17 Jun 2015 18:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1434565569!17191873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16946 invoked from network); 17 Jun 2015 18:26: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; 17 Jun 2015 18:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2L-0002GT-MQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2L-00073X-L7 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:09 +0000 Date: Wed, 17 Jun 2015 18:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: handle TRC_TRACE_WRAP_BUFFER X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcb3bcf49d8c53da7eb05abaddd79523cf6a878f Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:41 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:24 2015 +0100 xenalyze: handle TRC_TRACE_WRAP_BUFFER Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index fef8aea..15c51d9 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -8469,6 +8469,8 @@ void base_process(struct pcpu_info *p) { struct record_info *ri = &p->ri; switch(ri->event) { + case TRC_TRACE_WRAP_BUFFER: + break; case TRC_LOST_RECORDS: process_lost_records(p); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:26:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I2b-0005qE-QT; Wed, 17 Jun 2015 18:26:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2a-0005pv-FI for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:24 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 33/0D-32406-FCBB1855; Wed, 17 Jun 2015 18:26:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1434565580!17242075!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4300 invoked from network); 17 Jun 2015 18:26:21 -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; 17 Jun 2015 18:26:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2V-0002Gb-WA for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2V-00073u-QE for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:19 +0000 Date: Wed, 17 Jun 2015 18:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: remove trailing whitespaces X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3f2794eec467a5429b44efa24058f850c075463 Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:43 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:24 2015 +0100 xenalyze: remove trailing whitespaces Result of "sed -i 's@[[:blank:]]\+$@@' tools/xentrace/xenalyze.c" Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 350 ++++++++++++++++++++++---------------------- 1 files changed, 175 insertions(+), 175 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 15c51d9..70f0db0 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -2,7 +2,7 @@ * xenalyze.c: Analyzing xentrace output * * Written by George Dunlap. - * + * * Copyright (c) 2006-2007, XenSource Inc. * Copyright (c) 2007-2008, Citrix Systems R&D Ltd, UK * @@ -61,7 +61,7 @@ struct array_struct { fprintf(warn, ##_x); \ } \ } while(0) \ - + /* -- Global variables -- */ struct { int fd; @@ -87,7 +87,7 @@ struct { .progress = { .update_offset = 0 }, }; -/* +/* Kinds of errors: Unexpected values - RIP with information in high bits (not all 0 or 1) @@ -115,7 +115,7 @@ struct { - domain runstates - runstate / tsc skew - vcpu_{prev,next}_update p->current{==,!=}null - - vcpu start conditions + - vcpu start conditions - lost_cpu count higher than # of seen cpus / < 0 - lost cpu has non-null p->current Symbol file @@ -146,7 +146,7 @@ enum error_level { int verbosity = 5; struct { - unsigned + unsigned scatterplot_interrupt_eip:1, scatterplot_cpi:1, scatterplot_unpin_promote:1, @@ -225,7 +225,7 @@ struct { } opt = { .scatterplot_interrupt_eip=0, .scatterplot_cpi=0, - .scatterplot_unpin_promote=0, + .scatterplot_unpin_promote=0, .scatterplot_cr3_switch=0, .scatterplot_wake_to_halt=0, .scatterplot_vmexit_eip=0, @@ -355,7 +355,7 @@ void parse_symbol_file(char *fn) { error(ERR_ASSERT, NULL); } else last_addr = (*p)->symbols[(*p)->count].addr; - + (*p)->count++; /* If this struct is full, point to the next. It will be allocated @@ -418,7 +418,7 @@ struct { void (*dump)(struct eip_list_struct *); } eip_list_type[EIP_LIST_TYPE_MAX] = { [EIP_LIST_TYPE_NONE] = { - .update=NULL, + .update=NULL, .new=NULL, .dump=NULL }, }; @@ -427,7 +427,7 @@ struct { /* --- HVM class of events --- */ /* - * -- Algorithms -- + * -- Algorithms -- * * Interrupt Wake-to-halt detection * @@ -450,7 +450,7 @@ struct { * * The "waking" interrupts we want to sub-classify into * "wake-only" (when interrupt was the only interrupt from wake to halt) and - * "wake-all" (whether this was the only interrupt or not). + * "wake-all" (whether this was the only interrupt or not). */ /* VMX data */ @@ -968,7 +968,7 @@ char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] = { "pf_inject", "inj_exc", "inj_virq", - "reinj_virq", + "reinj_virq", "io_read", "io_write", "cr_read", /* 8 */ @@ -1469,7 +1469,7 @@ void init_hvm_data(struct hvm_data *h, struct vcpu_data *v) { size); error(ERR_SYSTEM, NULL); } - + } for(i=0; isummary.guest_interrupt[i].count=0; @@ -1757,7 +1757,7 @@ struct domain_data { struct cr3_value_struct *cr3_value_head; struct eip_list_struct *emulate_eip_list; struct eip_list_struct *interrupt_eip_list; - + int guest_interrupt[GUEST_INTERRUPT_MAX+1]; struct hvm_short_summary_struct hvm_short; struct { @@ -1840,7 +1840,7 @@ void volume_summary(struct trace_volume *vol) printf(" +-%-7s: %10lld\n", hvm_vol_name[k], vol->hvm[k]); } - + break; } } @@ -2049,7 +2049,7 @@ long long percentile(long long * A, int N, int ple) { I++; J--; } } while (I <= J); /* Keep going until our pointers meet or pass */ - + /* Re-adjust L and R, based on which element we're looking for */ if(Jcount) { long long avg; - + avg = s->cycles / s->count; if ( opt.sample_size ) { @@ -2441,7 +2441,7 @@ static inline void print_cycle_percent_summary(struct cycle_summary *s, avg, p5, p50, p95); } else { printf("%s: %7d %5.2lfs %5.2lf%% %6lld\n", - p, s->count, + p, s->count, seconds, percent, avg); @@ -2454,7 +2454,7 @@ static inline void print_cycle_summary(struct cycle_summary *s, char *p) { long long avg; avg = s->cycles / s->count; - + if ( opt.sample_size ) { long long p5, p50, p95; int data_size = s->count; @@ -2578,9 +2578,9 @@ void interval_list_add(struct interval_element *e, char *desc) { struct interval_list *p; fprintf(warn, "%s: Adding element '%s'\n", __func__, desc); - + if((p=malloc(sizeof(*p)))==NULL) { - fprintf(stderr, "malloc() failed.\n"); + fprintf(stderr, "malloc() failed.\n"); error(ERR_SYSTEM, NULL); } @@ -2627,7 +2627,7 @@ void interval_cr3_value_check(struct cr3_value_struct *cr3) { __func__, cr3->gmfn); P.interval.array.values[i] = &cr3->total_time.interval; - } + } } } else if(opt.interval.mode == INTERVAL_MODE_LIST) { char desc[32]; @@ -2713,14 +2713,14 @@ void interval_cr3_short_summary_output(void) { struct cr3_value_struct *p = P.interval.cr3; interval_time_output(); - + hss_array = p->hvm.s; printf(" %.02lf", __cycles_percent(p->total_time.interval.cycles, opt.interval.cycles)); - for(i=0; itotal_time.interval.cycles); @@ -2743,7 +2743,7 @@ void interval_domain_value_check(struct domain_data *d) { } P.interval.array.values[i] = &d->total_time.interval; - } + } } } else if(opt.interval.mode == INTERVAL_MODE_LIST) { char desc[32]; @@ -2776,7 +2776,7 @@ void interval_domain_short_summary_output(void) { interval_cycle_percent_output(&d->total_time.interval); - for(i=0; ihvm_short.s[i].interval); printf("\n"); @@ -2841,7 +2841,7 @@ void interval_domain_guest_interrupt_output(void) { printf("\n"); } - + } void interval_domain_grant_maps_output(void) { @@ -2860,7 +2860,7 @@ void interval_domain_grant_maps_output(void) { printf("\n"); } } - + /* General interval gateways */ void interval_callback(void) { @@ -2928,11 +2928,11 @@ void interval_tail(void) { void update_eip(struct eip_list_struct **head, unsigned long long eip, unsigned long long cycles, int type, void * extra) { struct eip_list_struct *p, **last=head; - + for(p=*head; p; last = (&p->next), p=p->next) if(p->eip >= eip) break; - + if(!p || p->eip != eip) { p=malloc(sizeof(*p)); if(!p) { @@ -3008,7 +3008,7 @@ void dump_eip(struct eip_list_struct *head) { #endif printf(" Total samples: %d\n", total); - + for(i=0; isummary.cycles ) @@ -3025,7 +3025,7 @@ void dump_eip(struct eip_list_struct *head) { ((double)p->summary.count*100)/total); } - + if(eip_list_type[p->type].dump) { eip_list_type[p->type].dump(p); } @@ -3052,7 +3052,7 @@ struct hvm_pf_xen_record { void hvm_update_short_summary(struct hvm_data *h, int element) { struct vcpu_data *v = h->v; - if(v->cr3.data) + if(v->cr3.data) update_cycles(&v->cr3.data->hvm.s[element], h->arc_cycles); update_cycles(&v->d->hvm_short.s[element], h->arc_cycles); @@ -3250,7 +3250,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) e->corresponding_va = CORR_VA_INVALID; e->pt_level = 0; - + /* Detect accesses to Windows linear pagetables */ switch(guest_paging_levels) { @@ -3269,7 +3269,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) | e->pt_index[1]<<22 | e->pt_index[0]<<12; } - } + } break; case 3: if(e->pt_index[3]==3 && (e->pt_index[2]>>2==0)) @@ -3298,7 +3298,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) | e->pt_index[1]<<21 | e->pt_index[2]<<30; } - } + } break; case 4: if(e->pt_index[4] == 0x1ed) @@ -3322,7 +3322,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) } } else - { + { e->pt_level = 2; e->corresponding_va = ((1ULL<<21)-1) | (unsigned long long)e->pt_index[0]<<21 @@ -3339,7 +3339,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) | (unsigned long long)e->pt_index[2]<<30 | (unsigned long long)e->pt_index[3]<<39; } - + if(HIGH_BIT(e->corresponding_va)) e->corresponding_va |= SIGN_EXTENDED_BITS; } @@ -3453,7 +3453,7 @@ void hvm_pf_xen_process(struct record_info *ri, struct hvm_data *h) { h->v->guest_paging_levels); hvm_pf_xen_preprocess(ri->event, h); - + if(opt.dump_all) { if(e->pf_case == PF_XEN_EMULATE) @@ -3482,7 +3482,7 @@ char * hvm_vlapic_icr_dest_shorthand_name[4] = { void hvm_vlapic_vmentry_cleanup(struct vcpu_data *v, tsc_t tsc) { int i; - + struct vlapic_struct *vla = &v->vlapic; for(i=0; ifirst_tsc) + if(!o->first_tsc) o->first_tsc = P.now; if(opt.dump_all && o->count == 0 && o->injected) @@ -3602,7 +3602,7 @@ void hvm_vlapic_icr_handler(struct hvm_data *h) if((opt.dump_all) #if 0 && (ov->runstate.state != RUNSTATE_RUNNING - || ov->hvm.vmexit_valid) + || ov->hvm.vmexit_valid) #endif ) printf(" [vla] d%dv%d vec %d state %s (outstanding ipis %d)\n", @@ -3828,7 +3828,7 @@ void hvm_inj_virq_process(struct record_info *ri, struct hvm_data *h) { ri->dump_header, r->vector, r->fake?"fake":"real"); } - + if(opt.summary_info) { int vector = r->vector; @@ -3867,7 +3867,7 @@ void hvm_inj_virq_process(struct record_info *ri, struct hvm_data *h) { h->w2h.vector = vector; h->summary.guest_interrupt[vector].is_wake = 1; } - + if( h->summary.guest_interrupt[vector].start_tsc == 0 ) { /* Note that we want start_tsc set at the next vmentry */ h->summary.guest_interrupt[vector].start_tsc = 1; @@ -3897,19 +3897,19 @@ void update_io_address(struct io_address ** list, unsigned int pa, int dir, /* Keep list in order */ for(p=*list; p && (p->pa != pa) && (p->pa < pa); q=p, p=p->next); - + /* If we didn't find it, make a new element. */ if(!p || (p->pa != pa)) { if((p=malloc(sizeof(*p)))==NULL) { fprintf(stderr, "malloc() failed.\n"); error(ERR_SYSTEM, NULL); } - + bzero(p, sizeof(*p)); p->pa=pa; p->va=va; - + /* If we stopped in the middle or at the end, add it in */ if(q) { p->next=q->next; @@ -4028,7 +4028,7 @@ void cr3_switch(unsigned long long val, struct hvm_data *h) { if(gmfn) { struct cr3_value_struct *p, **last=&v->d->cr3_value_head; - + /* Always add to tail, so that we get consistent interval ouptut as the number of cr3s grow */ for(p=*last; p; last = (&p->next), p=p->next) @@ -4056,7 +4056,7 @@ void cr3_switch(unsigned long long val, struct hvm_data *h) { else P.cr3.head = p; P.cr3.tail = &p->gnext; - + P.cr3.id++; /* Add to the interval list if appropriate */ @@ -4098,20 +4098,20 @@ void cr3_prealloc_unpin(struct vcpu_data *v, unsigned long long gmfn) { struct cr3_value_struct *cr3; /* Look for it in the list */ - for(cr3 = v->d->cr3_value_head; cr3; cr3=cr3->next) + for(cr3 = v->d->cr3_value_head; cr3; cr3=cr3->next) if(cr3->gmfn == gmfn) break; if(!cr3) return; - if(cr3->prealloc_unpin.now) + if(cr3->prealloc_unpin.now) fprintf(warn, "Strange, gmfn %llx multiple unpins w/o access!\n", gmfn); cr3->prealloc_unpin.now = 1; cr3->prealloc_unpin.count++; - + if(opt.dump_all) printf(" cr3 %llx unpinned %d times\n", gmfn, cr3->prealloc_unpin.count); @@ -4189,7 +4189,7 @@ void cr3_dump_list(struct cr3_value_struct *head){ abs_cycles_to_time(p->first_time, &first); abs_cycles_to_time(p->last_time, &last); - + snprintf(desc, 30, " %8llx (id %d)", p->gmfn, p->cr3_id); print_cycle_summary(&p->total_time, desc); snprintf(desc, 30, " guest"); @@ -4242,7 +4242,7 @@ void hvm_cr_write_postprocess(struct hvm_data *h) int flush=0; if(v->cr3.val) { - oval = v->cr3.val; + oval = v->cr3.val; if(new_val == oval) { if(v->cr3.data) { @@ -4291,7 +4291,7 @@ void hvm_cr_write_postprocess(struct hvm_data *h) #define case_cr(_x) \ case (_x): \ hvm_set_summary_handler(h, hvm_cr_write_summary, (void *)(_x)); \ - break + break case_cr(0); case_cr(1); case_cr(2); @@ -4350,13 +4350,13 @@ void hvm_cr_write_process(struct record_info *ri, struct hvm_data *h) { if(cr == 3 && h->v->cr3.val) { printf("]%s cr_write cr3 val %llx oval %llx %s\n", - ri->dump_header, + ri->dump_header, val, h->v->cr3.val, (h->v->cr3.val == val)?"flush":"switch"); } else { printf(" %s cr_write cr%d val %llx\n", - ri->dump_header, + ri->dump_header, cr, val); } @@ -4510,7 +4510,7 @@ void hvm_inj_exc_process(struct record_info *ri, struct hvm_data *h) ri->t.s, ri->t.ns, pcpu_string(ri->cpu), r->vec, r->ec); } - + } void hvm_intr_summary(struct hvm_data *h, void *d) @@ -4577,9 +4577,9 @@ void hvm_intr_process(struct record_info *ri, struct hvm_data *h) /* Want absolute tsc to global tsc */ abs_cycles_to_time(h->exit_tsc, &t); - printf("d%dv%d %u.%09u %lld\n", + printf("d%dv%d %u.%09u %lld\n", h->v->d->did, h->v->vid, - t.s, t.ns, + t.s, t.ns, rip); } @@ -4589,7 +4589,7 @@ void hvm_intr_process(struct record_info *ri, struct hvm_data *h) /* Truncate to 40 bits */ unsigned long long rip = h->rip & ((1ULL << ADDR_SPACE_BITS)-1); unsigned index = rip / opt.histogram_interrupt_increment; - + h->summary.extint_histogram[index]++; } @@ -4752,7 +4752,7 @@ void hvm_generic_postprocess_init(struct record_info *ri, struct hvm_data *h) fprintf(warn, "%s: Strange, h->postprocess set!\n", __func__); h->inflight.generic.event = ri->event; - bcopy(h->d, h->inflight.generic.d, sizeof(unsigned int) * 4); + bcopy(h->d, h->inflight.generic.d, sizeof(unsigned int) * 4); } void hvm_generic_postprocess(struct hvm_data *h) @@ -4862,7 +4862,7 @@ void hvm_generic_dump(struct record_info *ri, char * prefix) ri->dump_header, evt_string, is_64?"64":""); - + for(i=0; iextra_words; i++) { printf(" %x", ri->d[i]); } @@ -4927,7 +4927,7 @@ void hvm_handler_process(struct record_info *ri, struct hvm_data *h) { return; -needs_vmexit: +needs_vmexit: /* Wait for the next vmexit */ if(!h->vmexit_valid) { @@ -5014,7 +5014,7 @@ int domain_runstate(struct domain_data *d) { int runstates[RUNSTATE_MAX]; int ret=-1; int max_vcpus = 0; - + if(d->did == DEFAULT_DOMAIN) return 0; @@ -5065,7 +5065,7 @@ int domain_runstate(struct domain_data *d) { fprintf(warn, " %s: %d\n", runstate_name[i], runstates[i]); } - + if(ret >= 0) return ret; @@ -5093,17 +5093,17 @@ static inline void runstate_update(struct vcpu_data *v, int new_runstate, t.s, t.ns, runstate_graph[new_runstate]); } - + if(v->runstate.tsc > 0 && v->runstate.tsc < tsc) { update_cycles(v->runstates + v->runstate.state, tsc - v->runstate.tsc); if ( opt.scatterplot_runstate_time ) { struct time_struct t, dt; - + abs_cycles_to_time(tsc, &t); cycles_to_time(tsc - v->runstate.tsc, &dt); - + printf("%dv%d %u.%09u %u.%09u\n", d->did, v->vid, t.s, t.ns, @@ -5164,7 +5164,7 @@ static inline void runstate_update(struct vcpu_data *v, int new_runstate, v->runstate.tsc = tsc; /* Determine the domain runstate */ - if(d->runstate_tsc > 0 && d->runstate_tsc < tsc) + if(d->runstate_tsc > 0 && d->runstate_tsc < tsc) update_cycles(d->runstates + d->runstate, tsc - d->runstate_tsc); d->runstate = domain_runstate(d); @@ -5251,7 +5251,7 @@ void hvm_vmexit_process(struct record_info *ri, struct hvm_data *h, if(opt.dump_all) { if ( h->exit_reason < h->exit_reason_max - && h->exit_reason_name[h->exit_reason] != NULL) + && h->exit_reason_name[h->exit_reason] != NULL) printf("]%s vmexit exit_reason %s eip %llx%s\n", ri->dump_header, h->exit_reason_name[h->exit_reason], @@ -5333,12 +5333,12 @@ void hvm_close_vmexit(struct hvm_data *h, tsc_t tsc) { break; } } - + if(h->v->cr3.data) { h->v->cr3.data->run_time += h->arc_cycles; - if(opt.summary_info) + if(opt.summary_info) update_cycles(&h->v->cr3.data->hv_time, h->arc_cycles); } @@ -5359,12 +5359,12 @@ void hvm_vmentry_process(struct record_info *ri, struct hvm_data *h) { return; } - /* Vista bug + /* Vista bug * This has to be done here because irqs are injected on the path out * to vmexit. */ hvm_vlapic_vmentry_cleanup(h->v, ri->tsc); - if(h->w2h.waking && opt.dump_all) + if(h->w2h.waking && opt.dump_all) printf(" [w2h] d%dv%d Finishing waking\n", h->v->d->did, h->v->vid); @@ -5506,7 +5506,7 @@ void hvm_summary(struct hvm_data *h) { } /* ---- Shadow records ---- */ -union shadow_event +union shadow_event { unsigned event; struct { @@ -5530,7 +5530,7 @@ char * flag_string(struct pf_xen_extra *e) flagstring[i]='-'; i=0; - + if(e->flag_set_ad) flagstring[i]='d'; else if(e->flag_set_a) @@ -5630,7 +5630,7 @@ void shadow_emulate_process(struct record_info *ri, struct hvm_data *h) unsigned flags:29, emulation_count:3; } gpl4; } *r = (typeof(r))ri->d; - + union shadow_event sevt = { .event = ri->event }; int rec_gpl = sevt.paging_levels + 2; @@ -5650,7 +5650,7 @@ void shadow_emulate_process(struct record_info *ri, struct hvm_data *h) fprintf(warn, "%s: expected %zd bytes for %d-level guest, got %d!\n", __func__, sizeof(r->gpl2), h->v->guest_paging_levels, ri->extra_words * 4); - + error(ERR_RECORD, ri); return; } @@ -5792,7 +5792,7 @@ void shadow_parse_other(struct record_info *ri, void shadow_unsync_postprocess(struct hvm_data *h) { struct pf_xen_extra *e = &h->inflight.pf_xen; - + if(h->resyncs > 1) fprintf(warn, "Strange, %d resyncs for an unsync!\n", h->resyncs); @@ -5893,7 +5893,7 @@ void shadow_fixup_postprocess(struct hvm_data *h) } - if(!(e->flag_promote || h->prealloc_unpin || e->flag_unsync)) + if(!(e->flag_promote || h->prealloc_unpin || e->flag_unsync)) update_summary(&h->summary.pf_xen_fixup[PF_XEN_FIXUP_UPDATE_ONLY], h->arc_cycles); /* more summary info */ @@ -6207,8 +6207,8 @@ void shadow_fault_generic_dump(unsigned int event, uint32_t *d, char *prefix, dump_header, evt_string, sevt.paging_levels); - - for(i=0; i<4; i++) + + for(i=0; i<4; i++) { printf(" %x", d[i]); } @@ -6240,7 +6240,7 @@ void shadow_fault_generic_process(struct record_info *ri, struct hvm_data *h) /* pf-case traces, vs others */ h->inflight.generic.event = ri->event; - bcopy(ri->d, h->inflight.generic.d, sizeof(unsigned int) * 4); + bcopy(ri->d, h->inflight.generic.d, sizeof(unsigned int) * 4); if(opt.dump_all) shadow_fault_generic_dump(h->inflight.generic.event, @@ -6311,7 +6311,7 @@ void shadow_process(struct pcpu_info *p) return; h = &p->current->hvm; - + if(!h->init || !h->vmexit_valid) { if(opt.dump_all) @@ -6420,7 +6420,7 @@ void pv_hypercall_process(struct record_info *ri, struct pv_data *pv) { } if(opt.summary_info) { - if(eax < PV_HYPERCALL_MAX) + if(eax < PV_HYPERCALL_MAX) pv->hypercall_count[eax]++; } @@ -6467,7 +6467,7 @@ void pv_trap_process(struct record_info *ri, struct pv_data *pv) { } if(opt.summary_info) { - if(trapnr < PV_TRAP_MAX) + if(trapnr < PV_TRAP_MAX) pv->trap_count[trapnr]++; } @@ -6497,7 +6497,7 @@ void pv_ptwr_emulation_process(struct record_info *ri, struct pv_data *pv) { struct { unsigned long long pte, addr, eip; } e; - + switch ( pevt.minor ) { case PV_PTWR_EMULATION_PAE: if ( pevt.x64 ) @@ -6553,7 +6553,7 @@ void pv_generic_process(struct record_info *ri, struct pv_data *pv) { printf("%x ", (unsigned)ri->d[i]); } printf("]"); - + } printf("\n"); } @@ -6615,7 +6615,7 @@ static const char *vcpu_op_str[] = { }; static const char *sched_op_str[] = { - "yield", "block", "shutdown", "poll", "remote_shutdown", "shutdown_code", + "yield", "block", "shutdown", "poll", "remote_shutdown", "shutdown_code", "watchdog", }; @@ -6648,7 +6648,7 @@ void pv_hypercall_gather_args(const struct record_info *ri, uint64_t *args) for (i = 0, word = 1; i < 6 && word < ri->extra_words; i++) { int present = pv_hypercall_arg_present(ri, i); - + switch (present) { case ARG_32BIT: args[i] = ri->d[word]; @@ -6692,7 +6692,7 @@ void pv_hypercall_v2_process(struct record_info *ri, struct pv_data *pv, int op = pv_hypercall_op(ri); if(opt.summary_info) { - if(op < PV_HYPERCALL_MAX) + if(op < PV_HYPERCALL_MAX) pv->hypercall_count[op]++; } @@ -6745,12 +6745,12 @@ void pv_process(struct pcpu_info *p) struct record_info *ri = &p->ri; struct vcpu_data *v = p->current; struct pv_data *pv = &v->pv; - + union pv_event pevt = { .event = ri->event }; if(vcpu_set_data_type(p->current, VCPU_DATA_PV)) return; - + if(opt.summary_info) { pv->summary_info=1; @@ -6832,7 +6832,7 @@ void domain_init(struct domain_data *d, int did) struct domain_data * domain_create(int did) { struct domain_data *d; - + fprintf(warn, "Creating domain %d\n", did); if((d=malloc(sizeof(*d)))==NULL) @@ -6862,7 +6862,7 @@ struct domain_data * domain_find(int did) /* Make a new domain */ n = domain_create(did); - + /* Insert it into the list */ n->next = d; *q = n; @@ -6926,7 +6926,7 @@ void vcpu_prev_update(struct pcpu_info *p, struct vcpu_data *prev, prev->runstate.tsc = 0; goto set; } - + if(prev->runstate.state != RUNSTATE_RUNNING) { fprintf(warn, "Strange, prev d%dv%d not running!\n", @@ -6959,7 +6959,7 @@ void vcpu_next_update(struct pcpu_info *p, struct vcpu_data *next, tsc_t tsc) else { fprintf(warn, "%s: FATAL: p->current not NULL! (d%dv%d, runstate %s)\n", - __func__, + __func__, p->current->d->did, p->current->vid, runstate_name[p->current->runstate.state]); @@ -6986,9 +6986,9 @@ void vcpu_next_update(struct pcpu_info *p, struct vcpu_data *next, tsc_t tsc) { update_cycles(&next->cpu_affinity_all, tsc - next->pcpu_tsc); update_cycles(&next->cpu_affinity_pcpu[p->pid], tsc - next->pcpu_tsc); - } + } next->pcpu_tsc = tsc; - } + } } else { @@ -7050,7 +7050,7 @@ void vcpu_start(struct pcpu_info *p, struct vcpu_data *v) { /* Change default domain to 'queued' */ runstate_update(p->current, RUNSTATE_QUEUED, p->first_tsc); - + /* FIXME: Copy over data from the default domain this interval */ fprintf(warn, "Using first_tsc for d%dv%d (%lld cycles)\n", v->d->did, v->vid, p->last_tsc - p->first_tsc); @@ -7145,7 +7145,7 @@ void sched_runstate_process(struct pcpu_info *p) runstate_name[sevt.new_runstate]); } } - + if(r->vcpu > MAX_CPUS) { fprintf(warn, "%s: vcpu %u > MAX_VCPUS %d!\n", @@ -7168,7 +7168,7 @@ void sched_runstate_process(struct pcpu_info *p) && v->hvm.vmexit_valid) { hvm_close_vmexit(&v->hvm, ri->tsc); } - + /* Track waking state */ if ( v->data_type == VCPU_DATA_HVM && v->runstate.state != RUNSTATE_LOST ) { if ( sevt.new_runstate == RUNSTATE_RUNNABLE @@ -7212,12 +7212,12 @@ void sched_runstate_process(struct pcpu_info *p) i, g->is_wake, t); - + if(opt.scatterplot_wake_to_halt && t && g->is_wake) scatterplot_vs_time(ri->tsc, t); - + if(opt.summary && t) { if(g->is_wake) { if(v->hvm.w2h.interrupts==1) @@ -7256,23 +7256,23 @@ void sched_runstate_process(struct pcpu_info *p) && last_oldstate.actual == sevt.old_runstate) { tsc_t lag, old_offset; struct pcpu_info *p2; - + if(ri->tsc < last_oldstate.tsc) { fprintf(warn, "WARNING: new tsc %lld < detected runstate tsc %lld! Not updating\n", ri->tsc, last_oldstate.tsc); goto no_update; } - + p2 = P.pcpu + last_oldstate.pid; - + lag = ri->tsc - last_oldstate.tsc; - + old_offset = p2->tsc_skew.offset; - + cpumask_union(&p2->tsc_skew.downstream, &p->tsc_skew.downstream); cpumask_set(&p2->tsc_skew.downstream, p->pid); - + if(cpumask_isset(&p2->tsc_skew.downstream, p2->pid)) { if ( opt.tsc_loop_fatal ) { @@ -7293,22 +7293,22 @@ void sched_runstate_process(struct pcpu_info *p) goto no_update; } } - + p2->tsc_skew.offset += lag * 2; - + fprintf(warn, "TSC skew detected p%d->p%d, %lld cycles. Changing p%d offset from %lld to %lld\n", p->pid, p2->pid, lag, p2->pid, old_offset, p2->tsc_skew.offset); - + goto no_update; } else { fprintf(warn, "runstate_change old_runstate %s, d%dv%d runstate %s. Possible tsc skew.\n", runstate_name[sevt.old_runstate], v->d->did, v->vid, runstate_name[v->runstate.state]); - + v->runstate.last_oldstate.wrong = sevt.old_runstate; v->runstate.last_oldstate.actual = v->runstate.state; v->runstate.last_oldstate.tsc = ri->tsc; @@ -7324,7 +7324,7 @@ void sched_runstate_process(struct pcpu_info *p) fprintf(stderr, "FATAL: Logic hole in %s\n", __func__); error(ERR_ASSERT, NULL); } - + update: /* Actually update the runstate. Special things to do if we're starting * or stopping actually running on a physical cpu. */ @@ -7353,7 +7353,7 @@ update: v->p ? v->p->pid : -1); error(ERR_FILE, NULL); } - + runstate_update(v, RUNSTATE_RUNNING, ri->tsc); } } @@ -7365,10 +7365,10 @@ update: if(perfctrs && v->runstate.tsc) { unsigned long long run_cycles, run_instr; double cpi; - + //run_cycles = r->p1 - v->runstate_p1_start; run_cycles = ri->tsc - v->runstate.tsc; - run_instr = r->p2 - v->runstate.p2_start; + run_instr = r->p2 - v->runstate.p2_start; cpi = ((double)run_cycles) / run_instr; @@ -7376,12 +7376,12 @@ update: printf(" cpi: %2.2lf ( %lld / %lld )\n", cpi, run_cycles, run_instr); } - + if(opt.scatterplot_cpi && v->d->did == 1) printf("%lld,%2.2lf\n", ri->tsc, cpi); - if(opt.summary_info) + if(opt.summary_info) update_cpi(&v->cpi, run_instr, run_cycles); } #endif @@ -7412,7 +7412,7 @@ update: } else { vcpu_prev_update(v->p, v, ri->tsc, sevt.new_runstate); } - + if(P.lost_cpus && v->d->did != IDLE_DOMAIN) { if(opt.dump_all) fprintf(warn, "%s: %d lost cpus, setting d%dv%d runstate to RUNSTATE_LOST\n", @@ -7535,7 +7535,7 @@ void sched_summary_vcpu(struct vcpu_data *v) printf(" Runstates:\n"); for(i=0; irunstates+i, desc); if ( i==RUNSTATE_RUNNABLE ) { @@ -7543,7 +7543,7 @@ void sched_summary_vcpu(struct vcpu_data *v) for(j=0; jrunnable_states+j, desc); } } @@ -7564,7 +7564,7 @@ void sched_summary_domain(struct domain_data *d) printf(" Runstates:\n"); for(i=0; irunstates+i, desc); } } @@ -7657,7 +7657,7 @@ int p2m_canonical_order(int order) } else { order /= 9; } - return order; + return order; } void mem_pod_zero_reclaim_process(struct pcpu_info *p) @@ -7741,7 +7741,7 @@ void mem_pod_populate_process(struct pcpu_info *p) order = p2m_canonical_order(r->order); d->pod.populate_order[order]++; - } + } } } @@ -7791,7 +7791,7 @@ void mem_set_p2m_entry_process(struct pcpu_info *p) printf(" %s set_p2m_entry d%d o%d t %d g %llx m %llx\n", ri->dump_header, r->d, r->order, - r->p2mt, + r->p2mt, (unsigned long long)r->gfn, (unsigned long long)r->mfn); } } @@ -7865,7 +7865,7 @@ void mem_process(struct pcpu_info *p) { } break; } - + } /* ---- PM ---- */ @@ -7912,7 +7912,7 @@ void pm_process(struct pcpu_info *p) { } break; } - + } /* @@ -7965,7 +7965,7 @@ struct pci_dev * pdev_find(uint8_t bus, uint8_t devfn) n->bus=bus; n->devfn=devfn; - + /* Insert it into the list */ n->next = d; *q = n; @@ -8013,9 +8013,9 @@ void irq_process(struct pcpu_info *p) { if ( opt.scatterplot_irq ) { struct time_struct t; - + abs_cycles_to_time(ri->tsc, &t); - + printf("i%x %u.%09u %d\n", (unsigned)r->irq, t.s, t.ns, @@ -8051,7 +8051,7 @@ void irq_process(struct pcpu_info *p) { if( irq_table[r->irq].dev ) { struct pci_dev * pdev=irq_table[r->irq].dev; - + if(pdev->vector_used[r->vec]) fprintf(warn, " Vector collision on %02x.%02x!\n", pdev->bus, pdev->devfn); @@ -8088,7 +8088,7 @@ void irq_process(struct pcpu_info *p) { ri->dump_header, r->irq, r->vec, r->cpu); } - if ( r->irq < MAX_IRQ + if ( r->irq < MAX_IRQ && r->vec < MAX_VECTOR ) { if ( irq_table[r->irq].type == IRQ_MSI ) @@ -8100,7 +8100,7 @@ void irq_process(struct pcpu_info *p) { if ( irq_table[r->irq].dev ) { struct pci_dev * pdev=irq_table[r->irq].dev; - + if(!pdev->vector_used[r->vec]) fprintf(warn," Strange, cleanup on non-used vector\n"); pdev->vector_used[r->vec]=0; @@ -8159,7 +8159,7 @@ void dump_generic(FILE * f, struct record_info *ri) ri->event, ri->evt.main, ri->evt.sub, - ri->evt.minor, + ri->evt.minor, ri->extra_words); for(i=0; iextra_words; i++) { @@ -8186,7 +8186,7 @@ void dump_raw(char * s, struct record_info *ri) else printf(" "); } - + printf(" ] | "); for (i=0; i<8; i++) { @@ -8212,7 +8212,7 @@ int check_extra_words(struct record_info *ri, { static int off_by_one = 0; int expected_extra = expected_size / sizeof(unsigned int); - + if(ri->extra_words != expected_extra && !(off_by_one && ri->extra_words == expected_extra + 1) ) { @@ -8228,7 +8228,7 @@ int check_extra_words(struct record_info *ri, error(ERR_RECORD, ri); return 1; } - } + } return 0; } @@ -8330,7 +8330,7 @@ void process_lost_records(struct pcpu_info *p) #endif if ( p->current ) { - + hvm_vlapic_clear(&p->current->vlapic); if(p->current->data_type == VCPU_DATA_HVM) { p->current->hvm.vmexit_valid=0; @@ -8372,7 +8372,7 @@ void process_lost_records(struct pcpu_info *p) p->lost_record.active = 1; p->lost_record.tsc = first_tsc; pcpu_string_draw(p); - + { /* Any vcpu which is not actively running may be scheduled on the * lost cpu. To avoid mis-accounting, we need to reset */ @@ -8452,8 +8452,8 @@ void process_lost_records_end(struct pcpu_info *p) printf(" %s lost_records end (domain invalid)---\n", pcpu_string(p->pid)); } - - + + p->lost_record.active = 0; pcpu_string_draw(p); P.lost_cpus--; @@ -8516,7 +8516,7 @@ loff_t scan_for_new_pcpu(loff_t offset) { ssize_t r; struct trace_record rec; struct cpu_change_data *cd; - + r=__read_record(&rec, offset); if(r==0) @@ -8539,7 +8539,7 @@ loff_t scan_for_new_pcpu(loff_t offset) { /* FIXME: Figure out if we could handle this more gracefully */ error(ERR_ASSERT, NULL); } - + if(cd->cpu > P.max_active_pcpu || !P.pcpu[cd->cpu].active) { struct pcpu_info *p = P.pcpu + cd->cpu; @@ -8570,7 +8570,7 @@ loff_t scan_for_new_pcpu(loff_t offset) { } } -/* +/* * Conceptually, when we reach a cpu_change record that's not for our pcpu, * we want to scan forward through the file until we reach one that's for us. * However, looping through involves reading the file, which we'd rather @@ -8625,7 +8625,7 @@ void deactivate_pcpu(struct pcpu_info *p) fprintf(warn, "%s: Setting max_active_pcpu to %d\n", __func__, max_active_pcpu); } - + } /* Helper function to process tsc-related record info */ @@ -8690,11 +8690,11 @@ void create_dump_header(struct record_info *ri, struct pcpu_info *p) c+=r; len-=r; } - + r = snprintf(c, len, " %s", pcpu_string(ri->cpu)); c+=r; len-=r; - + if ( p->current ) { r = snprintf(c, len, " d%dv%d", p->current->d->did, p->current->vid); @@ -8733,7 +8733,7 @@ int find_toplevel_event(struct record_info *ri) return toplevel; } - + void process_cpu_change(struct pcpu_info *p) { struct record_info *ri = &p->ri; @@ -8785,7 +8785,7 @@ void process_cpu_change(struct pcpu_info *p) { fprintf(warn, "%s: Activating pcpu %d at offset %lld\n", __func__, r->cpu, (unsigned long long)p->file_offset); - + record_order_insert(p2); sched_default_vcpu_activate(p2); @@ -8806,7 +8806,7 @@ void process_cpu_change(struct pcpu_info *p) { __func__, p->pid, (unsigned long long)P.last_epoch_offset); deactivate_pcpu(p); } - } + } else { /* Track information about dom0 scheduling and records */ @@ -8820,7 +8820,7 @@ void process_cpu_change(struct pcpu_info *p) { p->volume.buffer_dom0_runstate_tsc; p->volume.buffer_dom0_runstate_cycles[p->volume.buffer_dom0_runstate] += ri->tsc - cycles; - + printf(" - updated p%d dom0_runstate %s to %lld cycles (+%lld)\n", p->pid, runstate_name[p->volume.buffer_dom0_runstate], p->volume.buffer_dom0_runstate_cycles[p->volume.buffer_dom0_runstate], @@ -8951,7 +8951,7 @@ void process_record(struct pcpu_info *p) { process_record_tsc(p->order_tsc, ri); - if(opt.dump_all) + if(opt.dump_all) create_dump_header(ri, p); @@ -9003,9 +9003,9 @@ void process_record(struct pcpu_info *p) { static inline ssize_t get_rec_size(struct trace_record *rec) { ssize_t s; - + s = sizeof(uint32_t); - + if(rec->cycle_flag) s += sizeof(tsc_t); @@ -9032,7 +9032,7 @@ void progress_init(void) { if(!(pid = fork())) { progress_child_exec(); - + fprintf(stderr, "%s: exec failed (%s), disabling progress bar\n", __func__, strerror(errno)); opt.progress = 0; @@ -9202,7 +9202,7 @@ ssize_t read_record(struct pcpu_info * p) { * - Updating the current one * * FIXME: Need to deal with pcpu states changing... - * + * * WARNING not thread-safe */ @@ -9233,7 +9233,7 @@ char * pcpu_string(int pcpu) { char *s = __pcpu_string; static int max_active_pcpu=-1, last_pcpu=-1; - + assert(P.max_active_pcpu < MAX_CPUS); assert(pcpu <= P.max_active_pcpu); @@ -9243,7 +9243,7 @@ char * pcpu_string(int pcpu) if(P.max_active_pcpu > max_active_pcpu) { int i; - for(i=max_active_pcpu + 1; i<= P.max_active_pcpu; i++) + for(i=max_active_pcpu + 1; i<= P.max_active_pcpu; i++) pcpu_string_draw(P.pcpu+i); max_active_pcpu=P.max_active_pcpu; } @@ -9338,7 +9338,7 @@ void record_order_remove(struct pcpu_info *rem) assert(record_order[i]); /* And move everyone forward */ - for(; (record_order[i]=record_order[i+1]); i++) + for(; (record_order[i]=record_order[i+1]); i++) ; } @@ -9410,7 +9410,7 @@ void domain_summary(void) if(opt.show_default_domain_summary) { d = &default_domain; printf("|-- Default domain --|\n"); - + for( i = 0; i < MAX_CPUS ; i++ ) { if(d->vcpu[i]) @@ -9475,7 +9475,7 @@ void report_pcpu(void) { if(!p->summary) continue; printf("pcpu %d\n", i); - + print_cycle_summary(&p->time.running, " running"); print_cycle_summary(&p->time.idle, " idle"); print_cycle_summary(&p->time.lost, " lost"); @@ -9484,7 +9484,7 @@ void report_pcpu(void) { active++; } printf("Total active cpus: %d\n", active); - + } void init_pcpus(void) { @@ -9592,7 +9592,7 @@ enum { void parse_cpu_hz(char * arg) { float hz_base; char * next_ptr; - + hz_base=strtof(arg, &next_ptr); if(next_ptr == arg) { fprintf(stderr, "Invalid cpu_hz %s\n", arg); @@ -9888,7 +9888,7 @@ error_t cmd_parser(int key, char *arg, struct argp_state *state) opt.with_cr3_enumeration = 1; G.output_defined = 1; break; - + case OPT_INTERVAL_CR3_SCHEDULE_ORDERED: opt.interval.output = INTERVAL_CR3_SCHEDULE_ORDERED; opt.interval.check = INTERVAL_CHECK_CR3; @@ -9938,7 +9938,7 @@ error_t cmd_parser(int key, char *arg, struct argp_state *state) opt.summary_info = 1; G.output_defined = 1; break; - + case OPT_INTERVAL_DOMAIN_SHORT_SUMMARY: { if((parse_array(arg, &opt.interval.array) < 0) @@ -9998,7 +9998,7 @@ error_t cmd_parser(int key, char *arg, struct argp_state *state) char *inval; opt.default_guest_paging_levels = (int)strtol(arg, &inval, 0); if ( inval == arg ) - argp_usage(state); + argp_usage(state); } break; case OPT_SYMBOL_FILE: @@ -10291,19 +10291,19 @@ const struct argp_option cmd_opts[] = { .key = OPT_SUMMARY, .group = OPT_GROUP_SUMMARY, .doc = "Output a summary", }, - + { .name = "report-pcpu", .key = OPT_REPORT_PCPU, .group = OPT_GROUP_SUMMARY, .doc = "Report utilization for pcpus", }, - + /* Guest info */ { .name = "default-guest-paging-levels", .key = OPT_DEFAULT_GUEST_PAGING_LEVELS, .group = OPT_GROUP_GUEST, .arg = "L", .doc = "Default guest paging levels. Mainly necessary for Rio, as Miami traces include guest paging levels where appropriate.", }, - + { .name = "symbol-file", .key = OPT_SYMBOL_FILE, .group = OPT_GROUP_GUEST, @@ -10376,7 +10376,7 @@ int main(int argc, char *argv[]) { if(opt.dump_all) warn = stdout; - + init_pcpus(); if(opt.progress) @@ -10395,7 +10395,7 @@ int main(int argc, char *argv[]) { if(opt.progress) progress_finish(); - + 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 Wed Jun 17 18:26:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I2b-0005qE-QT; Wed, 17 Jun 2015 18:26:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2a-0005pv-FI for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:24 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 33/0D-32406-FCBB1855; Wed, 17 Jun 2015 18:26:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1434565580!17242075!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4300 invoked from network); 17 Jun 2015 18:26:21 -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; 17 Jun 2015 18:26:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2V-0002Gb-WA for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2V-00073u-QE for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:19 +0000 Date: Wed, 17 Jun 2015 18:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: remove trailing whitespaces X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3f2794eec467a5429b44efa24058f850c075463 Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:43 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:24 2015 +0100 xenalyze: remove trailing whitespaces Result of "sed -i 's@[[:blank:]]\+$@@' tools/xentrace/xenalyze.c" Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 350 ++++++++++++++++++++++---------------------- 1 files changed, 175 insertions(+), 175 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 15c51d9..70f0db0 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -2,7 +2,7 @@ * xenalyze.c: Analyzing xentrace output * * Written by George Dunlap. - * + * * Copyright (c) 2006-2007, XenSource Inc. * Copyright (c) 2007-2008, Citrix Systems R&D Ltd, UK * @@ -61,7 +61,7 @@ struct array_struct { fprintf(warn, ##_x); \ } \ } while(0) \ - + /* -- Global variables -- */ struct { int fd; @@ -87,7 +87,7 @@ struct { .progress = { .update_offset = 0 }, }; -/* +/* Kinds of errors: Unexpected values - RIP with information in high bits (not all 0 or 1) @@ -115,7 +115,7 @@ struct { - domain runstates - runstate / tsc skew - vcpu_{prev,next}_update p->current{==,!=}null - - vcpu start conditions + - vcpu start conditions - lost_cpu count higher than # of seen cpus / < 0 - lost cpu has non-null p->current Symbol file @@ -146,7 +146,7 @@ enum error_level { int verbosity = 5; struct { - unsigned + unsigned scatterplot_interrupt_eip:1, scatterplot_cpi:1, scatterplot_unpin_promote:1, @@ -225,7 +225,7 @@ struct { } opt = { .scatterplot_interrupt_eip=0, .scatterplot_cpi=0, - .scatterplot_unpin_promote=0, + .scatterplot_unpin_promote=0, .scatterplot_cr3_switch=0, .scatterplot_wake_to_halt=0, .scatterplot_vmexit_eip=0, @@ -355,7 +355,7 @@ void parse_symbol_file(char *fn) { error(ERR_ASSERT, NULL); } else last_addr = (*p)->symbols[(*p)->count].addr; - + (*p)->count++; /* If this struct is full, point to the next. It will be allocated @@ -418,7 +418,7 @@ struct { void (*dump)(struct eip_list_struct *); } eip_list_type[EIP_LIST_TYPE_MAX] = { [EIP_LIST_TYPE_NONE] = { - .update=NULL, + .update=NULL, .new=NULL, .dump=NULL }, }; @@ -427,7 +427,7 @@ struct { /* --- HVM class of events --- */ /* - * -- Algorithms -- + * -- Algorithms -- * * Interrupt Wake-to-halt detection * @@ -450,7 +450,7 @@ struct { * * The "waking" interrupts we want to sub-classify into * "wake-only" (when interrupt was the only interrupt from wake to halt) and - * "wake-all" (whether this was the only interrupt or not). + * "wake-all" (whether this was the only interrupt or not). */ /* VMX data */ @@ -968,7 +968,7 @@ char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] = { "pf_inject", "inj_exc", "inj_virq", - "reinj_virq", + "reinj_virq", "io_read", "io_write", "cr_read", /* 8 */ @@ -1469,7 +1469,7 @@ void init_hvm_data(struct hvm_data *h, struct vcpu_data *v) { size); error(ERR_SYSTEM, NULL); } - + } for(i=0; isummary.guest_interrupt[i].count=0; @@ -1757,7 +1757,7 @@ struct domain_data { struct cr3_value_struct *cr3_value_head; struct eip_list_struct *emulate_eip_list; struct eip_list_struct *interrupt_eip_list; - + int guest_interrupt[GUEST_INTERRUPT_MAX+1]; struct hvm_short_summary_struct hvm_short; struct { @@ -1840,7 +1840,7 @@ void volume_summary(struct trace_volume *vol) printf(" +-%-7s: %10lld\n", hvm_vol_name[k], vol->hvm[k]); } - + break; } } @@ -2049,7 +2049,7 @@ long long percentile(long long * A, int N, int ple) { I++; J--; } } while (I <= J); /* Keep going until our pointers meet or pass */ - + /* Re-adjust L and R, based on which element we're looking for */ if(Jcount) { long long avg; - + avg = s->cycles / s->count; if ( opt.sample_size ) { @@ -2441,7 +2441,7 @@ static inline void print_cycle_percent_summary(struct cycle_summary *s, avg, p5, p50, p95); } else { printf("%s: %7d %5.2lfs %5.2lf%% %6lld\n", - p, s->count, + p, s->count, seconds, percent, avg); @@ -2454,7 +2454,7 @@ static inline void print_cycle_summary(struct cycle_summary *s, char *p) { long long avg; avg = s->cycles / s->count; - + if ( opt.sample_size ) { long long p5, p50, p95; int data_size = s->count; @@ -2578,9 +2578,9 @@ void interval_list_add(struct interval_element *e, char *desc) { struct interval_list *p; fprintf(warn, "%s: Adding element '%s'\n", __func__, desc); - + if((p=malloc(sizeof(*p)))==NULL) { - fprintf(stderr, "malloc() failed.\n"); + fprintf(stderr, "malloc() failed.\n"); error(ERR_SYSTEM, NULL); } @@ -2627,7 +2627,7 @@ void interval_cr3_value_check(struct cr3_value_struct *cr3) { __func__, cr3->gmfn); P.interval.array.values[i] = &cr3->total_time.interval; - } + } } } else if(opt.interval.mode == INTERVAL_MODE_LIST) { char desc[32]; @@ -2713,14 +2713,14 @@ void interval_cr3_short_summary_output(void) { struct cr3_value_struct *p = P.interval.cr3; interval_time_output(); - + hss_array = p->hvm.s; printf(" %.02lf", __cycles_percent(p->total_time.interval.cycles, opt.interval.cycles)); - for(i=0; itotal_time.interval.cycles); @@ -2743,7 +2743,7 @@ void interval_domain_value_check(struct domain_data *d) { } P.interval.array.values[i] = &d->total_time.interval; - } + } } } else if(opt.interval.mode == INTERVAL_MODE_LIST) { char desc[32]; @@ -2776,7 +2776,7 @@ void interval_domain_short_summary_output(void) { interval_cycle_percent_output(&d->total_time.interval); - for(i=0; ihvm_short.s[i].interval); printf("\n"); @@ -2841,7 +2841,7 @@ void interval_domain_guest_interrupt_output(void) { printf("\n"); } - + } void interval_domain_grant_maps_output(void) { @@ -2860,7 +2860,7 @@ void interval_domain_grant_maps_output(void) { printf("\n"); } } - + /* General interval gateways */ void interval_callback(void) { @@ -2928,11 +2928,11 @@ void interval_tail(void) { void update_eip(struct eip_list_struct **head, unsigned long long eip, unsigned long long cycles, int type, void * extra) { struct eip_list_struct *p, **last=head; - + for(p=*head; p; last = (&p->next), p=p->next) if(p->eip >= eip) break; - + if(!p || p->eip != eip) { p=malloc(sizeof(*p)); if(!p) { @@ -3008,7 +3008,7 @@ void dump_eip(struct eip_list_struct *head) { #endif printf(" Total samples: %d\n", total); - + for(i=0; isummary.cycles ) @@ -3025,7 +3025,7 @@ void dump_eip(struct eip_list_struct *head) { ((double)p->summary.count*100)/total); } - + if(eip_list_type[p->type].dump) { eip_list_type[p->type].dump(p); } @@ -3052,7 +3052,7 @@ struct hvm_pf_xen_record { void hvm_update_short_summary(struct hvm_data *h, int element) { struct vcpu_data *v = h->v; - if(v->cr3.data) + if(v->cr3.data) update_cycles(&v->cr3.data->hvm.s[element], h->arc_cycles); update_cycles(&v->d->hvm_short.s[element], h->arc_cycles); @@ -3250,7 +3250,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) e->corresponding_va = CORR_VA_INVALID; e->pt_level = 0; - + /* Detect accesses to Windows linear pagetables */ switch(guest_paging_levels) { @@ -3269,7 +3269,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) | e->pt_index[1]<<22 | e->pt_index[0]<<12; } - } + } break; case 3: if(e->pt_index[3]==3 && (e->pt_index[2]>>2==0)) @@ -3298,7 +3298,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) | e->pt_index[1]<<21 | e->pt_index[2]<<30; } - } + } break; case 4: if(e->pt_index[4] == 0x1ed) @@ -3322,7 +3322,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) } } else - { + { e->pt_level = 2; e->corresponding_va = ((1ULL<<21)-1) | (unsigned long long)e->pt_index[0]<<21 @@ -3339,7 +3339,7 @@ void pf_preprocess(struct pf_xen_extra *e, int guest_paging_levels) | (unsigned long long)e->pt_index[2]<<30 | (unsigned long long)e->pt_index[3]<<39; } - + if(HIGH_BIT(e->corresponding_va)) e->corresponding_va |= SIGN_EXTENDED_BITS; } @@ -3453,7 +3453,7 @@ void hvm_pf_xen_process(struct record_info *ri, struct hvm_data *h) { h->v->guest_paging_levels); hvm_pf_xen_preprocess(ri->event, h); - + if(opt.dump_all) { if(e->pf_case == PF_XEN_EMULATE) @@ -3482,7 +3482,7 @@ char * hvm_vlapic_icr_dest_shorthand_name[4] = { void hvm_vlapic_vmentry_cleanup(struct vcpu_data *v, tsc_t tsc) { int i; - + struct vlapic_struct *vla = &v->vlapic; for(i=0; ifirst_tsc) + if(!o->first_tsc) o->first_tsc = P.now; if(opt.dump_all && o->count == 0 && o->injected) @@ -3602,7 +3602,7 @@ void hvm_vlapic_icr_handler(struct hvm_data *h) if((opt.dump_all) #if 0 && (ov->runstate.state != RUNSTATE_RUNNING - || ov->hvm.vmexit_valid) + || ov->hvm.vmexit_valid) #endif ) printf(" [vla] d%dv%d vec %d state %s (outstanding ipis %d)\n", @@ -3828,7 +3828,7 @@ void hvm_inj_virq_process(struct record_info *ri, struct hvm_data *h) { ri->dump_header, r->vector, r->fake?"fake":"real"); } - + if(opt.summary_info) { int vector = r->vector; @@ -3867,7 +3867,7 @@ void hvm_inj_virq_process(struct record_info *ri, struct hvm_data *h) { h->w2h.vector = vector; h->summary.guest_interrupt[vector].is_wake = 1; } - + if( h->summary.guest_interrupt[vector].start_tsc == 0 ) { /* Note that we want start_tsc set at the next vmentry */ h->summary.guest_interrupt[vector].start_tsc = 1; @@ -3897,19 +3897,19 @@ void update_io_address(struct io_address ** list, unsigned int pa, int dir, /* Keep list in order */ for(p=*list; p && (p->pa != pa) && (p->pa < pa); q=p, p=p->next); - + /* If we didn't find it, make a new element. */ if(!p || (p->pa != pa)) { if((p=malloc(sizeof(*p)))==NULL) { fprintf(stderr, "malloc() failed.\n"); error(ERR_SYSTEM, NULL); } - + bzero(p, sizeof(*p)); p->pa=pa; p->va=va; - + /* If we stopped in the middle or at the end, add it in */ if(q) { p->next=q->next; @@ -4028,7 +4028,7 @@ void cr3_switch(unsigned long long val, struct hvm_data *h) { if(gmfn) { struct cr3_value_struct *p, **last=&v->d->cr3_value_head; - + /* Always add to tail, so that we get consistent interval ouptut as the number of cr3s grow */ for(p=*last; p; last = (&p->next), p=p->next) @@ -4056,7 +4056,7 @@ void cr3_switch(unsigned long long val, struct hvm_data *h) { else P.cr3.head = p; P.cr3.tail = &p->gnext; - + P.cr3.id++; /* Add to the interval list if appropriate */ @@ -4098,20 +4098,20 @@ void cr3_prealloc_unpin(struct vcpu_data *v, unsigned long long gmfn) { struct cr3_value_struct *cr3; /* Look for it in the list */ - for(cr3 = v->d->cr3_value_head; cr3; cr3=cr3->next) + for(cr3 = v->d->cr3_value_head; cr3; cr3=cr3->next) if(cr3->gmfn == gmfn) break; if(!cr3) return; - if(cr3->prealloc_unpin.now) + if(cr3->prealloc_unpin.now) fprintf(warn, "Strange, gmfn %llx multiple unpins w/o access!\n", gmfn); cr3->prealloc_unpin.now = 1; cr3->prealloc_unpin.count++; - + if(opt.dump_all) printf(" cr3 %llx unpinned %d times\n", gmfn, cr3->prealloc_unpin.count); @@ -4189,7 +4189,7 @@ void cr3_dump_list(struct cr3_value_struct *head){ abs_cycles_to_time(p->first_time, &first); abs_cycles_to_time(p->last_time, &last); - + snprintf(desc, 30, " %8llx (id %d)", p->gmfn, p->cr3_id); print_cycle_summary(&p->total_time, desc); snprintf(desc, 30, " guest"); @@ -4242,7 +4242,7 @@ void hvm_cr_write_postprocess(struct hvm_data *h) int flush=0; if(v->cr3.val) { - oval = v->cr3.val; + oval = v->cr3.val; if(new_val == oval) { if(v->cr3.data) { @@ -4291,7 +4291,7 @@ void hvm_cr_write_postprocess(struct hvm_data *h) #define case_cr(_x) \ case (_x): \ hvm_set_summary_handler(h, hvm_cr_write_summary, (void *)(_x)); \ - break + break case_cr(0); case_cr(1); case_cr(2); @@ -4350,13 +4350,13 @@ void hvm_cr_write_process(struct record_info *ri, struct hvm_data *h) { if(cr == 3 && h->v->cr3.val) { printf("]%s cr_write cr3 val %llx oval %llx %s\n", - ri->dump_header, + ri->dump_header, val, h->v->cr3.val, (h->v->cr3.val == val)?"flush":"switch"); } else { printf(" %s cr_write cr%d val %llx\n", - ri->dump_header, + ri->dump_header, cr, val); } @@ -4510,7 +4510,7 @@ void hvm_inj_exc_process(struct record_info *ri, struct hvm_data *h) ri->t.s, ri->t.ns, pcpu_string(ri->cpu), r->vec, r->ec); } - + } void hvm_intr_summary(struct hvm_data *h, void *d) @@ -4577,9 +4577,9 @@ void hvm_intr_process(struct record_info *ri, struct hvm_data *h) /* Want absolute tsc to global tsc */ abs_cycles_to_time(h->exit_tsc, &t); - printf("d%dv%d %u.%09u %lld\n", + printf("d%dv%d %u.%09u %lld\n", h->v->d->did, h->v->vid, - t.s, t.ns, + t.s, t.ns, rip); } @@ -4589,7 +4589,7 @@ void hvm_intr_process(struct record_info *ri, struct hvm_data *h) /* Truncate to 40 bits */ unsigned long long rip = h->rip & ((1ULL << ADDR_SPACE_BITS)-1); unsigned index = rip / opt.histogram_interrupt_increment; - + h->summary.extint_histogram[index]++; } @@ -4752,7 +4752,7 @@ void hvm_generic_postprocess_init(struct record_info *ri, struct hvm_data *h) fprintf(warn, "%s: Strange, h->postprocess set!\n", __func__); h->inflight.generic.event = ri->event; - bcopy(h->d, h->inflight.generic.d, sizeof(unsigned int) * 4); + bcopy(h->d, h->inflight.generic.d, sizeof(unsigned int) * 4); } void hvm_generic_postprocess(struct hvm_data *h) @@ -4862,7 +4862,7 @@ void hvm_generic_dump(struct record_info *ri, char * prefix) ri->dump_header, evt_string, is_64?"64":""); - + for(i=0; iextra_words; i++) { printf(" %x", ri->d[i]); } @@ -4927,7 +4927,7 @@ void hvm_handler_process(struct record_info *ri, struct hvm_data *h) { return; -needs_vmexit: +needs_vmexit: /* Wait for the next vmexit */ if(!h->vmexit_valid) { @@ -5014,7 +5014,7 @@ int domain_runstate(struct domain_data *d) { int runstates[RUNSTATE_MAX]; int ret=-1; int max_vcpus = 0; - + if(d->did == DEFAULT_DOMAIN) return 0; @@ -5065,7 +5065,7 @@ int domain_runstate(struct domain_data *d) { fprintf(warn, " %s: %d\n", runstate_name[i], runstates[i]); } - + if(ret >= 0) return ret; @@ -5093,17 +5093,17 @@ static inline void runstate_update(struct vcpu_data *v, int new_runstate, t.s, t.ns, runstate_graph[new_runstate]); } - + if(v->runstate.tsc > 0 && v->runstate.tsc < tsc) { update_cycles(v->runstates + v->runstate.state, tsc - v->runstate.tsc); if ( opt.scatterplot_runstate_time ) { struct time_struct t, dt; - + abs_cycles_to_time(tsc, &t); cycles_to_time(tsc - v->runstate.tsc, &dt); - + printf("%dv%d %u.%09u %u.%09u\n", d->did, v->vid, t.s, t.ns, @@ -5164,7 +5164,7 @@ static inline void runstate_update(struct vcpu_data *v, int new_runstate, v->runstate.tsc = tsc; /* Determine the domain runstate */ - if(d->runstate_tsc > 0 && d->runstate_tsc < tsc) + if(d->runstate_tsc > 0 && d->runstate_tsc < tsc) update_cycles(d->runstates + d->runstate, tsc - d->runstate_tsc); d->runstate = domain_runstate(d); @@ -5251,7 +5251,7 @@ void hvm_vmexit_process(struct record_info *ri, struct hvm_data *h, if(opt.dump_all) { if ( h->exit_reason < h->exit_reason_max - && h->exit_reason_name[h->exit_reason] != NULL) + && h->exit_reason_name[h->exit_reason] != NULL) printf("]%s vmexit exit_reason %s eip %llx%s\n", ri->dump_header, h->exit_reason_name[h->exit_reason], @@ -5333,12 +5333,12 @@ void hvm_close_vmexit(struct hvm_data *h, tsc_t tsc) { break; } } - + if(h->v->cr3.data) { h->v->cr3.data->run_time += h->arc_cycles; - if(opt.summary_info) + if(opt.summary_info) update_cycles(&h->v->cr3.data->hv_time, h->arc_cycles); } @@ -5359,12 +5359,12 @@ void hvm_vmentry_process(struct record_info *ri, struct hvm_data *h) { return; } - /* Vista bug + /* Vista bug * This has to be done here because irqs are injected on the path out * to vmexit. */ hvm_vlapic_vmentry_cleanup(h->v, ri->tsc); - if(h->w2h.waking && opt.dump_all) + if(h->w2h.waking && opt.dump_all) printf(" [w2h] d%dv%d Finishing waking\n", h->v->d->did, h->v->vid); @@ -5506,7 +5506,7 @@ void hvm_summary(struct hvm_data *h) { } /* ---- Shadow records ---- */ -union shadow_event +union shadow_event { unsigned event; struct { @@ -5530,7 +5530,7 @@ char * flag_string(struct pf_xen_extra *e) flagstring[i]='-'; i=0; - + if(e->flag_set_ad) flagstring[i]='d'; else if(e->flag_set_a) @@ -5630,7 +5630,7 @@ void shadow_emulate_process(struct record_info *ri, struct hvm_data *h) unsigned flags:29, emulation_count:3; } gpl4; } *r = (typeof(r))ri->d; - + union shadow_event sevt = { .event = ri->event }; int rec_gpl = sevt.paging_levels + 2; @@ -5650,7 +5650,7 @@ void shadow_emulate_process(struct record_info *ri, struct hvm_data *h) fprintf(warn, "%s: expected %zd bytes for %d-level guest, got %d!\n", __func__, sizeof(r->gpl2), h->v->guest_paging_levels, ri->extra_words * 4); - + error(ERR_RECORD, ri); return; } @@ -5792,7 +5792,7 @@ void shadow_parse_other(struct record_info *ri, void shadow_unsync_postprocess(struct hvm_data *h) { struct pf_xen_extra *e = &h->inflight.pf_xen; - + if(h->resyncs > 1) fprintf(warn, "Strange, %d resyncs for an unsync!\n", h->resyncs); @@ -5893,7 +5893,7 @@ void shadow_fixup_postprocess(struct hvm_data *h) } - if(!(e->flag_promote || h->prealloc_unpin || e->flag_unsync)) + if(!(e->flag_promote || h->prealloc_unpin || e->flag_unsync)) update_summary(&h->summary.pf_xen_fixup[PF_XEN_FIXUP_UPDATE_ONLY], h->arc_cycles); /* more summary info */ @@ -6207,8 +6207,8 @@ void shadow_fault_generic_dump(unsigned int event, uint32_t *d, char *prefix, dump_header, evt_string, sevt.paging_levels); - - for(i=0; i<4; i++) + + for(i=0; i<4; i++) { printf(" %x", d[i]); } @@ -6240,7 +6240,7 @@ void shadow_fault_generic_process(struct record_info *ri, struct hvm_data *h) /* pf-case traces, vs others */ h->inflight.generic.event = ri->event; - bcopy(ri->d, h->inflight.generic.d, sizeof(unsigned int) * 4); + bcopy(ri->d, h->inflight.generic.d, sizeof(unsigned int) * 4); if(opt.dump_all) shadow_fault_generic_dump(h->inflight.generic.event, @@ -6311,7 +6311,7 @@ void shadow_process(struct pcpu_info *p) return; h = &p->current->hvm; - + if(!h->init || !h->vmexit_valid) { if(opt.dump_all) @@ -6420,7 +6420,7 @@ void pv_hypercall_process(struct record_info *ri, struct pv_data *pv) { } if(opt.summary_info) { - if(eax < PV_HYPERCALL_MAX) + if(eax < PV_HYPERCALL_MAX) pv->hypercall_count[eax]++; } @@ -6467,7 +6467,7 @@ void pv_trap_process(struct record_info *ri, struct pv_data *pv) { } if(opt.summary_info) { - if(trapnr < PV_TRAP_MAX) + if(trapnr < PV_TRAP_MAX) pv->trap_count[trapnr]++; } @@ -6497,7 +6497,7 @@ void pv_ptwr_emulation_process(struct record_info *ri, struct pv_data *pv) { struct { unsigned long long pte, addr, eip; } e; - + switch ( pevt.minor ) { case PV_PTWR_EMULATION_PAE: if ( pevt.x64 ) @@ -6553,7 +6553,7 @@ void pv_generic_process(struct record_info *ri, struct pv_data *pv) { printf("%x ", (unsigned)ri->d[i]); } printf("]"); - + } printf("\n"); } @@ -6615,7 +6615,7 @@ static const char *vcpu_op_str[] = { }; static const char *sched_op_str[] = { - "yield", "block", "shutdown", "poll", "remote_shutdown", "shutdown_code", + "yield", "block", "shutdown", "poll", "remote_shutdown", "shutdown_code", "watchdog", }; @@ -6648,7 +6648,7 @@ void pv_hypercall_gather_args(const struct record_info *ri, uint64_t *args) for (i = 0, word = 1; i < 6 && word < ri->extra_words; i++) { int present = pv_hypercall_arg_present(ri, i); - + switch (present) { case ARG_32BIT: args[i] = ri->d[word]; @@ -6692,7 +6692,7 @@ void pv_hypercall_v2_process(struct record_info *ri, struct pv_data *pv, int op = pv_hypercall_op(ri); if(opt.summary_info) { - if(op < PV_HYPERCALL_MAX) + if(op < PV_HYPERCALL_MAX) pv->hypercall_count[op]++; } @@ -6745,12 +6745,12 @@ void pv_process(struct pcpu_info *p) struct record_info *ri = &p->ri; struct vcpu_data *v = p->current; struct pv_data *pv = &v->pv; - + union pv_event pevt = { .event = ri->event }; if(vcpu_set_data_type(p->current, VCPU_DATA_PV)) return; - + if(opt.summary_info) { pv->summary_info=1; @@ -6832,7 +6832,7 @@ void domain_init(struct domain_data *d, int did) struct domain_data * domain_create(int did) { struct domain_data *d; - + fprintf(warn, "Creating domain %d\n", did); if((d=malloc(sizeof(*d)))==NULL) @@ -6862,7 +6862,7 @@ struct domain_data * domain_find(int did) /* Make a new domain */ n = domain_create(did); - + /* Insert it into the list */ n->next = d; *q = n; @@ -6926,7 +6926,7 @@ void vcpu_prev_update(struct pcpu_info *p, struct vcpu_data *prev, prev->runstate.tsc = 0; goto set; } - + if(prev->runstate.state != RUNSTATE_RUNNING) { fprintf(warn, "Strange, prev d%dv%d not running!\n", @@ -6959,7 +6959,7 @@ void vcpu_next_update(struct pcpu_info *p, struct vcpu_data *next, tsc_t tsc) else { fprintf(warn, "%s: FATAL: p->current not NULL! (d%dv%d, runstate %s)\n", - __func__, + __func__, p->current->d->did, p->current->vid, runstate_name[p->current->runstate.state]); @@ -6986,9 +6986,9 @@ void vcpu_next_update(struct pcpu_info *p, struct vcpu_data *next, tsc_t tsc) { update_cycles(&next->cpu_affinity_all, tsc - next->pcpu_tsc); update_cycles(&next->cpu_affinity_pcpu[p->pid], tsc - next->pcpu_tsc); - } + } next->pcpu_tsc = tsc; - } + } } else { @@ -7050,7 +7050,7 @@ void vcpu_start(struct pcpu_info *p, struct vcpu_data *v) { /* Change default domain to 'queued' */ runstate_update(p->current, RUNSTATE_QUEUED, p->first_tsc); - + /* FIXME: Copy over data from the default domain this interval */ fprintf(warn, "Using first_tsc for d%dv%d (%lld cycles)\n", v->d->did, v->vid, p->last_tsc - p->first_tsc); @@ -7145,7 +7145,7 @@ void sched_runstate_process(struct pcpu_info *p) runstate_name[sevt.new_runstate]); } } - + if(r->vcpu > MAX_CPUS) { fprintf(warn, "%s: vcpu %u > MAX_VCPUS %d!\n", @@ -7168,7 +7168,7 @@ void sched_runstate_process(struct pcpu_info *p) && v->hvm.vmexit_valid) { hvm_close_vmexit(&v->hvm, ri->tsc); } - + /* Track waking state */ if ( v->data_type == VCPU_DATA_HVM && v->runstate.state != RUNSTATE_LOST ) { if ( sevt.new_runstate == RUNSTATE_RUNNABLE @@ -7212,12 +7212,12 @@ void sched_runstate_process(struct pcpu_info *p) i, g->is_wake, t); - + if(opt.scatterplot_wake_to_halt && t && g->is_wake) scatterplot_vs_time(ri->tsc, t); - + if(opt.summary && t) { if(g->is_wake) { if(v->hvm.w2h.interrupts==1) @@ -7256,23 +7256,23 @@ void sched_runstate_process(struct pcpu_info *p) && last_oldstate.actual == sevt.old_runstate) { tsc_t lag, old_offset; struct pcpu_info *p2; - + if(ri->tsc < last_oldstate.tsc) { fprintf(warn, "WARNING: new tsc %lld < detected runstate tsc %lld! Not updating\n", ri->tsc, last_oldstate.tsc); goto no_update; } - + p2 = P.pcpu + last_oldstate.pid; - + lag = ri->tsc - last_oldstate.tsc; - + old_offset = p2->tsc_skew.offset; - + cpumask_union(&p2->tsc_skew.downstream, &p->tsc_skew.downstream); cpumask_set(&p2->tsc_skew.downstream, p->pid); - + if(cpumask_isset(&p2->tsc_skew.downstream, p2->pid)) { if ( opt.tsc_loop_fatal ) { @@ -7293,22 +7293,22 @@ void sched_runstate_process(struct pcpu_info *p) goto no_update; } } - + p2->tsc_skew.offset += lag * 2; - + fprintf(warn, "TSC skew detected p%d->p%d, %lld cycles. Changing p%d offset from %lld to %lld\n", p->pid, p2->pid, lag, p2->pid, old_offset, p2->tsc_skew.offset); - + goto no_update; } else { fprintf(warn, "runstate_change old_runstate %s, d%dv%d runstate %s. Possible tsc skew.\n", runstate_name[sevt.old_runstate], v->d->did, v->vid, runstate_name[v->runstate.state]); - + v->runstate.last_oldstate.wrong = sevt.old_runstate; v->runstate.last_oldstate.actual = v->runstate.state; v->runstate.last_oldstate.tsc = ri->tsc; @@ -7324,7 +7324,7 @@ void sched_runstate_process(struct pcpu_info *p) fprintf(stderr, "FATAL: Logic hole in %s\n", __func__); error(ERR_ASSERT, NULL); } - + update: /* Actually update the runstate. Special things to do if we're starting * or stopping actually running on a physical cpu. */ @@ -7353,7 +7353,7 @@ update: v->p ? v->p->pid : -1); error(ERR_FILE, NULL); } - + runstate_update(v, RUNSTATE_RUNNING, ri->tsc); } } @@ -7365,10 +7365,10 @@ update: if(perfctrs && v->runstate.tsc) { unsigned long long run_cycles, run_instr; double cpi; - + //run_cycles = r->p1 - v->runstate_p1_start; run_cycles = ri->tsc - v->runstate.tsc; - run_instr = r->p2 - v->runstate.p2_start; + run_instr = r->p2 - v->runstate.p2_start; cpi = ((double)run_cycles) / run_instr; @@ -7376,12 +7376,12 @@ update: printf(" cpi: %2.2lf ( %lld / %lld )\n", cpi, run_cycles, run_instr); } - + if(opt.scatterplot_cpi && v->d->did == 1) printf("%lld,%2.2lf\n", ri->tsc, cpi); - if(opt.summary_info) + if(opt.summary_info) update_cpi(&v->cpi, run_instr, run_cycles); } #endif @@ -7412,7 +7412,7 @@ update: } else { vcpu_prev_update(v->p, v, ri->tsc, sevt.new_runstate); } - + if(P.lost_cpus && v->d->did != IDLE_DOMAIN) { if(opt.dump_all) fprintf(warn, "%s: %d lost cpus, setting d%dv%d runstate to RUNSTATE_LOST\n", @@ -7535,7 +7535,7 @@ void sched_summary_vcpu(struct vcpu_data *v) printf(" Runstates:\n"); for(i=0; irunstates+i, desc); if ( i==RUNSTATE_RUNNABLE ) { @@ -7543,7 +7543,7 @@ void sched_summary_vcpu(struct vcpu_data *v) for(j=0; jrunnable_states+j, desc); } } @@ -7564,7 +7564,7 @@ void sched_summary_domain(struct domain_data *d) printf(" Runstates:\n"); for(i=0; irunstates+i, desc); } } @@ -7657,7 +7657,7 @@ int p2m_canonical_order(int order) } else { order /= 9; } - return order; + return order; } void mem_pod_zero_reclaim_process(struct pcpu_info *p) @@ -7741,7 +7741,7 @@ void mem_pod_populate_process(struct pcpu_info *p) order = p2m_canonical_order(r->order); d->pod.populate_order[order]++; - } + } } } @@ -7791,7 +7791,7 @@ void mem_set_p2m_entry_process(struct pcpu_info *p) printf(" %s set_p2m_entry d%d o%d t %d g %llx m %llx\n", ri->dump_header, r->d, r->order, - r->p2mt, + r->p2mt, (unsigned long long)r->gfn, (unsigned long long)r->mfn); } } @@ -7865,7 +7865,7 @@ void mem_process(struct pcpu_info *p) { } break; } - + } /* ---- PM ---- */ @@ -7912,7 +7912,7 @@ void pm_process(struct pcpu_info *p) { } break; } - + } /* @@ -7965,7 +7965,7 @@ struct pci_dev * pdev_find(uint8_t bus, uint8_t devfn) n->bus=bus; n->devfn=devfn; - + /* Insert it into the list */ n->next = d; *q = n; @@ -8013,9 +8013,9 @@ void irq_process(struct pcpu_info *p) { if ( opt.scatterplot_irq ) { struct time_struct t; - + abs_cycles_to_time(ri->tsc, &t); - + printf("i%x %u.%09u %d\n", (unsigned)r->irq, t.s, t.ns, @@ -8051,7 +8051,7 @@ void irq_process(struct pcpu_info *p) { if( irq_table[r->irq].dev ) { struct pci_dev * pdev=irq_table[r->irq].dev; - + if(pdev->vector_used[r->vec]) fprintf(warn, " Vector collision on %02x.%02x!\n", pdev->bus, pdev->devfn); @@ -8088,7 +8088,7 @@ void irq_process(struct pcpu_info *p) { ri->dump_header, r->irq, r->vec, r->cpu); } - if ( r->irq < MAX_IRQ + if ( r->irq < MAX_IRQ && r->vec < MAX_VECTOR ) { if ( irq_table[r->irq].type == IRQ_MSI ) @@ -8100,7 +8100,7 @@ void irq_process(struct pcpu_info *p) { if ( irq_table[r->irq].dev ) { struct pci_dev * pdev=irq_table[r->irq].dev; - + if(!pdev->vector_used[r->vec]) fprintf(warn," Strange, cleanup on non-used vector\n"); pdev->vector_used[r->vec]=0; @@ -8159,7 +8159,7 @@ void dump_generic(FILE * f, struct record_info *ri) ri->event, ri->evt.main, ri->evt.sub, - ri->evt.minor, + ri->evt.minor, ri->extra_words); for(i=0; iextra_words; i++) { @@ -8186,7 +8186,7 @@ void dump_raw(char * s, struct record_info *ri) else printf(" "); } - + printf(" ] | "); for (i=0; i<8; i++) { @@ -8212,7 +8212,7 @@ int check_extra_words(struct record_info *ri, { static int off_by_one = 0; int expected_extra = expected_size / sizeof(unsigned int); - + if(ri->extra_words != expected_extra && !(off_by_one && ri->extra_words == expected_extra + 1) ) { @@ -8228,7 +8228,7 @@ int check_extra_words(struct record_info *ri, error(ERR_RECORD, ri); return 1; } - } + } return 0; } @@ -8330,7 +8330,7 @@ void process_lost_records(struct pcpu_info *p) #endif if ( p->current ) { - + hvm_vlapic_clear(&p->current->vlapic); if(p->current->data_type == VCPU_DATA_HVM) { p->current->hvm.vmexit_valid=0; @@ -8372,7 +8372,7 @@ void process_lost_records(struct pcpu_info *p) p->lost_record.active = 1; p->lost_record.tsc = first_tsc; pcpu_string_draw(p); - + { /* Any vcpu which is not actively running may be scheduled on the * lost cpu. To avoid mis-accounting, we need to reset */ @@ -8452,8 +8452,8 @@ void process_lost_records_end(struct pcpu_info *p) printf(" %s lost_records end (domain invalid)---\n", pcpu_string(p->pid)); } - - + + p->lost_record.active = 0; pcpu_string_draw(p); P.lost_cpus--; @@ -8516,7 +8516,7 @@ loff_t scan_for_new_pcpu(loff_t offset) { ssize_t r; struct trace_record rec; struct cpu_change_data *cd; - + r=__read_record(&rec, offset); if(r==0) @@ -8539,7 +8539,7 @@ loff_t scan_for_new_pcpu(loff_t offset) { /* FIXME: Figure out if we could handle this more gracefully */ error(ERR_ASSERT, NULL); } - + if(cd->cpu > P.max_active_pcpu || !P.pcpu[cd->cpu].active) { struct pcpu_info *p = P.pcpu + cd->cpu; @@ -8570,7 +8570,7 @@ loff_t scan_for_new_pcpu(loff_t offset) { } } -/* +/* * Conceptually, when we reach a cpu_change record that's not for our pcpu, * we want to scan forward through the file until we reach one that's for us. * However, looping through involves reading the file, which we'd rather @@ -8625,7 +8625,7 @@ void deactivate_pcpu(struct pcpu_info *p) fprintf(warn, "%s: Setting max_active_pcpu to %d\n", __func__, max_active_pcpu); } - + } /* Helper function to process tsc-related record info */ @@ -8690,11 +8690,11 @@ void create_dump_header(struct record_info *ri, struct pcpu_info *p) c+=r; len-=r; } - + r = snprintf(c, len, " %s", pcpu_string(ri->cpu)); c+=r; len-=r; - + if ( p->current ) { r = snprintf(c, len, " d%dv%d", p->current->d->did, p->current->vid); @@ -8733,7 +8733,7 @@ int find_toplevel_event(struct record_info *ri) return toplevel; } - + void process_cpu_change(struct pcpu_info *p) { struct record_info *ri = &p->ri; @@ -8785,7 +8785,7 @@ void process_cpu_change(struct pcpu_info *p) { fprintf(warn, "%s: Activating pcpu %d at offset %lld\n", __func__, r->cpu, (unsigned long long)p->file_offset); - + record_order_insert(p2); sched_default_vcpu_activate(p2); @@ -8806,7 +8806,7 @@ void process_cpu_change(struct pcpu_info *p) { __func__, p->pid, (unsigned long long)P.last_epoch_offset); deactivate_pcpu(p); } - } + } else { /* Track information about dom0 scheduling and records */ @@ -8820,7 +8820,7 @@ void process_cpu_change(struct pcpu_info *p) { p->volume.buffer_dom0_runstate_tsc; p->volume.buffer_dom0_runstate_cycles[p->volume.buffer_dom0_runstate] += ri->tsc - cycles; - + printf(" - updated p%d dom0_runstate %s to %lld cycles (+%lld)\n", p->pid, runstate_name[p->volume.buffer_dom0_runstate], p->volume.buffer_dom0_runstate_cycles[p->volume.buffer_dom0_runstate], @@ -8951,7 +8951,7 @@ void process_record(struct pcpu_info *p) { process_record_tsc(p->order_tsc, ri); - if(opt.dump_all) + if(opt.dump_all) create_dump_header(ri, p); @@ -9003,9 +9003,9 @@ void process_record(struct pcpu_info *p) { static inline ssize_t get_rec_size(struct trace_record *rec) { ssize_t s; - + s = sizeof(uint32_t); - + if(rec->cycle_flag) s += sizeof(tsc_t); @@ -9032,7 +9032,7 @@ void progress_init(void) { if(!(pid = fork())) { progress_child_exec(); - + fprintf(stderr, "%s: exec failed (%s), disabling progress bar\n", __func__, strerror(errno)); opt.progress = 0; @@ -9202,7 +9202,7 @@ ssize_t read_record(struct pcpu_info * p) { * - Updating the current one * * FIXME: Need to deal with pcpu states changing... - * + * * WARNING not thread-safe */ @@ -9233,7 +9233,7 @@ char * pcpu_string(int pcpu) { char *s = __pcpu_string; static int max_active_pcpu=-1, last_pcpu=-1; - + assert(P.max_active_pcpu < MAX_CPUS); assert(pcpu <= P.max_active_pcpu); @@ -9243,7 +9243,7 @@ char * pcpu_string(int pcpu) if(P.max_active_pcpu > max_active_pcpu) { int i; - for(i=max_active_pcpu + 1; i<= P.max_active_pcpu; i++) + for(i=max_active_pcpu + 1; i<= P.max_active_pcpu; i++) pcpu_string_draw(P.pcpu+i); max_active_pcpu=P.max_active_pcpu; } @@ -9338,7 +9338,7 @@ void record_order_remove(struct pcpu_info *rem) assert(record_order[i]); /* And move everyone forward */ - for(; (record_order[i]=record_order[i+1]); i++) + for(; (record_order[i]=record_order[i+1]); i++) ; } @@ -9410,7 +9410,7 @@ void domain_summary(void) if(opt.show_default_domain_summary) { d = &default_domain; printf("|-- Default domain --|\n"); - + for( i = 0; i < MAX_CPUS ; i++ ) { if(d->vcpu[i]) @@ -9475,7 +9475,7 @@ void report_pcpu(void) { if(!p->summary) continue; printf("pcpu %d\n", i); - + print_cycle_summary(&p->time.running, " running"); print_cycle_summary(&p->time.idle, " idle"); print_cycle_summary(&p->time.lost, " lost"); @@ -9484,7 +9484,7 @@ void report_pcpu(void) { active++; } printf("Total active cpus: %d\n", active); - + } void init_pcpus(void) { @@ -9592,7 +9592,7 @@ enum { void parse_cpu_hz(char * arg) { float hz_base; char * next_ptr; - + hz_base=strtof(arg, &next_ptr); if(next_ptr == arg) { fprintf(stderr, "Invalid cpu_hz %s\n", arg); @@ -9888,7 +9888,7 @@ error_t cmd_parser(int key, char *arg, struct argp_state *state) opt.with_cr3_enumeration = 1; G.output_defined = 1; break; - + case OPT_INTERVAL_CR3_SCHEDULE_ORDERED: opt.interval.output = INTERVAL_CR3_SCHEDULE_ORDERED; opt.interval.check = INTERVAL_CHECK_CR3; @@ -9938,7 +9938,7 @@ error_t cmd_parser(int key, char *arg, struct argp_state *state) opt.summary_info = 1; G.output_defined = 1; break; - + case OPT_INTERVAL_DOMAIN_SHORT_SUMMARY: { if((parse_array(arg, &opt.interval.array) < 0) @@ -9998,7 +9998,7 @@ error_t cmd_parser(int key, char *arg, struct argp_state *state) char *inval; opt.default_guest_paging_levels = (int)strtol(arg, &inval, 0); if ( inval == arg ) - argp_usage(state); + argp_usage(state); } break; case OPT_SYMBOL_FILE: @@ -10291,19 +10291,19 @@ const struct argp_option cmd_opts[] = { .key = OPT_SUMMARY, .group = OPT_GROUP_SUMMARY, .doc = "Output a summary", }, - + { .name = "report-pcpu", .key = OPT_REPORT_PCPU, .group = OPT_GROUP_SUMMARY, .doc = "Report utilization for pcpus", }, - + /* Guest info */ { .name = "default-guest-paging-levels", .key = OPT_DEFAULT_GUEST_PAGING_LEVELS, .group = OPT_GROUP_GUEST, .arg = "L", .doc = "Default guest paging levels. Mainly necessary for Rio, as Miami traces include guest paging levels where appropriate.", }, - + { .name = "symbol-file", .key = OPT_SYMBOL_FILE, .group = OPT_GROUP_GUEST, @@ -10376,7 +10376,7 @@ int main(int argc, char *argv[]) { if(opt.dump_all) warn = stdout; - + init_pcpus(); if(opt.progress) @@ -10395,7 +10395,7 @@ int main(int argc, char *argv[]) { if(opt.progress) progress_finish(); - + 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 Wed Jun 17 18:26:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2k-0005tA-W9; Wed, 17 Jun 2015 18:26:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2j-0005sR-IO for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:33 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 14/86-12923-7DBB1855; Wed, 17 Jun 2015 18:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565590!7400678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11998 invoked from network); 17 Jun 2015 18:26:31 -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; 17 Jun 2015 18:26:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2g-0002Gi-93 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2g-00074i-4B for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:30 +0000 Date: Wed, 17 Jun 2015 18:26:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: remove argp_program_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 c43b206544b1ef9cfef630d03ca7bce5f9647876 Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:44 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:28 2015 +0100 xenalyze: remove argp_program_version Since xenalyze is now upstream its Open Source and part of the given release. Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 70f0db0..a8e73eb 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -10346,7 +10346,6 @@ const struct argp parser_def = { .doc = "", }; -const char *argp_program_version = "xenalyze - Open-source xen-unstable (3.4)"; const char *argp_program_bug_address = "George Dunlap "; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:26:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2k-0005tA-W9; Wed, 17 Jun 2015 18:26:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2j-0005sR-IO for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:33 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 14/86-12923-7DBB1855; Wed, 17 Jun 2015 18:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1434565590!7400678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11998 invoked from network); 17 Jun 2015 18:26:31 -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; 17 Jun 2015 18:26:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2g-0002Gi-93 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2g-00074i-4B for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:30 +0000 Date: Wed, 17 Jun 2015 18:26:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenalyze: remove argp_program_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 c43b206544b1ef9cfef630d03ca7bce5f9647876 Author: Olaf Hering AuthorDate: Thu Jun 11 16:30:44 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jun 16 11:35:28 2015 +0100 xenalyze: remove argp_program_version Since xenalyze is now upstream its Open Source and part of the given release. Signed-off-by: Olaf Hering Acked-by: George Dunlap Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/xentrace/xenalyze.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 70f0db0..a8e73eb 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -10346,7 +10346,6 @@ const struct argp parser_def = { .doc = "", }; -const char *argp_program_version = "xenalyze - Open-source xen-unstable (3.4)"; const char *argp_program_bug_address = "George Dunlap "; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:26:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2v-0005wQ-2O; Wed, 17 Jun 2015 18:26:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2u-0005vv-3w for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:44 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 29/BB-32733-3EBB1855; Wed, 17 Jun 2015 18:26:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565601!24309770!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3592 invoked from network); 17 Jun 2015 18:26:42 -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; 17 Jun 2015 18:26:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2r-0002Gt-Jf for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2r-00076H-Bz for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:41 +0000 Date: Wed, 17 Jun 2015 18:26:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: eliminate several explicit version checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed48c2c71c85b00b4ed5af7acce98a7afd08523f Author: Jan Beulich AuthorDate: Tue Jun 16 12:24:49 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:24:49 2015 +0200 gnttab: eliminate several explicit version checks By having nr_grant_entries() return zero when the grant table version is still unset we can reduce the number of error paths and at once fix grant_map_exists() running into the being removed ASSERT() when called for a page owned by a domain not having its grant table set up yet. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 51 ++++++++++++--------------------------------- 1 files changed, 14 insertions(+), 37 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e134f13..8294562 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -344,11 +344,15 @@ get_maptrack_handle( /* Number of grant table entries. Caller must hold d's grant table lock. */ static unsigned int nr_grant_entries(struct grant_table *gt) { - ASSERT(gt->gt_version != 0); - if (gt->gt_version == 1) + switch ( gt->gt_version ) + { + case 1: return (nr_grant_frames(gt) << PAGE_SHIFT) / sizeof(grant_entry_v1_t); - else + case 2: return (nr_grant_frames(gt) << PAGE_SHIFT) / sizeof(grant_entry_v2_t); + } + + return 0; } static int _set_status_v1(domid_t domid, @@ -668,10 +672,6 @@ __gnttab_map_grant_ref( rgt = rd->grant_table; read_lock(&rgt->lock); - if ( rgt->gt_version == 0 ) - PIN_FAIL(unlock_out, GNTST_general_error, - "remote grant table not yet set up\n"); - /* Bounds check on the grant ref */ if ( unlikely(op->ref >= nr_grant_entries(rgt))) PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref (%d).\n", op->ref); @@ -1570,14 +1570,6 @@ gnttab_prepare_for_transfer( read_lock(&rgt->lock); - if ( rgt->gt_version == 0 ) - { - gdprintk(XENLOG_INFO, - "Grant table not ready for transfer to domain(%d).\n", - rd->domain_id); - goto fail; - } - if ( unlikely(ref >= nr_grant_entries(rgt)) ) { gdprintk(XENLOG_INFO, @@ -1977,10 +1969,6 @@ __acquire_grant_for_copy( read_lock(&rgt->lock); - if ( rgt->gt_version == 0 ) - PIN_FAIL(gt_unlock_out, GNTST_general_error, - "remote grant table not ready\n"); - if ( unlikely(gref >= nr_grant_entries(rgt)) ) PIN_FAIL(gt_unlock_out, GNTST_bad_gntref, "Bad grant reference %ld\n", gref); @@ -2482,19 +2470,15 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) change the version number, except for the first 8 entries which are allowed to be in use (xenstore/xenconsole keeps them mapped). (You need to change the version number for e.g. kexec.) */ - if ( gt->gt_version != 0 ) + for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) { - for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) + if ( read_atomic(&_active_entry(gt, i).pin) != 0 ) { - if ( read_atomic(&_active_entry(gt, i).pin) != 0 ) - { - gdprintk(XENLOG_WARNING, - "tried to change grant table version from %d to %d, but some grant entries still in use\n", - gt->gt_version, - op.version); - res = -EBUSY; - goto out_unlock; - } + gdprintk(XENLOG_WARNING, + "tried to change grant table version from %u to %u, but some grant entries still in use\n", + gt->gt_version, op.version); + res = -EBUSY; + goto out_unlock; } } @@ -2679,9 +2663,6 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) write_lock(>->lock); - if ( gt->gt_version == 0 ) - PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); - /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); @@ -3264,9 +3245,6 @@ static void gnttab_usage_print(struct domain *rd) read_lock(>->lock); - if ( gt->gt_version == 0 ) - goto out; - for ( ref = 0; ref != nr_grant_entries(gt); ref++ ) { struct active_grant_entry *act; @@ -3314,7 +3292,6 @@ static void gnttab_usage_print(struct domain *rd) active_entry_release(act); } - out: read_unlock(>->lock); if ( first ) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:26:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:26: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 1Z5I2v-0005wQ-2O; Wed, 17 Jun 2015 18:26:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2u-0005vv-3w for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:44 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 29/BB-32733-3EBB1855; Wed, 17 Jun 2015 18:26:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565601!24309770!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3592 invoked from network); 17 Jun 2015 18:26:42 -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; 17 Jun 2015 18:26:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I2r-0002Gt-Jf for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I2r-00076H-Bz for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:41 +0000 Date: Wed, 17 Jun 2015 18:26:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: eliminate several explicit version checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed48c2c71c85b00b4ed5af7acce98a7afd08523f Author: Jan Beulich AuthorDate: Tue Jun 16 12:24:49 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:24:49 2015 +0200 gnttab: eliminate several explicit version checks By having nr_grant_entries() return zero when the grant table version is still unset we can reduce the number of error paths and at once fix grant_map_exists() running into the being removed ASSERT() when called for a page owned by a domain not having its grant table set up yet. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 51 ++++++++++++--------------------------------- 1 files changed, 14 insertions(+), 37 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e134f13..8294562 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -344,11 +344,15 @@ get_maptrack_handle( /* Number of grant table entries. Caller must hold d's grant table lock. */ static unsigned int nr_grant_entries(struct grant_table *gt) { - ASSERT(gt->gt_version != 0); - if (gt->gt_version == 1) + switch ( gt->gt_version ) + { + case 1: return (nr_grant_frames(gt) << PAGE_SHIFT) / sizeof(grant_entry_v1_t); - else + case 2: return (nr_grant_frames(gt) << PAGE_SHIFT) / sizeof(grant_entry_v2_t); + } + + return 0; } static int _set_status_v1(domid_t domid, @@ -668,10 +672,6 @@ __gnttab_map_grant_ref( rgt = rd->grant_table; read_lock(&rgt->lock); - if ( rgt->gt_version == 0 ) - PIN_FAIL(unlock_out, GNTST_general_error, - "remote grant table not yet set up\n"); - /* Bounds check on the grant ref */ if ( unlikely(op->ref >= nr_grant_entries(rgt))) PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref (%d).\n", op->ref); @@ -1570,14 +1570,6 @@ gnttab_prepare_for_transfer( read_lock(&rgt->lock); - if ( rgt->gt_version == 0 ) - { - gdprintk(XENLOG_INFO, - "Grant table not ready for transfer to domain(%d).\n", - rd->domain_id); - goto fail; - } - if ( unlikely(ref >= nr_grant_entries(rgt)) ) { gdprintk(XENLOG_INFO, @@ -1977,10 +1969,6 @@ __acquire_grant_for_copy( read_lock(&rgt->lock); - if ( rgt->gt_version == 0 ) - PIN_FAIL(gt_unlock_out, GNTST_general_error, - "remote grant table not ready\n"); - if ( unlikely(gref >= nr_grant_entries(rgt)) ) PIN_FAIL(gt_unlock_out, GNTST_bad_gntref, "Bad grant reference %ld\n", gref); @@ -2482,19 +2470,15 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) change the version number, except for the first 8 entries which are allowed to be in use (xenstore/xenconsole keeps them mapped). (You need to change the version number for e.g. kexec.) */ - if ( gt->gt_version != 0 ) + for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) { - for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) + if ( read_atomic(&_active_entry(gt, i).pin) != 0 ) { - if ( read_atomic(&_active_entry(gt, i).pin) != 0 ) - { - gdprintk(XENLOG_WARNING, - "tried to change grant table version from %d to %d, but some grant entries still in use\n", - gt->gt_version, - op.version); - res = -EBUSY; - goto out_unlock; - } + gdprintk(XENLOG_WARNING, + "tried to change grant table version from %u to %u, but some grant entries still in use\n", + gt->gt_version, op.version); + res = -EBUSY; + goto out_unlock; } } @@ -2679,9 +2663,6 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) write_lock(>->lock); - if ( gt->gt_version == 0 ) - PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n"); - /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); @@ -3264,9 +3245,6 @@ static void gnttab_usage_print(struct domain *rd) read_lock(>->lock); - if ( gt->gt_version == 0 ) - goto out; - for ( ref = 0; ref != nr_grant_entries(gt); ref++ ) { struct active_grant_entry *act; @@ -3314,7 +3292,6 @@ static void gnttab_usage_print(struct domain *rd) active_entry_release(act); } - out: read_unlock(>->lock); if ( first ) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:26:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I36-00060M-51; Wed, 17 Jun 2015 18:26:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I34-0005zp-Fs for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:54 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 12/DD-31650-DEBB1855; Wed, 17 Jun 2015 18:26:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565611!24309803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4283 invoked from network); 17 Jun 2015 18:26:52 -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; 17 Jun 2015 18:26:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I31-0002H5-Od for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I31-00076d-Ne for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:51 +0000 Date: Wed, 17 Jun 2015 18:26:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: limit mapcount() looping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f90cce7cfc13ef87f2262196f999741e7851450 Author: Jan Beulich AuthorDate: Tue Jun 16 12:25:35 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:25:35 2015 +0200 gnttab: limit mapcount() looping The function doesn't need to return counts in the first place; all its callers are after is whether at least one entry of a certain kind exists. With that there's no point for that loop to continue once the looked for condition was found to be met by one entry. Rename the function to match the changed behavior. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 8294562..f97539f 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -253,7 +253,7 @@ static inline void double_gt_lock(struct grant_table *lgt, struct grant_table *rgt) { /* - * See mapcount() for why the write lock is also required for the + * See mapkind() for why the write lock is also required for the * remote domain. */ if ( lgt < rgt ) @@ -566,14 +566,14 @@ static int grant_map_exists(const struct domain *ld, return -EINVAL; } -static void mapcount( - struct grant_table *lgt, struct domain *rd, unsigned long mfn, - unsigned int *wrc, unsigned int *rdc) +#define MAPKIND_READ 1 +#define MAPKIND_WRITE 2 +static unsigned int mapkind( + struct grant_table *lgt, const struct domain *rd, unsigned long mfn) { struct grant_mapping *map; grant_handle_t handle; - - *wrc = *rdc = 0; + unsigned int kind = 0; /* * Must have the local domain's grant table write lock when @@ -586,15 +586,19 @@ static void mapcount( */ ASSERT(rw_is_write_locked(&rd->grant_table->lock)); - for ( handle = 0; handle < lgt->maptrack_limit; handle++ ) + for ( handle = 0; !(kind & MAPKIND_WRITE) && + handle < lgt->maptrack_limit; handle++ ) { map = &maptrack_entry(lgt, handle); if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) || map->domid != rd->domain_id ) continue; if ( _active_entry(rd->grant_table, map->ref).frame == mfn ) - (map->flags & GNTMAP_readonly) ? (*rdc)++ : (*wrc)++; + kind |= map->flags & GNTMAP_readonly ? + MAPKIND_READ : MAPKIND_WRITE; } + + return kind; } /* @@ -819,24 +823,24 @@ __gnttab_map_grant_ref( need_iommu = gnttab_need_iommu_mapping(ld); if ( need_iommu ) { - unsigned int wrc, rdc; + unsigned int kind; int err = 0; double_gt_lock(lgt, rgt); /* We're not translated, so we know that gmfns and mfns are the same things, so the IOMMU entry is always 1-to-1. */ - mapcount(lgt, rd, frame, &wrc, &rdc); + kind = mapkind(lgt, rd, frame); if ( (act_pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) && !(old_pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) ) { - if ( wrc == 0 ) + if ( !(kind & MAPKIND_WRITE) ) err = iommu_map_page(ld, frame, frame, IOMMUF_readable|IOMMUF_writable); } else if ( act_pin && !old_pin ) { - if ( (wrc + rdc) == 0 ) + if ( !kind ) err = iommu_map_page(ld, frame, frame, IOMMUF_readable); } if ( err ) @@ -1050,15 +1054,15 @@ __gnttab_unmap_common( if ( rc == GNTST_okay && gnttab_need_iommu_mapping(ld) ) { - unsigned int wrc, rdc; + unsigned int kind; int err = 0; double_gt_lock(lgt, rgt); - mapcount(lgt, rd, op->frame, &wrc, &rdc); - if ( (wrc + rdc) == 0 ) + kind = mapkind(lgt, rd, op->frame); + if ( !kind ) err = iommu_unmap_page(ld, op->frame); - else if ( wrc == 0 ) + else if ( !(kind & MAPKIND_WRITE) ) err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); double_gt_unlock(lgt, rgt); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:26:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18: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 1Z5I36-00060M-51; Wed, 17 Jun 2015 18:26:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I34-0005zp-Fs for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:54 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 12/DD-31650-DEBB1855; Wed, 17 Jun 2015 18:26:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565611!24309803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4283 invoked from network); 17 Jun 2015 18:26:52 -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; 17 Jun 2015 18:26:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I31-0002H5-Od for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I31-00076d-Ne for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:26:51 +0000 Date: Wed, 17 Jun 2015 18:26:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: limit mapcount() looping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f90cce7cfc13ef87f2262196f999741e7851450 Author: Jan Beulich AuthorDate: Tue Jun 16 12:25:35 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:25:35 2015 +0200 gnttab: limit mapcount() looping The function doesn't need to return counts in the first place; all its callers are after is whether at least one entry of a certain kind exists. With that there's no point for that loop to continue once the looked for condition was found to be met by one entry. Rename the function to match the changed behavior. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 8294562..f97539f 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -253,7 +253,7 @@ static inline void double_gt_lock(struct grant_table *lgt, struct grant_table *rgt) { /* - * See mapcount() for why the write lock is also required for the + * See mapkind() for why the write lock is also required for the * remote domain. */ if ( lgt < rgt ) @@ -566,14 +566,14 @@ static int grant_map_exists(const struct domain *ld, return -EINVAL; } -static void mapcount( - struct grant_table *lgt, struct domain *rd, unsigned long mfn, - unsigned int *wrc, unsigned int *rdc) +#define MAPKIND_READ 1 +#define MAPKIND_WRITE 2 +static unsigned int mapkind( + struct grant_table *lgt, const struct domain *rd, unsigned long mfn) { struct grant_mapping *map; grant_handle_t handle; - - *wrc = *rdc = 0; + unsigned int kind = 0; /* * Must have the local domain's grant table write lock when @@ -586,15 +586,19 @@ static void mapcount( */ ASSERT(rw_is_write_locked(&rd->grant_table->lock)); - for ( handle = 0; handle < lgt->maptrack_limit; handle++ ) + for ( handle = 0; !(kind & MAPKIND_WRITE) && + handle < lgt->maptrack_limit; handle++ ) { map = &maptrack_entry(lgt, handle); if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) || map->domid != rd->domain_id ) continue; if ( _active_entry(rd->grant_table, map->ref).frame == mfn ) - (map->flags & GNTMAP_readonly) ? (*rdc)++ : (*wrc)++; + kind |= map->flags & GNTMAP_readonly ? + MAPKIND_READ : MAPKIND_WRITE; } + + return kind; } /* @@ -819,24 +823,24 @@ __gnttab_map_grant_ref( need_iommu = gnttab_need_iommu_mapping(ld); if ( need_iommu ) { - unsigned int wrc, rdc; + unsigned int kind; int err = 0; double_gt_lock(lgt, rgt); /* We're not translated, so we know that gmfns and mfns are the same things, so the IOMMU entry is always 1-to-1. */ - mapcount(lgt, rd, frame, &wrc, &rdc); + kind = mapkind(lgt, rd, frame); if ( (act_pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) && !(old_pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) ) { - if ( wrc == 0 ) + if ( !(kind & MAPKIND_WRITE) ) err = iommu_map_page(ld, frame, frame, IOMMUF_readable|IOMMUF_writable); } else if ( act_pin && !old_pin ) { - if ( (wrc + rdc) == 0 ) + if ( !kind ) err = iommu_map_page(ld, frame, frame, IOMMUF_readable); } if ( err ) @@ -1050,15 +1054,15 @@ __gnttab_unmap_common( if ( rc == GNTST_okay && gnttab_need_iommu_mapping(ld) ) { - unsigned int wrc, rdc; + unsigned int kind; int err = 0; double_gt_lock(lgt, rgt); - mapcount(lgt, rd, op->frame, &wrc, &rdc); - if ( (wrc + rdc) == 0 ) + kind = mapkind(lgt, rd, op->frame); + if ( !kind ) err = iommu_unmap_page(ld, op->frame); - else if ( wrc == 0 ) + else if ( !(kind & MAPKIND_WRITE) ) err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); double_gt_unlock(lgt, rgt); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3J-000659-7l; Wed, 17 Jun 2015 18:27:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3H-00063f-N1 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:07 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id A0/6A-18947-BFBB1855; Wed, 17 Jun 2015 18:27:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565625!24309846!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5979 invoked from network); 17 Jun 2015 18:27:06 -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; 17 Jun 2015 18:27:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3C-0002Hj-43 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3B-000770-T1 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:01 +0000 Date: Wed, 17 Jun 2015 18:27:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: simplify shared entry v1 vs v2 handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f4c73bad0896f8cf6f9d9ca6754f0dda1d00ca03 Author: Jan Beulich AuthorDate: Tue Jun 16 12:26:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:26:03 2015 +0200 gnttab: simplify shared entry v1 vs v2 handling In a number of places both v1 and v2 pointers are being obtained when none or just one suffices. Additionally in __acquire_grant_for_copy() the flow of if/else-if can be slightly improved by re-ordering. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 53 ++++++++++++++++----------------------------- 1 files changed, 19 insertions(+), 34 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index f97539f..951f651 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -624,8 +624,6 @@ __gnttab_map_grant_ref( unsigned int cache_flags; struct active_grant_entry *act = NULL; struct grant_mapping *mt; - grant_entry_v1_t *sha1; - grant_entry_v2_t *sha2; grant_entry_header_t *shah; uint16_t *status; bool_t need_iommu; @@ -682,15 +680,7 @@ __gnttab_map_grant_ref( act = active_entry_acquire(rgt, op->ref); shah = shared_entry_header(rgt, op->ref); - if (rgt->gt_version == 1) { - sha1 = &shared_entry_v1(rgt, op->ref); - sha2 = NULL; - status = &shah->flags; - } else { - sha2 = &shared_entry_v2(rgt, op->ref); - sha1 = NULL; - status = &status_entry(rgt, op->ref); - } + status = rgt->gt_version == 1 ? &shah->flags : &status_entry(rgt, op->ref); /* If already pinned, check the active domid and avoid refcnt overflow. */ if ( act->pin && @@ -713,8 +703,10 @@ __gnttab_map_grant_ref( if ( !act->pin ) { unsigned long frame; + unsigned long gfn = rgt->gt_version == 1 ? + shared_entry_v1(rgt, op->ref).frame : + shared_entry_v2(rgt, op->ref).full_page.frame; - unsigned long gfn = sha1 ? sha1->frame : sha2->full_page.frame; rc = __get_paged_frame(gfn, &frame, &pg, !!(op->flags & GNTMAP_readonly), rd); if ( rc != GNTST_okay ) @@ -1954,7 +1946,6 @@ __acquire_grant_for_copy( uint16_t *page_off, uint16_t *length, unsigned allow_transitive) { struct grant_table *rgt = rd->grant_table; - grant_entry_v1_t *sha1; grant_entry_v2_t *sha2; grant_entry_header_t *shah; struct active_grant_entry *act; @@ -1981,13 +1972,11 @@ __acquire_grant_for_copy( shah = shared_entry_header(rgt, gref); if ( rgt->gt_version == 1 ) { - sha1 = &shared_entry_v1(rgt, gref); sha2 = NULL; status = &shah->flags; } else { - sha1 = NULL; sha2 = &shared_entry_v2(rgt, gref); status = &status_entry(rgt, gref); } @@ -2009,7 +1998,19 @@ __acquire_grant_for_copy( td = rd; trans_gref = gref; - if ( sha2 && (shah->flags & GTF_type_mask) == GTF_transitive ) + if ( !sha2 ) + { + unsigned long gfn = shared_entry_v1(rgt, gref).frame; + + rc = __get_paged_frame(gfn, &grant_frame, page, readonly, rd); + if ( rc != GNTST_okay ) + goto unlock_out_clear; + act->gfn = gfn; + is_sub_page = 0; + trans_page_off = 0; + trans_length = PAGE_SIZE; + } + else if ( (shah->flags & GTF_type_mask) == GTF_transitive ) { if ( !allow_transitive ) PIN_FAIL(unlock_out_clear, GNTST_general_error, @@ -2082,16 +2083,6 @@ __acquire_grant_for_copy( is_sub_page = 1; act->gfn = -1ul; } - else if ( sha1 ) - { - rc = __get_paged_frame(sha1->frame, &grant_frame, page, readonly, rd); - if ( rc != GNTST_okay ) - goto unlock_out_clear; - act->gfn = sha1->frame; - is_sub_page = 0; - trans_page_off = 0; - trans_length = PAGE_SIZE; - } else if ( !(sha2->hdr.flags & GTF_sub_page) ) { rc = __get_paged_frame(sha2->full_page.frame, &grant_frame, page, readonly, rd); @@ -3253,8 +3244,6 @@ static void gnttab_usage_print(struct domain *rd) { struct active_grant_entry *act; struct grant_entry_header *sha; - grant_entry_v1_t *sha1; - grant_entry_v2_t *sha2; uint16_t status; uint64_t frame; @@ -3269,16 +3258,12 @@ static void gnttab_usage_print(struct domain *rd) if ( gt->gt_version == 1 ) { - sha1 = &shared_entry_v1(gt, ref); - sha2 = NULL; status = sha->flags; - frame = sha1->frame; + frame = shared_entry_v1(gt, ref).frame; } else { - sha2 = &shared_entry_v2(gt, ref); - sha1 = NULL; - frame = sha2->full_page.frame; + frame = shared_entry_v2(gt, ref).full_page.frame; status = status_entry(gt, ref); } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3J-000659-7l; Wed, 17 Jun 2015 18:27:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3H-00063f-N1 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:07 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id A0/6A-18947-BFBB1855; Wed, 17 Jun 2015 18:27:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1434565625!24309846!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5979 invoked from network); 17 Jun 2015 18:27:06 -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; 17 Jun 2015 18:27:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3C-0002Hj-43 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3B-000770-T1 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:01 +0000 Date: Wed, 17 Jun 2015 18:27:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: simplify shared entry v1 vs v2 handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f4c73bad0896f8cf6f9d9ca6754f0dda1d00ca03 Author: Jan Beulich AuthorDate: Tue Jun 16 12:26:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:26:03 2015 +0200 gnttab: simplify shared entry v1 vs v2 handling In a number of places both v1 and v2 pointers are being obtained when none or just one suffices. Additionally in __acquire_grant_for_copy() the flow of if/else-if can be slightly improved by re-ordering. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 53 ++++++++++++++++----------------------------- 1 files changed, 19 insertions(+), 34 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index f97539f..951f651 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -624,8 +624,6 @@ __gnttab_map_grant_ref( unsigned int cache_flags; struct active_grant_entry *act = NULL; struct grant_mapping *mt; - grant_entry_v1_t *sha1; - grant_entry_v2_t *sha2; grant_entry_header_t *shah; uint16_t *status; bool_t need_iommu; @@ -682,15 +680,7 @@ __gnttab_map_grant_ref( act = active_entry_acquire(rgt, op->ref); shah = shared_entry_header(rgt, op->ref); - if (rgt->gt_version == 1) { - sha1 = &shared_entry_v1(rgt, op->ref); - sha2 = NULL; - status = &shah->flags; - } else { - sha2 = &shared_entry_v2(rgt, op->ref); - sha1 = NULL; - status = &status_entry(rgt, op->ref); - } + status = rgt->gt_version == 1 ? &shah->flags : &status_entry(rgt, op->ref); /* If already pinned, check the active domid and avoid refcnt overflow. */ if ( act->pin && @@ -713,8 +703,10 @@ __gnttab_map_grant_ref( if ( !act->pin ) { unsigned long frame; + unsigned long gfn = rgt->gt_version == 1 ? + shared_entry_v1(rgt, op->ref).frame : + shared_entry_v2(rgt, op->ref).full_page.frame; - unsigned long gfn = sha1 ? sha1->frame : sha2->full_page.frame; rc = __get_paged_frame(gfn, &frame, &pg, !!(op->flags & GNTMAP_readonly), rd); if ( rc != GNTST_okay ) @@ -1954,7 +1946,6 @@ __acquire_grant_for_copy( uint16_t *page_off, uint16_t *length, unsigned allow_transitive) { struct grant_table *rgt = rd->grant_table; - grant_entry_v1_t *sha1; grant_entry_v2_t *sha2; grant_entry_header_t *shah; struct active_grant_entry *act; @@ -1981,13 +1972,11 @@ __acquire_grant_for_copy( shah = shared_entry_header(rgt, gref); if ( rgt->gt_version == 1 ) { - sha1 = &shared_entry_v1(rgt, gref); sha2 = NULL; status = &shah->flags; } else { - sha1 = NULL; sha2 = &shared_entry_v2(rgt, gref); status = &status_entry(rgt, gref); } @@ -2009,7 +1998,19 @@ __acquire_grant_for_copy( td = rd; trans_gref = gref; - if ( sha2 && (shah->flags & GTF_type_mask) == GTF_transitive ) + if ( !sha2 ) + { + unsigned long gfn = shared_entry_v1(rgt, gref).frame; + + rc = __get_paged_frame(gfn, &grant_frame, page, readonly, rd); + if ( rc != GNTST_okay ) + goto unlock_out_clear; + act->gfn = gfn; + is_sub_page = 0; + trans_page_off = 0; + trans_length = PAGE_SIZE; + } + else if ( (shah->flags & GTF_type_mask) == GTF_transitive ) { if ( !allow_transitive ) PIN_FAIL(unlock_out_clear, GNTST_general_error, @@ -2082,16 +2083,6 @@ __acquire_grant_for_copy( is_sub_page = 1; act->gfn = -1ul; } - else if ( sha1 ) - { - rc = __get_paged_frame(sha1->frame, &grant_frame, page, readonly, rd); - if ( rc != GNTST_okay ) - goto unlock_out_clear; - act->gfn = sha1->frame; - is_sub_page = 0; - trans_page_off = 0; - trans_length = PAGE_SIZE; - } else if ( !(sha2->hdr.flags & GTF_sub_page) ) { rc = __get_paged_frame(sha2->full_page.frame, &grant_frame, page, readonly, rd); @@ -3253,8 +3244,6 @@ static void gnttab_usage_print(struct domain *rd) { struct active_grant_entry *act; struct grant_entry_header *sha; - grant_entry_v1_t *sha1; - grant_entry_v2_t *sha2; uint16_t status; uint64_t frame; @@ -3269,16 +3258,12 @@ static void gnttab_usage_print(struct domain *rd) if ( gt->gt_version == 1 ) { - sha1 = &shared_entry_v1(gt, ref); - sha2 = NULL; status = sha->flags; - frame = sha1->frame; + frame = shared_entry_v1(gt, ref).frame; } else { - sha2 = &shared_entry_v2(gt, ref); - sha1 = NULL; - frame = sha2->full_page.frame; + frame = shared_entry_v2(gt, ref).full_page.frame; status = status_entry(gt, ref); } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3T-00068F-AP; Wed, 17 Jun 2015 18:27:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3R-00067v-U7 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:18 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id B3/EB-00727-50CB1855; Wed, 17 Jun 2015 18:27:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1434565635!17224709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14532 invoked from network); 17 Jun 2015 18:27:16 -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; 17 Jun 2015 18:27:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3P-0002Hr-CQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3P-000783-8O for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:15 +0000 Date: Wed, 17 Jun 2015 18:27:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: simplify page copying/clearing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1549a9dac132d00a1e4a011e0c4e6ea5b42d23b8 Author: Jan Beulich AuthorDate: Tue Jun 16 12:26:35 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:26:35 2015 +0200 gnttab: simplify page copying/clearing ... by making {copy,clear}_domain_page() available also on other than x86. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/domain_page.c | 18 ------------------ xen/common/grant_table.c | 9 ++------- xen/common/memory.c | 20 ++++++++++++++++++++ xen/include/asm-arm/page.h | 2 ++ 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 8f3217b..d684b2f 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -230,24 +230,6 @@ void unmap_domain_page(const void *ptr) local_irq_restore(flags); } -void clear_domain_page(unsigned long mfn) -{ - void *ptr = map_domain_page(mfn); - - clear_page(ptr); - unmap_domain_page(ptr); -} - -void copy_domain_page(unsigned long dmfn, unsigned long smfn) -{ - const void *src = map_domain_page(smfn); - void *dst = map_domain_page(dmfn); - - copy_page(dst, src); - unmap_domain_page(dst); - unmap_domain_page(src); -} - int mapcache_domain_init(struct domain *d) { struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 951f651..0538803 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1712,7 +1712,6 @@ gnttab_transfer( if ( (1UL << (max_bitsize - PAGE_SHIFT)) <= mfn ) { struct page_info *new_page; - void *sp, *dp; new_page = alloc_domheap_page(e, MEMF_no_owner | MEMF_bits(max_bitsize)); @@ -1722,11 +1721,7 @@ gnttab_transfer( goto unlock_and_copyback; } - sp = map_domain_page(mfn); - dp = __map_domain_page(new_page); - memcpy(dp, sp, PAGE_SIZE); - unmap_domain_page(dp); - unmap_domain_page(sp); + copy_domain_page(page_to_mfn(new_page), mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); free_domheap_page(page); @@ -2520,7 +2515,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) /* Make sure there's no crud left over in the table from the old version. */ for ( i = 0; i < nr_grant_frames(gt); i++ ) - memset(gt->shared_raw[i], 0, PAGE_SIZE); + clear_page(gt->shared_raw[i]); /* Restore the first 8 entries (toolstack reserved grants) */ if ( gt->gt_version != 0 && op.version == 1 ) diff --git a/xen/common/memory.c b/xen/common/memory.c index 063a1c5..c84fcdd 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1170,6 +1170,26 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return rc; } +#ifdef CONFIG_DOMAIN_PAGE +void clear_domain_page(unsigned long mfn) +{ + void *ptr = map_domain_page(mfn); + + clear_page(ptr); + unmap_domain_page(ptr); +} + +void copy_domain_page(unsigned long dmfn, unsigned long smfn) +{ + const void *src = map_domain_page(smfn); + void *dst = map_domain_page(dmfn); + + copy_page(dst, src); + unmap_domain_page(dst); + unmap_domain_page(src); +} +#endif + void destroy_ring_for_helper( void **_va, struct page_info *page) { diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 3d89494..5ecfd07 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -264,6 +264,8 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) /* Actual cacheline size on the boot CPU. */ extern size_t cacheline_bytes; +#define copy_page(dp, sp) memcpy(dp, sp, PAGE_SIZE) + /* Functions for flushing medium-sized areas. * if 'range' is large enough we might want to use model-specific * full-cache flushes. */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3T-00068F-AP; Wed, 17 Jun 2015 18:27:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3R-00067v-U7 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:18 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id B3/EB-00727-50CB1855; Wed, 17 Jun 2015 18:27:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1434565635!17224709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14532 invoked from network); 17 Jun 2015 18:27:16 -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; 17 Jun 2015 18:27:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3P-0002Hr-CQ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3P-000783-8O for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:15 +0000 Date: Wed, 17 Jun 2015 18:27:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: simplify page copying/clearing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1549a9dac132d00a1e4a011e0c4e6ea5b42d23b8 Author: Jan Beulich AuthorDate: Tue Jun 16 12:26:35 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:26:35 2015 +0200 gnttab: simplify page copying/clearing ... by making {copy,clear}_domain_page() available also on other than x86. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/domain_page.c | 18 ------------------ xen/common/grant_table.c | 9 ++------- xen/common/memory.c | 20 ++++++++++++++++++++ xen/include/asm-arm/page.h | 2 ++ 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 8f3217b..d684b2f 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -230,24 +230,6 @@ void unmap_domain_page(const void *ptr) local_irq_restore(flags); } -void clear_domain_page(unsigned long mfn) -{ - void *ptr = map_domain_page(mfn); - - clear_page(ptr); - unmap_domain_page(ptr); -} - -void copy_domain_page(unsigned long dmfn, unsigned long smfn) -{ - const void *src = map_domain_page(smfn); - void *dst = map_domain_page(dmfn); - - copy_page(dst, src); - unmap_domain_page(dst); - unmap_domain_page(src); -} - int mapcache_domain_init(struct domain *d) { struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 951f651..0538803 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1712,7 +1712,6 @@ gnttab_transfer( if ( (1UL << (max_bitsize - PAGE_SHIFT)) <= mfn ) { struct page_info *new_page; - void *sp, *dp; new_page = alloc_domheap_page(e, MEMF_no_owner | MEMF_bits(max_bitsize)); @@ -1722,11 +1721,7 @@ gnttab_transfer( goto unlock_and_copyback; } - sp = map_domain_page(mfn); - dp = __map_domain_page(new_page); - memcpy(dp, sp, PAGE_SIZE); - unmap_domain_page(dp); - unmap_domain_page(sp); + copy_domain_page(page_to_mfn(new_page), mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); free_domheap_page(page); @@ -2520,7 +2515,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) /* Make sure there's no crud left over in the table from the old version. */ for ( i = 0; i < nr_grant_frames(gt); i++ ) - memset(gt->shared_raw[i], 0, PAGE_SIZE); + clear_page(gt->shared_raw[i]); /* Restore the first 8 entries (toolstack reserved grants) */ if ( gt->gt_version != 0 && op.version == 1 ) diff --git a/xen/common/memory.c b/xen/common/memory.c index 063a1c5..c84fcdd 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1170,6 +1170,26 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return rc; } +#ifdef CONFIG_DOMAIN_PAGE +void clear_domain_page(unsigned long mfn) +{ + void *ptr = map_domain_page(mfn); + + clear_page(ptr); + unmap_domain_page(ptr); +} + +void copy_domain_page(unsigned long dmfn, unsigned long smfn) +{ + const void *src = map_domain_page(smfn); + void *dst = map_domain_page(dmfn); + + copy_page(dst, src); + unmap_domain_page(dst); + unmap_domain_page(src); +} +#endif + void destroy_ring_for_helper( void **_va, struct page_info *page) { diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 3d89494..5ecfd07 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -264,6 +264,8 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) /* Actual cacheline size on the boot CPU. */ extern size_t cacheline_bytes; +#define copy_page(dp, sp) memcpy(dp, sp, PAGE_SIZE) + /* Functions for flushing medium-sized areas. * if 'range' is large enough we might want to use model-specific * full-cache flushes. */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3d-0006Bn-Es; Wed, 17 Jun 2015 18:27:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3c-0006BK-2n for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id E7/37-30658-F0CB1855; Wed, 17 Jun 2015 18:27:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1434565645!19658101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31365 invoked from network); 17 Jun 2015 18:27:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:27:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3Z-0002Hz-IB for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3Z-00078P-Gs for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:25 +0000 Date: Wed, 17 Jun 2015 18:27:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: fix/adjust gnttab_transfer() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 213f14511446de8eb6c4756aee505e914a3e3a16 Author: Jan Beulich AuthorDate: Tue Jun 16 12:28:11 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:28:11 2015 +0200 gnttab: fix/adjust gnttab_transfer() - don't update shared entry's frame number for translated domains (as MFNs shouldn't be exposed to such guests) - for v1 grant table format, force copying of the page also when the intended MFN doesn't fit in 32 bits (and the domain isn't translated) - fix an apparent off-by-one error (it's unclear to me why commit 5cc77f9098 ("32-on-64: Fix domain address-size clamping, implement") uses BITS_PER_LONG-1 here, while using BITS_PER_LONG in the two other invocations of domain_clamp_alloc_bitsize()) - adjust comments accompanying the shared entry's frame field Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 11 ++++++++--- xen/include/public/grant_table.h | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 0538803..51500bf 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1708,7 +1708,8 @@ gnttab_transfer( } max_bitsize = domain_clamp_alloc_bitsize( - e, BITS_PER_LONG+PAGE_SHIFT-1); + e, e->grant_table->gt_version > 1 || paging_mode_translate(e) + ? BITS_PER_LONG + PAGE_SHIFT : 32 + PAGE_SHIFT); if ( (1UL << (max_bitsize - PAGE_SHIFT)) <= mfn ) { struct page_info *new_page; @@ -1806,14 +1807,18 @@ gnttab_transfer( if ( e->grant_table->gt_version == 1 ) { grant_entry_v1_t *sha = &shared_entry_v1(e->grant_table, gop.ref); + guest_physmap_add_page(e, sha->frame, mfn, 0); - sha->frame = mfn; + if ( !paging_mode_translate(e) ) + sha->frame = mfn; } else { grant_entry_v2_t *sha = &shared_entry_v2(e->grant_table, gop.ref); + guest_physmap_add_page(e, sha->full_page.frame, mfn, 0); - sha->full_page.frame = mfn; + if ( !paging_mode_translate(e) ) + sha->full_page.frame = mfn; } smp_wmb(); shared_entry_header(e->grant_table, gop.ref)->flags |= diff --git a/xen/include/public/grant_table.h b/xen/include/public/grant_table.h index f516a57..e9393fd 100644 --- a/xen/include/public/grant_table.h +++ b/xen/include/public/grant_table.h @@ -134,8 +134,10 @@ struct grant_entry_v1 { /* The domain being granted foreign privileges. [GST] */ domid_t domid; /* - * GTF_permit_access: Frame that @domid is allowed to map and access. [GST] - * GTF_accept_transfer: Frame whose ownership transferred by @domid. [XEN] + * GTF_permit_access: GFN that @domid is allowed to map and access. [GST] + * GTF_accept_transfer: GFN that @domid is allowed to transfer into. [GST] + * GTF_transfer_completed: MFN whose ownership transferred by @domid + * (non-translated guests only). [XEN] */ uint32_t frame; }; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3d-0006Bn-Es; Wed, 17 Jun 2015 18:27:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3c-0006BK-2n for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id E7/37-30658-F0CB1855; Wed, 17 Jun 2015 18:27:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1434565645!19658101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31365 invoked from network); 17 Jun 2015 18:27:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:27:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3Z-0002Hz-IB for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3Z-00078P-Gs for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:25 +0000 Date: Wed, 17 Jun 2015 18:27:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: fix/adjust gnttab_transfer() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 213f14511446de8eb6c4756aee505e914a3e3a16 Author: Jan Beulich AuthorDate: Tue Jun 16 12:28:11 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:28:11 2015 +0200 gnttab: fix/adjust gnttab_transfer() - don't update shared entry's frame number for translated domains (as MFNs shouldn't be exposed to such guests) - for v1 grant table format, force copying of the page also when the intended MFN doesn't fit in 32 bits (and the domain isn't translated) - fix an apparent off-by-one error (it's unclear to me why commit 5cc77f9098 ("32-on-64: Fix domain address-size clamping, implement") uses BITS_PER_LONG-1 here, while using BITS_PER_LONG in the two other invocations of domain_clamp_alloc_bitsize()) - adjust comments accompanying the shared entry's frame field Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 11 ++++++++--- xen/include/public/grant_table.h | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 0538803..51500bf 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1708,7 +1708,8 @@ gnttab_transfer( } max_bitsize = domain_clamp_alloc_bitsize( - e, BITS_PER_LONG+PAGE_SHIFT-1); + e, e->grant_table->gt_version > 1 || paging_mode_translate(e) + ? BITS_PER_LONG + PAGE_SHIFT : 32 + PAGE_SHIFT); if ( (1UL << (max_bitsize - PAGE_SHIFT)) <= mfn ) { struct page_info *new_page; @@ -1806,14 +1807,18 @@ gnttab_transfer( if ( e->grant_table->gt_version == 1 ) { grant_entry_v1_t *sha = &shared_entry_v1(e->grant_table, gop.ref); + guest_physmap_add_page(e, sha->frame, mfn, 0); - sha->frame = mfn; + if ( !paging_mode_translate(e) ) + sha->frame = mfn; } else { grant_entry_v2_t *sha = &shared_entry_v2(e->grant_table, gop.ref); + guest_physmap_add_page(e, sha->full_page.frame, mfn, 0); - sha->full_page.frame = mfn; + if ( !paging_mode_translate(e) ) + sha->full_page.frame = mfn; } smp_wmb(); shared_entry_header(e->grant_table, gop.ref)->flags |= diff --git a/xen/include/public/grant_table.h b/xen/include/public/grant_table.h index f516a57..e9393fd 100644 --- a/xen/include/public/grant_table.h +++ b/xen/include/public/grant_table.h @@ -134,8 +134,10 @@ struct grant_entry_v1 { /* The domain being granted foreign privileges. [GST] */ domid_t domid; /* - * GTF_permit_access: Frame that @domid is allowed to map and access. [GST] - * GTF_accept_transfer: Frame whose ownership transferred by @domid. [XEN] + * GTF_permit_access: GFN that @domid is allowed to map and access. [GST] + * GTF_accept_transfer: GFN that @domid is allowed to transfer into. [GST] + * GTF_transfer_completed: MFN whose ownership transferred by @domid + * (non-translated guests only). [XEN] */ uint32_t frame; }; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3n-0006Ek-Ha; Wed, 17 Jun 2015 18:27:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3m-0006EE-8n for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:38 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 7E/A7-18733-91CB1855; Wed, 17 Jun 2015 18:27:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434565655!18166982!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19595 invoked from network); 17 Jun 2015 18:27:36 -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; 17 Jun 2015 18:27:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3j-0002I9-Q3 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3j-00078p-Ln for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:35 +0000 Date: Wed, 17 Jun 2015 18:27:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: make struct grant_mapping private X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc6f500bc6ae6908b93f132733ff9944592be52f Author: Jan Beulich AuthorDate: Tue Jun 16 12:29:18 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:29:18 2015 +0200 gnttab: make struct grant_mapping private This documents that no entity outside of gnttab.c actually accesses objects of that type, which is particularly important with the now more fine grained locking in place. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 10 ++++++++++ xen/include/xen/grant_table.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 51500bf..a011276 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -113,6 +113,16 @@ struct gnttab_unmap_common { goto _lbl; \ } while ( 0 ) +/* + * Tracks a mapping of another domain's grant reference. Each domain has a + * table of these, indexes into which are returned as a 'mapping handle'. + */ +struct grant_mapping { + u32 ref; /* grant ref */ + u16 flags; /* 0-4: GNTMAP_* ; 5-15: unused */ + domid_t domid; /* granting domain */ +}; + #define MAPTRACK_PER_PAGE (PAGE_SIZE / sizeof(struct grant_mapping)) #define maptrack_entry(t, e) \ ((t)->maptrack[(e)/MAPTRACK_PER_PAGE][(e)%MAPTRACK_PER_PAGE]) diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index f22ebd0..9536331 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -52,16 +52,6 @@ /* The maximum size of a grant table. */ extern unsigned int max_grant_frames; -/* - * Tracks a mapping of another domain's grant reference. Each domain has a - * table of these, indexes into which are returned as a 'mapping handle'. - */ -struct grant_mapping { - u32 ref; /* grant ref */ - u16 flags; /* 0-4: GNTMAP_* ; 5-15: unused */ - domid_t domid; /* granting domain */ -}; - /* Per-domain grant information. */ struct grant_table { /* -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3n-0006Ek-Ha; Wed, 17 Jun 2015 18:27:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3m-0006EE-8n for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:38 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 7E/A7-18733-91CB1855; Wed, 17 Jun 2015 18:27:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434565655!18166982!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19595 invoked from network); 17 Jun 2015 18:27:36 -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; 17 Jun 2015 18:27:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3j-0002I9-Q3 for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3j-00078p-Ln for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:35 +0000 Date: Wed, 17 Jun 2015 18:27:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: make struct grant_mapping private X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc6f500bc6ae6908b93f132733ff9944592be52f Author: Jan Beulich AuthorDate: Tue Jun 16 12:29:18 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:29:18 2015 +0200 gnttab: make struct grant_mapping private This documents that no entity outside of gnttab.c actually accesses objects of that type, which is particularly important with the now more fine grained locking in place. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/grant_table.c | 10 ++++++++++ xen/include/xen/grant_table.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 51500bf..a011276 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -113,6 +113,16 @@ struct gnttab_unmap_common { goto _lbl; \ } while ( 0 ) +/* + * Tracks a mapping of another domain's grant reference. Each domain has a + * table of these, indexes into which are returned as a 'mapping handle'. + */ +struct grant_mapping { + u32 ref; /* grant ref */ + u16 flags; /* 0-4: GNTMAP_* ; 5-15: unused */ + domid_t domid; /* granting domain */ +}; + #define MAPTRACK_PER_PAGE (PAGE_SIZE / sizeof(struct grant_mapping)) #define maptrack_entry(t, e) \ ((t)->maptrack[(e)/MAPTRACK_PER_PAGE][(e)%MAPTRACK_PER_PAGE]) diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index f22ebd0..9536331 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -52,16 +52,6 @@ /* The maximum size of a grant table. */ extern unsigned int max_grant_frames; -/* - * Tracks a mapping of another domain's grant reference. Each domain has a - * table of these, indexes into which are returned as a 'mapping handle'. - */ -struct grant_mapping { - u32 ref; /* grant ref */ - u16 flags; /* 0-4: GNTMAP_* ; 5-15: unused */ - domid_t domid; /* granting domain */ -}; - /* Per-domain grant information. */ struct grant_table { /* -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3x-0006Hi-K0; Wed, 17 Jun 2015 18:27:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3w-0006H5-7c for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:48 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 2E/35-08244-32CB1855; Wed, 17 Jun 2015 18:27:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434565666!14981358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13193 invoked from network); 17 Jun 2015 18:27:47 -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; 17 Jun 2015 18:27:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3u-0002IH-4y for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3t-00079E-TJ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:45 +0000 Date: Wed, 17 Jun 2015 18:27:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: properly parenthesize pci_write* 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 5cd431f343aba8dc10949cf807a354577f8ee93a Author: Don Slutz AuthorDate: Tue Jun 16 12:29:59 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:29:59 2015 +0200 hvmloader: properly parenthesize pci_write* macros Signed-off-by: Don Slutz --- tools/firmware/hvmloader/util.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index a70e4aa..f99c0f19 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -82,9 +82,9 @@ uint32_t pci_read(uint32_t devfn, uint32_t reg, uint32_t len); #define pci_readw(devfn, reg) ((uint16_t)pci_read(devfn, reg, 2)) #define pci_readl(devfn, reg) ((uint32_t)pci_read(devfn, reg, 4)) void pci_write(uint32_t devfn, uint32_t reg, uint32_t len, uint32_t val); -#define pci_writeb(devfn, reg, val) (pci_write(devfn, reg, 1, (uint8_t) val)) -#define pci_writew(devfn, reg, val) (pci_write(devfn, reg, 2, (uint16_t)val)) -#define pci_writel(devfn, reg, val) (pci_write(devfn, reg, 4, (uint32_t)val)) +#define pci_writeb(devfn, reg, val) pci_write(devfn, reg, 1, (uint8_t) (val)) +#define pci_writew(devfn, reg, val) pci_write(devfn, reg, 2, (uint16_t)(val)) +#define pci_writel(devfn, reg, val) pci_write(devfn, reg, 4, (uint32_t)(val)) /* Get a pointer to the shared-info page */ struct shared_info *get_shared_info(void) __attribute__ ((const)); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:27:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:27: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 1Z5I3x-0006Hi-K0; Wed, 17 Jun 2015 18:27:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3w-0006H5-7c for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:48 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 2E/35-08244-32CB1855; Wed, 17 Jun 2015 18:27:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434565666!14981358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13193 invoked from network); 17 Jun 2015 18:27:47 -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; 17 Jun 2015 18:27:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I3u-0002IH-4y for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I3t-00079E-TJ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:45 +0000 Date: Wed, 17 Jun 2015 18:27:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: properly parenthesize pci_write* 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 5cd431f343aba8dc10949cf807a354577f8ee93a Author: Don Slutz AuthorDate: Tue Jun 16 12:29:59 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:29:59 2015 +0200 hvmloader: properly parenthesize pci_write* macros Signed-off-by: Don Slutz --- tools/firmware/hvmloader/util.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index a70e4aa..f99c0f19 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -82,9 +82,9 @@ uint32_t pci_read(uint32_t devfn, uint32_t reg, uint32_t len); #define pci_readw(devfn, reg) ((uint16_t)pci_read(devfn, reg, 2)) #define pci_readl(devfn, reg) ((uint32_t)pci_read(devfn, reg, 4)) void pci_write(uint32_t devfn, uint32_t reg, uint32_t len, uint32_t val); -#define pci_writeb(devfn, reg, val) (pci_write(devfn, reg, 1, (uint8_t) val)) -#define pci_writew(devfn, reg, val) (pci_write(devfn, reg, 2, (uint16_t)val)) -#define pci_writel(devfn, reg, val) (pci_write(devfn, reg, 4, (uint32_t)val)) +#define pci_writeb(devfn, reg, val) pci_write(devfn, reg, 1, (uint8_t) (val)) +#define pci_writew(devfn, reg, val) pci_write(devfn, reg, 2, (uint16_t)(val)) +#define pci_writel(devfn, reg, val) pci_write(devfn, reg, 4, (uint32_t)(val)) /* Get a pointer to the shared-info page */ struct shared_info *get_shared_info(void) __attribute__ ((const)); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 17 18:28:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:28: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 1Z5I47-0006L1-MR; Wed, 17 Jun 2015 18:27:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I46-0006Ke-NX for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:58 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 73/DE-02969-D2CB1855; Wed, 17 Jun 2015 18:27:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565676!12819961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8305 invoked from network); 17 Jun 2015 18:27:57 -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; 17 Jun 2015 18:27:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I44-0002IS-Ct for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I44-00079d-8b for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:56 +0000 Date: Wed, 17 Jun 2015 18:27:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: factor out freeing an event channel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a622b5ade2bdf79ad95e6088a4041e75253c43f3 Author: David Vrabel AuthorDate: Tue Jun 16 12:30:16 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:30:16 2015 +0200 evtchn: factor out freeing an event channel We're going to want to free an event channel from two places. Factor out the code into a free_evtchn() function. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index bf9b2f8..947880f 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -192,6 +192,17 @@ static int get_free_port(struct domain *d) return port; } +static void free_evtchn(struct domain *d, struct evtchn *chn) +{ + /* Clear pending event to avoid unexpected behavior on re-bind. */ + evtchn_port_clear_pending(d, chn); + + /* Reset binding to vcpu0 when the channel is freed. */ + chn->state = ECS_FREE; + chn->notify_vcpu_id = 0; + + xsm_evtchn_close_post(chn); +} static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) { @@ -569,14 +580,7 @@ static long __evtchn_close(struct domain *d1, int port1) BUG(); } - /* Clear pending event to avoid unexpected behavior on re-bind. */ - evtchn_port_clear_pending(d1, chn1); - - /* Reset binding to vcpu0 when the channel is freed. */ - chn1->state = ECS_FREE; - chn1->notify_vcpu_id = 0; - - xsm_evtchn_close_post(chn1); + free_evtchn(d1, chn1); out: if ( d2 != NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:28:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:28: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 1Z5I47-0006L1-MR; Wed, 17 Jun 2015 18:27:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I46-0006Ke-NX for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:58 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 73/DE-02969-D2CB1855; Wed, 17 Jun 2015 18:27:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434565676!12819961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8305 invoked from network); 17 Jun 2015 18:27:57 -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; 17 Jun 2015 18:27:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I44-0002IS-Ct for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I44-00079d-8b for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:27:56 +0000 Date: Wed, 17 Jun 2015 18:27:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: factor out freeing an event channel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a622b5ade2bdf79ad95e6088a4041e75253c43f3 Author: David Vrabel AuthorDate: Tue Jun 16 12:30:16 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 16 12:30:16 2015 +0200 evtchn: factor out freeing an event channel We're going to want to free an event channel from two places. Factor out the code into a free_evtchn() function. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index bf9b2f8..947880f 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -192,6 +192,17 @@ static int get_free_port(struct domain *d) return port; } +static void free_evtchn(struct domain *d, struct evtchn *chn) +{ + /* Clear pending event to avoid unexpected behavior on re-bind. */ + evtchn_port_clear_pending(d, chn); + + /* Reset binding to vcpu0 when the channel is freed. */ + chn->state = ECS_FREE; + chn->notify_vcpu_id = 0; + + xsm_evtchn_close_post(chn); +} static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) { @@ -569,14 +580,7 @@ static long __evtchn_close(struct domain *d1, int port1) BUG(); } - /* Clear pending event to avoid unexpected behavior on re-bind. */ - evtchn_port_clear_pending(d1, chn1); - - /* Reset binding to vcpu0 when the channel is freed. */ - chn1->state = ECS_FREE; - chn1->notify_vcpu_id = 0; - - xsm_evtchn_close_post(chn1); + free_evtchn(d1, chn1); out: if ( d2 != NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:28:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:28: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 1Z5I4I-0006OZ-P7; Wed, 17 Jun 2015 18:28:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I4H-0006Nz-MZ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:28:09 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 97/9D-10437-83CB1855; Wed, 17 Jun 2015 18:28:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1434565686!17273582!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9879 invoked from network); 17 Jun 2015 18:28:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:28:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I4E-0002J3-Ia for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:28:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I4E-0007AC-Gp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:28:06 +0000 Date: Wed, 17 Jun 2015 18:28:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcbfaf9d260adbdb9352d6300b9f63c4ed443d49 Merge: c43b206544b1ef9cfef630d03ca7bce5f9647876 a622b5ade2bdf79ad95e6088a4041e75253c43f3 Author: Ian Campbell AuthorDate: Tue Jun 16 12:42:27 2015 +0100 Commit: Ian Campbell CommitDate: Tue Jun 16 12:42:27 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/firmware/hvmloader/util.h | 6 +- xen/arch/x86/domain_page.c | 18 ---- xen/common/event_channel.c | 20 +++-- xen/common/grant_table.c | 170 ++++++++++++++++---------------------- xen/common/memory.c | 20 +++++ xen/include/asm-arm/page.h | 2 + xen/include/public/grant_table.h | 6 +- xen/include/xen/grant_table.h | 10 -- 8 files changed, 114 insertions(+), 138 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jun 17 18:28:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Jun 2015 18:28: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 1Z5I4I-0006OZ-P7; Wed, 17 Jun 2015 18:28:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I4H-0006Nz-MZ for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:28:09 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 97/9D-10437-83CB1855; Wed, 17 Jun 2015 18:28:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1434565686!17273582!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9879 invoked from network); 17 Jun 2015 18:28:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Jun 2015 18:28:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5I4E-0002J3-Ia for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:28:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z5I4E-0007AC-Gp for xen-changelog@lists.xensource.com; Wed, 17 Jun 2015 18:28:06 +0000 Date: Wed, 17 Jun 2015 18:28:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcbfaf9d260adbdb9352d6300b9f63c4ed443d49 Merge: c43b206544b1ef9cfef630d03ca7bce5f9647876 a622b5ade2bdf79ad95e6088a4041e75253c43f3 Author: Ian Campbell AuthorDate: Tue Jun 16 12:42:27 2015 +0100 Commit: Ian Campbell CommitDate: Tue Jun 16 12:42:27 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/firmware/hvmloader/util.h | 6 +- xen/arch/x86/domain_page.c | 18 ---- xen/common/event_channel.c | 20 +++-- xen/common/grant_table.c | 170 ++++++++++++++++---------------------- xen/common/memory.c | 20 +++++ xen/include/asm-arm/page.h | 2 + xen/include/public/grant_table.h | 6 +- xen/include/xen/grant_table.h | 10 -- 8 files changed, 114 insertions(+), 138 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5P-0003Ch-Sq; Sat, 20 Jun 2015 23:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5O-0003CZ-Ih for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:06 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 36/12-32406-D95F5855; Sat, 20 Jun 2015 23:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1434842524!18129725!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5129 invoked from network); 20 Jun 2015 23:22:05 -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; 20 Jun 2015 23:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5M-0005WR-0C for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5L-00032F-Ne for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:03 +0000 Date: Sat, 20 Jun 2015 23:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: clean up qemu-save and qemu-resume 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 08974f3d2f7df9ebabfae1c9336c2ad309c4c7d0 Author: Wei Liu AuthorDate: Wed Jun 3 11:44:50 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:28:15 2015 +0100 libxl: clean up qemu-save and qemu-resume files These files are leaked when using qemu-trad stubdom. They are intermediate files created by libxc. Unfortunately they don't fit well in our userdata scheme. Clean them up after we destroy all userdata, we're sure they are not useful anymore at that point. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9117b01..d86ea62 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1678,6 +1678,16 @@ static void devices_destroy_cb(libxl__egc *egc, libxl__unlock_domain_userdata(lock); + /* Clean up qemu-save and qemu-resume files. They are + * intermediate files created by libxc. Unfortunately they + * don't fit in existing userdata scheme very well. + */ + rc = libxl__remove_file(gc, libxl__device_model_savefile(gc, domid)); + if (rc < 0) goto out; + rc = libxl__remove_file(gc, + GCSPRINTF(XC_DEVICE_MODEL_RESTORE_FILE".%u", domid)); + if (rc < 0) goto out; + rc = libxl__ev_child_fork(gc, &dis->destroyer, domain_destroy_domid_cb); if (rc < 0) goto out; if (!rc) { /* child */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5P-0003Ch-Sq; Sat, 20 Jun 2015 23:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5O-0003CZ-Ih for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:06 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 36/12-32406-D95F5855; Sat, 20 Jun 2015 23:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1434842524!18129725!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5129 invoked from network); 20 Jun 2015 23:22:05 -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; 20 Jun 2015 23:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5M-0005WR-0C for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5L-00032F-Ne for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:03 +0000 Date: Sat, 20 Jun 2015 23:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: clean up qemu-save and qemu-resume 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 08974f3d2f7df9ebabfae1c9336c2ad309c4c7d0 Author: Wei Liu AuthorDate: Wed Jun 3 11:44:50 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:28:15 2015 +0100 libxl: clean up qemu-save and qemu-resume files These files are leaked when using qemu-trad stubdom. They are intermediate files created by libxc. Unfortunately they don't fit well in our userdata scheme. Clean them up after we destroy all userdata, we're sure they are not useful anymore at that point. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9117b01..d86ea62 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1678,6 +1678,16 @@ static void devices_destroy_cb(libxl__egc *egc, libxl__unlock_domain_userdata(lock); + /* Clean up qemu-save and qemu-resume files. They are + * intermediate files created by libxc. Unfortunately they + * don't fit in existing userdata scheme very well. + */ + rc = libxl__remove_file(gc, libxl__device_model_savefile(gc, domid)); + if (rc < 0) goto out; + rc = libxl__remove_file(gc, + GCSPRINTF(XC_DEVICE_MODEL_RESTORE_FILE".%u", domid)); + if (rc < 0) goto out; + rc = libxl__ev_child_fork(gc, &dis->destroyer, domain_destroy_domid_cb); if (rc < 0) goto out; if (!rc) { /* child */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5b-0003DH-07; Sat, 20 Jun 2015 23:22:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5a-0003D6-1b for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:18 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 8E/06-21300-9A5F5855; Sat, 20 Jun 2015 23:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434842534!25217752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26121 invoked from network); 20 Jun 2015 23:22:15 -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; 20 Jun 2015 23:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5W-0005WV-KA for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5W-00032j-76 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:14 +0000 Date: Sat, 20 Jun 2015 23:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: unify handling of vNUMA layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1e566ca08b274cb1822f9faafdc9cabfba1ffe1 Author: Wei Liu AuthorDate: Thu Jun 4 11:23:01 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:29:56 2015 +0100 libxc: unify handling of vNUMA layout This patch does the following: 1. Use local variables for dummy vNUMA layout in PV case. 2. Avoid leaking dummy layout back to caller in PV case. 3. Use local variables to reference vNUMA layout (whether it is dummy or provided by caller) for both PV and HVM. Signed-off-by: Wei Liu Reviewed-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_dom_x86.c | 49 +++++++++++++++++++++++-------------- tools/libxc/xc_hvm_build_x86.c | 52 ++++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 783f749..3d2fbd5 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -762,6 +762,11 @@ int arch_setup_meminit(struct xc_dom_image *dom) int rc; xen_pfn_t pfn, allocsz, mfn, total, pfn_base; int i, j; + xen_vmemrange_t dummy_vmemrange[1]; + unsigned int dummy_vnode_to_pnode[1]; + xen_vmemrange_t *vmemranges; + unsigned int *vnode_to_pnode; + unsigned int nr_vmemranges, nr_vnodes; rc = x86_compat(dom->xch, dom->guest_domid, dom->guest_type); if ( rc ) @@ -826,27 +831,33 @@ int arch_setup_meminit(struct xc_dom_image *dom) */ if ( dom->nr_vmemranges == 0 ) { - dom->nr_vmemranges = 1; - dom->vmemranges = xc_dom_malloc(dom, sizeof(*dom->vmemranges)); - dom->vmemranges[0].start = 0; - dom->vmemranges[0].end = (uint64_t)dom->total_pages << PAGE_SHIFT; - dom->vmemranges[0].flags = 0; - dom->vmemranges[0].nid = 0; - - dom->nr_vnodes = 1; - dom->vnode_to_pnode = xc_dom_malloc(dom, - sizeof(*dom->vnode_to_pnode)); - dom->vnode_to_pnode[0] = XC_NUMA_NO_NODE; + nr_vmemranges = 1; + vmemranges = dummy_vmemrange; + vmemranges[0].start = 0; + vmemranges[0].end = (uint64_t)dom->total_pages << PAGE_SHIFT; + vmemranges[0].flags = 0; + vmemranges[0].nid = 0; + + nr_vnodes = 1; + vnode_to_pnode = dummy_vnode_to_pnode; + vnode_to_pnode[0] = XC_NUMA_NO_NODE; + } + else + { + nr_vmemranges = dom->nr_vmemranges; + nr_vnodes = dom->nr_vnodes; + vmemranges = dom->vmemranges; + vnode_to_pnode = dom->vnode_to_pnode; } total = dom->p2m_size = 0; - for ( i = 0; i < dom->nr_vmemranges; i++ ) + for ( i = 0; i < nr_vmemranges; i++ ) { - total += ((dom->vmemranges[i].end - dom->vmemranges[i].start) + total += ((vmemranges[i].end - vmemranges[i].start) >> PAGE_SHIFT); dom->p2m_size = - dom->p2m_size > (dom->vmemranges[i].end >> PAGE_SHIFT) ? - dom->p2m_size : (dom->vmemranges[i].end >> PAGE_SHIFT); + dom->p2m_size > (vmemranges[i].end >> PAGE_SHIFT) ? + dom->p2m_size : (vmemranges[i].end >> PAGE_SHIFT); } if ( total != dom->total_pages ) { @@ -864,19 +875,19 @@ int arch_setup_meminit(struct xc_dom_image *dom) dom->p2m_host[pfn] = INVALID_P2M_ENTRY; /* allocate guest memory */ - for ( i = 0; i < dom->nr_vmemranges; i++ ) + for ( i = 0; i < nr_vmemranges; i++ ) { unsigned int memflags; uint64_t pages; - unsigned int pnode = dom->vnode_to_pnode[dom->vmemranges[i].nid]; + unsigned int pnode = vnode_to_pnode[vmemranges[i].nid]; memflags = 0; if ( pnode != XC_NUMA_NO_NODE ) memflags |= XENMEMF_exact_node(pnode); - pages = (dom->vmemranges[i].end - dom->vmemranges[i].start) + pages = (vmemranges[i].end - vmemranges[i].start) >> PAGE_SHIFT; - pfn_base = dom->vmemranges[i].start >> PAGE_SHIFT; + pfn_base = vmemranges[i].start >> PAGE_SHIFT; for ( pfn = pfn_base; pfn < pfn_base+pages; pfn++ ) dom->p2m_host[pfn] = pfn; diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index 0e98c84..003ea06 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -257,7 +257,9 @@ static int setup_guest(xc_interface *xch, uint64_t total_pages; xen_vmemrange_t dummy_vmemrange[2]; unsigned int dummy_vnode_to_pnode[1]; - bool use_dummy = false; + xen_vmemrange_t *vmemranges; + unsigned int *vnode_to_pnode; + unsigned int nr_vmemranges, nr_vnodes; memset(&elf, 0, sizeof(elf)); if ( elf_init(&elf, image, image_size) != 0 ) @@ -290,7 +292,7 @@ static int setup_guest(xc_interface *xch, dummy_vmemrange[0].end = args->lowmem_end; dummy_vmemrange[0].flags = 0; dummy_vmemrange[0].nid = 0; - args->nr_vmemranges = 1; + nr_vmemranges = 1; if ( args->highmem_end > (1ULL << 32) ) { @@ -299,14 +301,13 @@ static int setup_guest(xc_interface *xch, dummy_vmemrange[1].flags = 0; dummy_vmemrange[1].nid = 0; - args->nr_vmemranges++; + nr_vmemranges++; } dummy_vnode_to_pnode[0] = XC_NUMA_NO_NODE; - args->nr_vnodes = 1; - args->vmemranges = dummy_vmemrange; - args->vnode_to_pnode = dummy_vnode_to_pnode; - use_dummy = true; + nr_vnodes = 1; + vmemranges = dummy_vmemrange; + vnode_to_pnode = dummy_vnode_to_pnode; } else { @@ -315,16 +316,21 @@ static int setup_guest(xc_interface *xch, PERROR("Cannot enable vNUMA and PoD at the same time"); goto error_out; } + + nr_vmemranges = args->nr_vmemranges; + nr_vnodes = args->nr_vnodes; + vmemranges = args->vmemranges; + vnode_to_pnode = args->vnode_to_pnode; } total_pages = 0; p2m_size = 0; - for ( i = 0; i < args->nr_vmemranges; i++ ) + for ( i = 0; i < nr_vmemranges; i++ ) { - total_pages += ((args->vmemranges[i].end - args->vmemranges[i].start) + total_pages += ((vmemranges[i].end - vmemranges[i].start) >> PAGE_SHIFT); - p2m_size = p2m_size > (args->vmemranges[i].end >> PAGE_SHIFT) ? - p2m_size : (args->vmemranges[i].end >> PAGE_SHIFT); + p2m_size = p2m_size > (vmemranges[i].end >> PAGE_SHIFT) ? + p2m_size : (vmemranges[i].end >> PAGE_SHIFT); } if ( total_pages != (args->mem_size >> PAGE_SHIFT) ) @@ -360,12 +366,12 @@ static int setup_guest(xc_interface *xch, for ( i = 0; i < p2m_size; i++ ) page_array[i] = ((xen_pfn_t)-1); - for ( vmemid = 0; vmemid < args->nr_vmemranges; vmemid++ ) + for ( vmemid = 0; vmemid < nr_vmemranges; vmemid++ ) { uint64_t pfn; - for ( pfn = args->vmemranges[vmemid].start >> PAGE_SHIFT; - pfn < args->vmemranges[vmemid].end >> PAGE_SHIFT; + for ( pfn = vmemranges[vmemid].start >> PAGE_SHIFT; + pfn < vmemranges[vmemid].end >> PAGE_SHIFT; pfn++ ) page_array[pfn] = pfn; } @@ -417,29 +423,29 @@ static int setup_guest(xc_interface *xch, xch, dom, 0xa0, 0, memflags, &page_array[0x00]); stat_normal_pages = 0; - for ( vmemid = 0; vmemid < args->nr_vmemranges; vmemid++ ) + for ( vmemid = 0; vmemid < nr_vmemranges; vmemid++ ) { unsigned int new_memflags = memflags; uint64_t end_pages; - unsigned int vnode = args->vmemranges[vmemid].nid; - unsigned int pnode = args->vnode_to_pnode[vnode]; + unsigned int vnode = vmemranges[vmemid].nid; + unsigned int pnode = vnode_to_pnode[vnode]; if ( pnode != XC_NUMA_NO_NODE ) new_memflags |= XENMEMF_exact_node(pnode); - end_pages = args->vmemranges[vmemid].end >> PAGE_SHIFT; + end_pages = vmemranges[vmemid].end >> PAGE_SHIFT; /* * Consider vga hole belongs to the vmemrange that covers * 0xA0000-0xC0000. Note that 0x00000-0xA0000 is populated just * before this loop. */ - if ( args->vmemranges[vmemid].start == 0 ) + if ( vmemranges[vmemid].start == 0 ) { cur_pages = 0xc0; stat_normal_pages += 0xc0; } else - cur_pages = args->vmemranges[vmemid].start >> PAGE_SHIFT; + cur_pages = vmemranges[vmemid].start >> PAGE_SHIFT; while ( (rc == 0) && (end_pages > cur_pages) ) { @@ -679,12 +685,6 @@ static int setup_guest(xc_interface *xch, error_out: rc = -1; out: - if ( use_dummy ) - { - args->nr_vnodes = 0; - args->vmemranges = NULL; - args->vnode_to_pnode = NULL; - } if ( elf_check_broken(&elf) ) ERROR("HVM ELF broken: %s", elf_check_broken(&elf)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5b-0003DH-07; Sat, 20 Jun 2015 23:22:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5a-0003D6-1b for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:18 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 8E/06-21300-9A5F5855; Sat, 20 Jun 2015 23:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1434842534!25217752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26121 invoked from network); 20 Jun 2015 23:22:15 -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; 20 Jun 2015 23:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5W-0005WV-KA for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5W-00032j-76 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:14 +0000 Date: Sat, 20 Jun 2015 23:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: unify handling of vNUMA layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1e566ca08b274cb1822f9faafdc9cabfba1ffe1 Author: Wei Liu AuthorDate: Thu Jun 4 11:23:01 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:29:56 2015 +0100 libxc: unify handling of vNUMA layout This patch does the following: 1. Use local variables for dummy vNUMA layout in PV case. 2. Avoid leaking dummy layout back to caller in PV case. 3. Use local variables to reference vNUMA layout (whether it is dummy or provided by caller) for both PV and HVM. Signed-off-by: Wei Liu Reviewed-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_dom_x86.c | 49 +++++++++++++++++++++++-------------- tools/libxc/xc_hvm_build_x86.c | 52 ++++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 783f749..3d2fbd5 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -762,6 +762,11 @@ int arch_setup_meminit(struct xc_dom_image *dom) int rc; xen_pfn_t pfn, allocsz, mfn, total, pfn_base; int i, j; + xen_vmemrange_t dummy_vmemrange[1]; + unsigned int dummy_vnode_to_pnode[1]; + xen_vmemrange_t *vmemranges; + unsigned int *vnode_to_pnode; + unsigned int nr_vmemranges, nr_vnodes; rc = x86_compat(dom->xch, dom->guest_domid, dom->guest_type); if ( rc ) @@ -826,27 +831,33 @@ int arch_setup_meminit(struct xc_dom_image *dom) */ if ( dom->nr_vmemranges == 0 ) { - dom->nr_vmemranges = 1; - dom->vmemranges = xc_dom_malloc(dom, sizeof(*dom->vmemranges)); - dom->vmemranges[0].start = 0; - dom->vmemranges[0].end = (uint64_t)dom->total_pages << PAGE_SHIFT; - dom->vmemranges[0].flags = 0; - dom->vmemranges[0].nid = 0; - - dom->nr_vnodes = 1; - dom->vnode_to_pnode = xc_dom_malloc(dom, - sizeof(*dom->vnode_to_pnode)); - dom->vnode_to_pnode[0] = XC_NUMA_NO_NODE; + nr_vmemranges = 1; + vmemranges = dummy_vmemrange; + vmemranges[0].start = 0; + vmemranges[0].end = (uint64_t)dom->total_pages << PAGE_SHIFT; + vmemranges[0].flags = 0; + vmemranges[0].nid = 0; + + nr_vnodes = 1; + vnode_to_pnode = dummy_vnode_to_pnode; + vnode_to_pnode[0] = XC_NUMA_NO_NODE; + } + else + { + nr_vmemranges = dom->nr_vmemranges; + nr_vnodes = dom->nr_vnodes; + vmemranges = dom->vmemranges; + vnode_to_pnode = dom->vnode_to_pnode; } total = dom->p2m_size = 0; - for ( i = 0; i < dom->nr_vmemranges; i++ ) + for ( i = 0; i < nr_vmemranges; i++ ) { - total += ((dom->vmemranges[i].end - dom->vmemranges[i].start) + total += ((vmemranges[i].end - vmemranges[i].start) >> PAGE_SHIFT); dom->p2m_size = - dom->p2m_size > (dom->vmemranges[i].end >> PAGE_SHIFT) ? - dom->p2m_size : (dom->vmemranges[i].end >> PAGE_SHIFT); + dom->p2m_size > (vmemranges[i].end >> PAGE_SHIFT) ? + dom->p2m_size : (vmemranges[i].end >> PAGE_SHIFT); } if ( total != dom->total_pages ) { @@ -864,19 +875,19 @@ int arch_setup_meminit(struct xc_dom_image *dom) dom->p2m_host[pfn] = INVALID_P2M_ENTRY; /* allocate guest memory */ - for ( i = 0; i < dom->nr_vmemranges; i++ ) + for ( i = 0; i < nr_vmemranges; i++ ) { unsigned int memflags; uint64_t pages; - unsigned int pnode = dom->vnode_to_pnode[dom->vmemranges[i].nid]; + unsigned int pnode = vnode_to_pnode[vmemranges[i].nid]; memflags = 0; if ( pnode != XC_NUMA_NO_NODE ) memflags |= XENMEMF_exact_node(pnode); - pages = (dom->vmemranges[i].end - dom->vmemranges[i].start) + pages = (vmemranges[i].end - vmemranges[i].start) >> PAGE_SHIFT; - pfn_base = dom->vmemranges[i].start >> PAGE_SHIFT; + pfn_base = vmemranges[i].start >> PAGE_SHIFT; for ( pfn = pfn_base; pfn < pfn_base+pages; pfn++ ) dom->p2m_host[pfn] = pfn; diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index 0e98c84..003ea06 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -257,7 +257,9 @@ static int setup_guest(xc_interface *xch, uint64_t total_pages; xen_vmemrange_t dummy_vmemrange[2]; unsigned int dummy_vnode_to_pnode[1]; - bool use_dummy = false; + xen_vmemrange_t *vmemranges; + unsigned int *vnode_to_pnode; + unsigned int nr_vmemranges, nr_vnodes; memset(&elf, 0, sizeof(elf)); if ( elf_init(&elf, image, image_size) != 0 ) @@ -290,7 +292,7 @@ static int setup_guest(xc_interface *xch, dummy_vmemrange[0].end = args->lowmem_end; dummy_vmemrange[0].flags = 0; dummy_vmemrange[0].nid = 0; - args->nr_vmemranges = 1; + nr_vmemranges = 1; if ( args->highmem_end > (1ULL << 32) ) { @@ -299,14 +301,13 @@ static int setup_guest(xc_interface *xch, dummy_vmemrange[1].flags = 0; dummy_vmemrange[1].nid = 0; - args->nr_vmemranges++; + nr_vmemranges++; } dummy_vnode_to_pnode[0] = XC_NUMA_NO_NODE; - args->nr_vnodes = 1; - args->vmemranges = dummy_vmemrange; - args->vnode_to_pnode = dummy_vnode_to_pnode; - use_dummy = true; + nr_vnodes = 1; + vmemranges = dummy_vmemrange; + vnode_to_pnode = dummy_vnode_to_pnode; } else { @@ -315,16 +316,21 @@ static int setup_guest(xc_interface *xch, PERROR("Cannot enable vNUMA and PoD at the same time"); goto error_out; } + + nr_vmemranges = args->nr_vmemranges; + nr_vnodes = args->nr_vnodes; + vmemranges = args->vmemranges; + vnode_to_pnode = args->vnode_to_pnode; } total_pages = 0; p2m_size = 0; - for ( i = 0; i < args->nr_vmemranges; i++ ) + for ( i = 0; i < nr_vmemranges; i++ ) { - total_pages += ((args->vmemranges[i].end - args->vmemranges[i].start) + total_pages += ((vmemranges[i].end - vmemranges[i].start) >> PAGE_SHIFT); - p2m_size = p2m_size > (args->vmemranges[i].end >> PAGE_SHIFT) ? - p2m_size : (args->vmemranges[i].end >> PAGE_SHIFT); + p2m_size = p2m_size > (vmemranges[i].end >> PAGE_SHIFT) ? + p2m_size : (vmemranges[i].end >> PAGE_SHIFT); } if ( total_pages != (args->mem_size >> PAGE_SHIFT) ) @@ -360,12 +366,12 @@ static int setup_guest(xc_interface *xch, for ( i = 0; i < p2m_size; i++ ) page_array[i] = ((xen_pfn_t)-1); - for ( vmemid = 0; vmemid < args->nr_vmemranges; vmemid++ ) + for ( vmemid = 0; vmemid < nr_vmemranges; vmemid++ ) { uint64_t pfn; - for ( pfn = args->vmemranges[vmemid].start >> PAGE_SHIFT; - pfn < args->vmemranges[vmemid].end >> PAGE_SHIFT; + for ( pfn = vmemranges[vmemid].start >> PAGE_SHIFT; + pfn < vmemranges[vmemid].end >> PAGE_SHIFT; pfn++ ) page_array[pfn] = pfn; } @@ -417,29 +423,29 @@ static int setup_guest(xc_interface *xch, xch, dom, 0xa0, 0, memflags, &page_array[0x00]); stat_normal_pages = 0; - for ( vmemid = 0; vmemid < args->nr_vmemranges; vmemid++ ) + for ( vmemid = 0; vmemid < nr_vmemranges; vmemid++ ) { unsigned int new_memflags = memflags; uint64_t end_pages; - unsigned int vnode = args->vmemranges[vmemid].nid; - unsigned int pnode = args->vnode_to_pnode[vnode]; + unsigned int vnode = vmemranges[vmemid].nid; + unsigned int pnode = vnode_to_pnode[vnode]; if ( pnode != XC_NUMA_NO_NODE ) new_memflags |= XENMEMF_exact_node(pnode); - end_pages = args->vmemranges[vmemid].end >> PAGE_SHIFT; + end_pages = vmemranges[vmemid].end >> PAGE_SHIFT; /* * Consider vga hole belongs to the vmemrange that covers * 0xA0000-0xC0000. Note that 0x00000-0xA0000 is populated just * before this loop. */ - if ( args->vmemranges[vmemid].start == 0 ) + if ( vmemranges[vmemid].start == 0 ) { cur_pages = 0xc0; stat_normal_pages += 0xc0; } else - cur_pages = args->vmemranges[vmemid].start >> PAGE_SHIFT; + cur_pages = vmemranges[vmemid].start >> PAGE_SHIFT; while ( (rc == 0) && (end_pages > cur_pages) ) { @@ -679,12 +685,6 @@ static int setup_guest(xc_interface *xch, error_out: rc = -1; out: - if ( use_dummy ) - { - args->nr_vnodes = 0; - args->vmemranges = NULL; - args->vnode_to_pnode = NULL; - } if ( elf_check_broken(&elf) ) ERROR("HVM ELF broken: %s", elf_check_broken(&elf)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5l-0003EX-2b; Sat, 20 Jun 2015 23:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5j-0003EQ-QD for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:28 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 4B/57-02952-3B5F5855; Sat, 20 Jun 2015 23:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434842545!15755027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13211 invoked from network); 20 Jun 2015 23:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5g-0005Wh-T8 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5g-00033N-Oh for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:24 +0000 Date: Sat, 20 Jun 2015 23:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: implement XS_RESET_WATCHES X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8c72b526129ad2d8e0a1c578632d390380fd984 Author: Wei Liu AuthorDate: Tue Jun 9 11:08:14 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:36:53 2015 +0100 oxenstored: implement XS_RESET_WATCHES Signed-off-by: Wei Liu Acked-by: David Scott --- tools/ocaml/libs/xb/op.ml | 6 ++++-- tools/ocaml/libs/xb/xb.mli | 1 + tools/ocaml/xenstored/connection.ml | 7 +++++++ tools/ocaml/xenstored/logging.ml | 1 + tools/ocaml/xenstored/process.ml | 6 ++++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xb/op.ml b/tools/ocaml/libs/xb/op.ml index 0ee8666..69346d8 100644 --- a/tools/ocaml/libs/xb/op.ml +++ b/tools/ocaml/libs/xb/op.ml @@ -19,7 +19,8 @@ type operation = Debug | Directory | Read | Getperms | Transaction_end | Introduce | Release | Getdomainpath | Write | Mkdir | Rm | Setperms | Watchevent | Error | Isintroduced | - Resume | Set_target | Restrict | Invalid + Resume | Set_target | Restrict | Reset_watches | + Invalid let operation_c_mapping = [| Debug; Directory; Read; Getperms; @@ -27,7 +28,7 @@ let operation_c_mapping = Transaction_end; Introduce; Release; Getdomainpath; Write; Mkdir; Rm; Setperms; Watchevent; Error; Isintroduced; - Resume; Set_target; Restrict |] + Resume; Set_target; Restrict; Reset_watches |] let size = Array.length operation_c_mapping let array_search el a = @@ -68,4 +69,5 @@ let to_string ty = | Resume -> "RESUME" | Set_target -> "SET_TARGET" | Restrict -> "RESTRICT" + | Reset_watches -> "RESET_WATCHES" | Invalid -> "INVALID" diff --git a/tools/ocaml/libs/xb/xb.mli b/tools/ocaml/libs/xb/xb.mli index 4e1f833..6c242da 100644 --- a/tools/ocaml/libs/xb/xb.mli +++ b/tools/ocaml/libs/xb/xb.mli @@ -23,6 +23,7 @@ module Op : | Resume | Set_target | Restrict + | Reset_watches | Invalid val operation_c_mapping : operation array val size : int diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index b4dc9cb..9de4978 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -186,6 +186,13 @@ let del_watch con path token = con.nb_watches <- con.nb_watches - 1; apath, w +let del_watches con = + Hashtbl.clear con.watches + +let del_transactions con = + Hashtbl.clear con.transactions; + con.nb_watches <- 0 + let list_watches con = let ll = Hashtbl.fold (fun _ watches acc -> List.map (fun watch -> watch.path, watch.token) watches :: acc) diff --git a/tools/ocaml/xenstored/logging.ml b/tools/ocaml/xenstored/logging.ml index 665b922..4c90032 100644 --- a/tools/ocaml/xenstored/logging.ml +++ b/tools/ocaml/xenstored/logging.ml @@ -242,6 +242,7 @@ let string_of_access_type = function | Xenbus.Xb.Op.Rm -> "rm " | Xenbus.Xb.Op.Setperms -> "setperms " | Xenbus.Xb.Op.Restrict -> "restrict " + | Xenbus.Xb.Op.Reset_watches -> "reset watches" | Xenbus.Xb.Op.Set_target -> "settarget" | Xenbus.Xb.Op.Error -> "error " diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index 0620585..e827678 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -272,6 +272,11 @@ let do_restrict con t domains cons data = in Connection.restrict con domid +(* only in xen >= 4.2 *) +let do_reset_watches con t domains cons data = + Connection.del_watches con; + Connection.del_transactions con + (* only in >= xen3.3 *) (* we ensure backward compatibility with restrict by counting the number of argument of set_target ... *) (* This is not very elegant, but it is safe as 'restrict' only restricts permission of dom0 connections *) @@ -324,6 +329,7 @@ let function_of_type ty = | Xenbus.Xb.Op.Resume -> reply_ack do_resume | Xenbus.Xb.Op.Set_target -> reply_ack do_set_target | Xenbus.Xb.Op.Restrict -> reply_ack do_restrict + | Xenbus.Xb.Op.Reset_watches -> reply_ack do_reset_watches | Xenbus.Xb.Op.Invalid -> reply_ack do_error | _ -> reply_ack do_error -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5l-0003EX-2b; Sat, 20 Jun 2015 23:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5j-0003EQ-QD for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:28 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 4B/57-02952-3B5F5855; Sat, 20 Jun 2015 23:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1434842545!15755027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13211 invoked from network); 20 Jun 2015 23:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5g-0005Wh-T8 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5g-00033N-Oh for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:24 +0000 Date: Sat, 20 Jun 2015 23:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: implement XS_RESET_WATCHES X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8c72b526129ad2d8e0a1c578632d390380fd984 Author: Wei Liu AuthorDate: Tue Jun 9 11:08:14 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:36:53 2015 +0100 oxenstored: implement XS_RESET_WATCHES Signed-off-by: Wei Liu Acked-by: David Scott --- tools/ocaml/libs/xb/op.ml | 6 ++++-- tools/ocaml/libs/xb/xb.mli | 1 + tools/ocaml/xenstored/connection.ml | 7 +++++++ tools/ocaml/xenstored/logging.ml | 1 + tools/ocaml/xenstored/process.ml | 6 ++++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xb/op.ml b/tools/ocaml/libs/xb/op.ml index 0ee8666..69346d8 100644 --- a/tools/ocaml/libs/xb/op.ml +++ b/tools/ocaml/libs/xb/op.ml @@ -19,7 +19,8 @@ type operation = Debug | Directory | Read | Getperms | Transaction_end | Introduce | Release | Getdomainpath | Write | Mkdir | Rm | Setperms | Watchevent | Error | Isintroduced | - Resume | Set_target | Restrict | Invalid + Resume | Set_target | Restrict | Reset_watches | + Invalid let operation_c_mapping = [| Debug; Directory; Read; Getperms; @@ -27,7 +28,7 @@ let operation_c_mapping = Transaction_end; Introduce; Release; Getdomainpath; Write; Mkdir; Rm; Setperms; Watchevent; Error; Isintroduced; - Resume; Set_target; Restrict |] + Resume; Set_target; Restrict; Reset_watches |] let size = Array.length operation_c_mapping let array_search el a = @@ -68,4 +69,5 @@ let to_string ty = | Resume -> "RESUME" | Set_target -> "SET_TARGET" | Restrict -> "RESTRICT" + | Reset_watches -> "RESET_WATCHES" | Invalid -> "INVALID" diff --git a/tools/ocaml/libs/xb/xb.mli b/tools/ocaml/libs/xb/xb.mli index 4e1f833..6c242da 100644 --- a/tools/ocaml/libs/xb/xb.mli +++ b/tools/ocaml/libs/xb/xb.mli @@ -23,6 +23,7 @@ module Op : | Resume | Set_target | Restrict + | Reset_watches | Invalid val operation_c_mapping : operation array val size : int diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index b4dc9cb..9de4978 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -186,6 +186,13 @@ let del_watch con path token = con.nb_watches <- con.nb_watches - 1; apath, w +let del_watches con = + Hashtbl.clear con.watches + +let del_transactions con = + Hashtbl.clear con.transactions; + con.nb_watches <- 0 + let list_watches con = let ll = Hashtbl.fold (fun _ watches acc -> List.map (fun watch -> watch.path, watch.token) watches :: acc) diff --git a/tools/ocaml/xenstored/logging.ml b/tools/ocaml/xenstored/logging.ml index 665b922..4c90032 100644 --- a/tools/ocaml/xenstored/logging.ml +++ b/tools/ocaml/xenstored/logging.ml @@ -242,6 +242,7 @@ let string_of_access_type = function | Xenbus.Xb.Op.Rm -> "rm " | Xenbus.Xb.Op.Setperms -> "setperms " | Xenbus.Xb.Op.Restrict -> "restrict " + | Xenbus.Xb.Op.Reset_watches -> "reset watches" | Xenbus.Xb.Op.Set_target -> "settarget" | Xenbus.Xb.Op.Error -> "error " diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index 0620585..e827678 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -272,6 +272,11 @@ let do_restrict con t domains cons data = in Connection.restrict con domid +(* only in xen >= 4.2 *) +let do_reset_watches con t domains cons data = + Connection.del_watches con; + Connection.del_transactions con + (* only in >= xen3.3 *) (* we ensure backward compatibility with restrict by counting the number of argument of set_target ... *) (* This is not very elegant, but it is safe as 'restrict' only restricts permission of dom0 connections *) @@ -324,6 +329,7 @@ let function_of_type ty = | Xenbus.Xb.Op.Resume -> reply_ack do_resume | Xenbus.Xb.Op.Set_target -> reply_ack do_set_target | Xenbus.Xb.Op.Restrict -> reply_ack do_restrict + | Xenbus.Xb.Op.Reset_watches -> reply_ack do_reset_watches | Xenbus.Xb.Op.Invalid -> reply_ack do_error | _ -> reply_ack do_error -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5v-0003Fw-63; Sat, 20 Jun 2015 23:22:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5t-0003Fe-OU for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:37 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6E/1C-31258-DB5F5855; Sat, 20 Jun 2015 23:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1434842555!17601822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25137 invoked from network); 20 Jun 2015 23:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5r-0005Wr-1T for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5r-00033v-02 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:35 +0000 Date: Sat, 20 Jun 2015 23:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Batch memory allocations for PV 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 415b58c184b483ee31811a22d31bebcbb34b159c Author: Ross Lagerwall AuthorDate: Mon Jun 15 11:12:07 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:39:56 2015 +0100 tools/libxc: Batch memory allocations for PV guests The current code for allocating memory for PV guests batches the hypercalls to allocate memory by allocating 1024*1024 extents of order 0 at a time. To make this faster, first try allocating extents of order 9 (2 MiB) before falling back to the order 0 allocating if the order 9 allocation fails. On my test machine this reduced the time to start a 128 GiB PV guest by about 60 seconds. Signed-off-by: Ross Lagerwall Acked-by: Wei Liu --- tools/libxc/xc_dom_x86.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 3d2fbd5..920fe42 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -42,6 +42,7 @@ #define SUPERPAGE_PFN_SHIFT 9 #define SUPERPAGE_NR_PFNS (1UL << SUPERPAGE_PFN_SHIFT) +#define SUPERPAGE_BATCH_SIZE 512 #define bits_to_mask(bits) (((xen_vaddr_t)1 << (bits))-1) #define round_down(addr, mask) ((addr) & ~(mask)) @@ -761,7 +762,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) { int rc; xen_pfn_t pfn, allocsz, mfn, total, pfn_base; - int i, j; + int i, j, k; xen_vmemrange_t dummy_vmemrange[1]; unsigned int dummy_vnode_to_pnode[1]; xen_vmemrange_t *vmemranges; @@ -880,6 +881,9 @@ int arch_setup_meminit(struct xc_dom_image *dom) unsigned int memflags; uint64_t pages; unsigned int pnode = vnode_to_pnode[vmemranges[i].nid]; + int nr_spages = dom->total_pages >> SUPERPAGE_PFN_SHIFT; + xen_pfn_t extents[SUPERPAGE_BATCH_SIZE]; + xen_pfn_t pfn_base_idx; memflags = 0; if ( pnode != XC_NUMA_NO_NODE ) @@ -892,7 +896,33 @@ int arch_setup_meminit(struct xc_dom_image *dom) for ( pfn = pfn_base; pfn < pfn_base+pages; pfn++ ) dom->p2m_host[pfn] = pfn; - for ( j = 0; j < pages; j += allocsz ) + pfn_base_idx = pfn_base; + while (nr_spages) { + int count = min(nr_spages, SUPERPAGE_BATCH_SIZE); + nr_spages -= count; + + for ( pfn = pfn_base_idx, j = 0; + pfn < pfn_base_idx + (count << SUPERPAGE_PFN_SHIFT); + pfn += SUPERPAGE_NR_PFNS, j++ ) + extents[j] = dom->p2m_host[pfn]; + rc = xc_domain_populate_physmap(dom->xch, dom->guest_domid, count, + SUPERPAGE_PFN_SHIFT, memflags, + extents); + if ( rc < 0 ) + return rc; + + /* Expand the returned mfns into the p2m array. */ + pfn = pfn_base_idx; + for ( j = 0; j < rc; j++ ) + { + mfn = extents[j]; + for ( k = 0; k < SUPERPAGE_NR_PFNS; k++, pfn++ ) + dom->p2m_host[pfn] = mfn + k; + } + pfn_base_idx = pfn; + } + + for ( j = pfn_base_idx - pfn_base; j < pages; j += allocsz ) { allocsz = pages - j; if ( allocsz > 1024*1024 ) @@ -915,6 +945,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) return rc; } } + rc = 0; } /* Ensure no unclaimed pages are left unused. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S5v-0003Fw-63; Sat, 20 Jun 2015 23:22:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5t-0003Fe-OU for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:37 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6E/1C-31258-DB5F5855; Sat, 20 Jun 2015 23:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1434842555!17601822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25137 invoked from network); 20 Jun 2015 23:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S5r-0005Wr-1T for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S5r-00033v-02 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:35 +0000 Date: Sat, 20 Jun 2015 23:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Batch memory allocations for PV 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 415b58c184b483ee31811a22d31bebcbb34b159c Author: Ross Lagerwall AuthorDate: Mon Jun 15 11:12:07 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 11:39:56 2015 +0100 tools/libxc: Batch memory allocations for PV guests The current code for allocating memory for PV guests batches the hypercalls to allocate memory by allocating 1024*1024 extents of order 0 at a time. To make this faster, first try allocating extents of order 9 (2 MiB) before falling back to the order 0 allocating if the order 9 allocation fails. On my test machine this reduced the time to start a 128 GiB PV guest by about 60 seconds. Signed-off-by: Ross Lagerwall Acked-by: Wei Liu --- tools/libxc/xc_dom_x86.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 3d2fbd5..920fe42 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -42,6 +42,7 @@ #define SUPERPAGE_PFN_SHIFT 9 #define SUPERPAGE_NR_PFNS (1UL << SUPERPAGE_PFN_SHIFT) +#define SUPERPAGE_BATCH_SIZE 512 #define bits_to_mask(bits) (((xen_vaddr_t)1 << (bits))-1) #define round_down(addr, mask) ((addr) & ~(mask)) @@ -761,7 +762,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) { int rc; xen_pfn_t pfn, allocsz, mfn, total, pfn_base; - int i, j; + int i, j, k; xen_vmemrange_t dummy_vmemrange[1]; unsigned int dummy_vnode_to_pnode[1]; xen_vmemrange_t *vmemranges; @@ -880,6 +881,9 @@ int arch_setup_meminit(struct xc_dom_image *dom) unsigned int memflags; uint64_t pages; unsigned int pnode = vnode_to_pnode[vmemranges[i].nid]; + int nr_spages = dom->total_pages >> SUPERPAGE_PFN_SHIFT; + xen_pfn_t extents[SUPERPAGE_BATCH_SIZE]; + xen_pfn_t pfn_base_idx; memflags = 0; if ( pnode != XC_NUMA_NO_NODE ) @@ -892,7 +896,33 @@ int arch_setup_meminit(struct xc_dom_image *dom) for ( pfn = pfn_base; pfn < pfn_base+pages; pfn++ ) dom->p2m_host[pfn] = pfn; - for ( j = 0; j < pages; j += allocsz ) + pfn_base_idx = pfn_base; + while (nr_spages) { + int count = min(nr_spages, SUPERPAGE_BATCH_SIZE); + nr_spages -= count; + + for ( pfn = pfn_base_idx, j = 0; + pfn < pfn_base_idx + (count << SUPERPAGE_PFN_SHIFT); + pfn += SUPERPAGE_NR_PFNS, j++ ) + extents[j] = dom->p2m_host[pfn]; + rc = xc_domain_populate_physmap(dom->xch, dom->guest_domid, count, + SUPERPAGE_PFN_SHIFT, memflags, + extents); + if ( rc < 0 ) + return rc; + + /* Expand the returned mfns into the p2m array. */ + pfn = pfn_base_idx; + for ( j = 0; j < rc; j++ ) + { + mfn = extents[j]; + for ( k = 0; k < SUPERPAGE_NR_PFNS; k++, pfn++ ) + dom->p2m_host[pfn] = mfn + k; + } + pfn_base_idx = pfn; + } + + for ( j = pfn_base_idx - pfn_base; j < pages; j += allocsz ) { allocsz = pages - j; if ( allocsz > 1024*1024 ) @@ -915,6 +945,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) return rc; } } + rc = 0; } /* Ensure no unclaimed pages are left unused. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S65-0003Hd-8p; Sat, 20 Jun 2015 23: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 1Z6S63-0003HM-QW for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:48 +0000 Content-Length: 5603 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id F1/98-27764-7C5F5855; Sat, 20 Jun 2015 23:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434842565!19073630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19438 invoked from network); 20 Jun 2015 23:22: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; 20 Jun 2015 23:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S61-0005Wz-6j for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S61-00034o-5L for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:45 +0000 Date: Sat, 20 Jun 2015 23:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix xc_dom_load_elf_symtab X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7080967284288160408==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7080967284288160408== Content-Length: 5276 Content-Transfer-Encoding: quoted-printable commit 06ee606aaf976ea653840b8a7ee3d424fb765f32 Author: Roger Pau Monne AuthorDate: Thu Jun 11 18:05:20 2015 +0200 Commit: Ian Campbell CommitDate: Wed Jun 17 11:57:39 2015 +0100 libxc: fix xc_dom_load_elf_symtab xc_dom_load_elf_symtab was incorrectly trying to perform the same calculations already done in elf_parse_bsdsyms when load =3D=3D 0 is used. Instead of trying to repeat the calculations, just trust what elf_parse_bsdsyms has already accounted for. This also simplifies the code by allowing the non-load case to return earlier. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu --- tools/libxc/xc_dom_elfloader.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c index 9843b1f..6ce1062 100644 --- a/tools/libxc/xc_dom_elfloader.c +++ b/tools/libxc/xc_dom_elfloader.c @@ -128,6 +128,8 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, return 0; } + size =3D elf->bsd_symtab_pend - elf->bsd_symtab_pstart; + if ( load ) { char *hdr_ptr; @@ -135,11 +137,10 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, if ( !dom->bsd_symtab_start ) return 0; - size =3D dom->kernel_seg.vend - dom->bsd_symtab_start; hdr_ptr =3D xc_dom_vaddr_to_ptr(dom, dom->bsd_symtab_start, &allow_size); if ( hdr_ptr =3D=3D NULL ) { - DOMPRINTF("%s/load: xc_dom_vaddr_to_ptr(dom,dom->bsd_symtab_start" + DOMPRINTF("%s: xc_dom_vaddr_to_ptr(dom,dom->bsd_symtab_start" " =3D> NULL", __FUNCTION__); return -1; } @@ -152,8 +153,6 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, { char *hdr_ptr; - size =3D sizeof(unsigned) + elf_size(elf, elf->ehdr) + - elf_shdr_count(elf) * elf_size(elf, shdr); hdr_ptr =3D xc_dom_malloc(dom, size); if ( hdr_ptr =3D=3D NULL ) return 0; @@ -161,6 +160,8 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, elf->caller_xdest_size =3D size; hdr =3D ELF_REALPTR2PTRVAL(hdr_ptr); dom->bsd_symtab_start =3D elf_round_up(elf, dom->kernel_seg.vend); + dom->kernel_seg.vend =3D elf_round_up(elf, dom->bsd_symtab_start + size); + return 0; } elf_memcpy_safe(elf, hdr + sizeof(unsigned), @@ -189,9 +190,8 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, } if ( elf->caller_xdest_size < sizeof(unsigned) ) { - DOMPRINTF("%s/%s: header size %"PRIx64" too small", - __FUNCTION__, load =3F "load" : "parse", - (uint64_t)elf->caller_xdest_size); + DOMPRINTF("%s: header size %"PRIx64" too small", + __FUNCTION__, (uint64_t)elf->caller_xdest_size); return -1; } if ( elf_init(&syms, elf->caller_xdest_base + sizeof(unsigned), @@ -219,10 +219,9 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, maxaddr =3D elf_round_up(&syms, symtab + elf_size(&syms, syms.ehdr) + elf_shdr_count(&syms) * elf_size(&syms, shdr)); - DOMPRINTF("%s/%s: bsd_symtab_start=3D%" PRIx64 ", kernel.end=3D0x%" PRIx64 + DOMPRINTF("%s: bsd_symtab_start=3D%" PRIx64 ", kernel.end=3D0x%" PRIx64 " -- symtab=3D0x%" PRIx64 ", maxaddr=3D0x%" PRIx64 "", - __FUNCTION__, load =3F "load" : "parse", - dom->bsd_symtab_start, dom->kernel_seg.vend, + __FUNCTION__, dom->bsd_symtab_start, dom->kernel_seg.vend, symtab, maxaddr); count =3D elf_shdr_count(&syms); @@ -279,13 +278,10 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, type =3D=3D SHT_SYMTAB =3F "symtab" : "strtab", size, maxaddr); - if ( load ) - { - shdr2 =3D elf_shdr_by_index(elf, h); - elf_memcpy_safe(elf, elf_section_start(&syms, shdr), - elf_section_start(elf, shdr2), - size); - } + shdr2 =3D elf_shdr_by_index(elf, h); + elf_memcpy_safe(elf, elf_section_start(&syms, shdr), + elf_section_start(elf, shdr2), + size); } /* Name is NULL. */ @@ -308,8 +304,7 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, dom->bsd_symtab_start =3D 0; return 0; } - if ( !load ) - dom->kernel_seg.vend =3D maxaddr; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7080967284288160408== 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 --===============7080967284288160408==-- From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S65-0003Hd-8p; Sat, 20 Jun 2015 23: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 1Z6S63-0003HM-QW for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:48 +0000 Content-Length: 5603 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id F1/98-27764-7C5F5855; Sat, 20 Jun 2015 23:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434842565!19073630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19438 invoked from network); 20 Jun 2015 23:22: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; 20 Jun 2015 23:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S61-0005Wz-6j for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S61-00034o-5L for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:45 +0000 Date: Sat, 20 Jun 2015 23:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix xc_dom_load_elf_symtab X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7080967284288160408==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7080967284288160408== Content-Length: 5276 Content-Transfer-Encoding: quoted-printable commit 06ee606aaf976ea653840b8a7ee3d424fb765f32 Author: Roger Pau Monne AuthorDate: Thu Jun 11 18:05:20 2015 +0200 Commit: Ian Campbell CommitDate: Wed Jun 17 11:57:39 2015 +0100 libxc: fix xc_dom_load_elf_symtab xc_dom_load_elf_symtab was incorrectly trying to perform the same calculations already done in elf_parse_bsdsyms when load =3D=3D 0 is used. Instead of trying to repeat the calculations, just trust what elf_parse_bsdsyms has already accounted for. This also simplifies the code by allowing the non-load case to return earlier. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu --- tools/libxc/xc_dom_elfloader.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c index 9843b1f..6ce1062 100644 --- a/tools/libxc/xc_dom_elfloader.c +++ b/tools/libxc/xc_dom_elfloader.c @@ -128,6 +128,8 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, return 0; } + size =3D elf->bsd_symtab_pend - elf->bsd_symtab_pstart; + if ( load ) { char *hdr_ptr; @@ -135,11 +137,10 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, if ( !dom->bsd_symtab_start ) return 0; - size =3D dom->kernel_seg.vend - dom->bsd_symtab_start; hdr_ptr =3D xc_dom_vaddr_to_ptr(dom, dom->bsd_symtab_start, &allow_size); if ( hdr_ptr =3D=3D NULL ) { - DOMPRINTF("%s/load: xc_dom_vaddr_to_ptr(dom,dom->bsd_symtab_start" + DOMPRINTF("%s: xc_dom_vaddr_to_ptr(dom,dom->bsd_symtab_start" " =3D> NULL", __FUNCTION__); return -1; } @@ -152,8 +153,6 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, { char *hdr_ptr; - size =3D sizeof(unsigned) + elf_size(elf, elf->ehdr) + - elf_shdr_count(elf) * elf_size(elf, shdr); hdr_ptr =3D xc_dom_malloc(dom, size); if ( hdr_ptr =3D=3D NULL ) return 0; @@ -161,6 +160,8 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, elf->caller_xdest_size =3D size; hdr =3D ELF_REALPTR2PTRVAL(hdr_ptr); dom->bsd_symtab_start =3D elf_round_up(elf, dom->kernel_seg.vend); + dom->kernel_seg.vend =3D elf_round_up(elf, dom->bsd_symtab_start + size); + return 0; } elf_memcpy_safe(elf, hdr + sizeof(unsigned), @@ -189,9 +190,8 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, } if ( elf->caller_xdest_size < sizeof(unsigned) ) { - DOMPRINTF("%s/%s: header size %"PRIx64" too small", - __FUNCTION__, load =3F "load" : "parse", - (uint64_t)elf->caller_xdest_size); + DOMPRINTF("%s: header size %"PRIx64" too small", + __FUNCTION__, (uint64_t)elf->caller_xdest_size); return -1; } if ( elf_init(&syms, elf->caller_xdest_base + sizeof(unsigned), @@ -219,10 +219,9 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, maxaddr =3D elf_round_up(&syms, symtab + elf_size(&syms, syms.ehdr) + elf_shdr_count(&syms) * elf_size(&syms, shdr)); - DOMPRINTF("%s/%s: bsd_symtab_start=3D%" PRIx64 ", kernel.end=3D0x%" PRIx64 + DOMPRINTF("%s: bsd_symtab_start=3D%" PRIx64 ", kernel.end=3D0x%" PRIx64 " -- symtab=3D0x%" PRIx64 ", maxaddr=3D0x%" PRIx64 "", - __FUNCTION__, load =3F "load" : "parse", - dom->bsd_symtab_start, dom->kernel_seg.vend, + __FUNCTION__, dom->bsd_symtab_start, dom->kernel_seg.vend, symtab, maxaddr); count =3D elf_shdr_count(&syms); @@ -279,13 +278,10 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, type =3D=3D SHT_SYMTAB =3F "symtab" : "strtab", size, maxaddr); - if ( load ) - { - shdr2 =3D elf_shdr_by_index(elf, h); - elf_memcpy_safe(elf, elf_section_start(&syms, shdr), - elf_section_start(elf, shdr2), - size); - } + shdr2 =3D elf_shdr_by_index(elf, h); + elf_memcpy_safe(elf, elf_section_start(&syms, shdr), + elf_section_start(elf, shdr2), + size); } /* Name is NULL. */ @@ -308,8 +304,7 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, dom->bsd_symtab_start =3D 0; return 0; } - if ( !load ) - dom->kernel_seg.vend =3D maxaddr; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7080967284288160408== 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 --===============7080967284288160408==-- From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:22:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6F-0003Jf-Dp; Sat, 20 Jun 2015 23: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 1Z6S6E-0003JP-3N for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:58 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id B9/03-25925-1D5F5855; Sat, 20 Jun 2015 23:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1434842575!11572522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19441 invoked from network); 20 Jun 2015 23:22:56 -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 Jun 2015 23:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6B-0005XA-BE for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6B-00035G-A2 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:55 +0000 Date: Sat, 20 Jun 2015 23:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Do not expose PMU to domain 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 d45e9b7c53428a2aa4d067927e7ef5e30783fb8b Author: Ian Campbell AuthorDate: Wed Jun 17 13:37:00 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 14:07:16 2015 +0100 xen: arm: Do not expose PMU to domain 0 It uses a PPI which we cannot route to a guest, and will surely need more support than just that anyway. I noticed this on Mustang with UEFI where the built in DTB contains a node of this type. According to linux/Documentation/devicetree/bindings/arm/pmu.txt the ARM v7 (Cortex-A{7,15}) PMUs require a PPI too, so blacklist them as well. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1e545fe..e9cb8a9 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1105,6 +1105,9 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("multiboot,module"), DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_COMPATIBLE("arm,psci-0.2"), + DT_MATCH_COMPATIBLE("arm,cortex-a7-pmu"), + DT_MATCH_COMPATIBLE("arm,cortex-a15-pmu"), + DT_MATCH_COMPATIBLE("arm,armv8-pmuv3"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), /* The memory mapped timer is not supported by 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 Sat Jun 20 23:22:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6F-0003Jf-Dp; Sat, 20 Jun 2015 23: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 1Z6S6E-0003JP-3N for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:58 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id B9/03-25925-1D5F5855; Sat, 20 Jun 2015 23:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1434842575!11572522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19441 invoked from network); 20 Jun 2015 23:22:56 -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 Jun 2015 23:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6B-0005XA-BE for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6B-00035G-A2 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:22:55 +0000 Date: Sat, 20 Jun 2015 23:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Do not expose PMU to domain 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 d45e9b7c53428a2aa4d067927e7ef5e30783fb8b Author: Ian Campbell AuthorDate: Wed Jun 17 13:37:00 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 14:07:16 2015 +0100 xen: arm: Do not expose PMU to domain 0 It uses a PPI which we cannot route to a guest, and will surely need more support than just that anyway. I noticed this on Mustang with UEFI where the built in DTB contains a node of this type. According to linux/Documentation/devicetree/bindings/arm/pmu.txt the ARM v7 (Cortex-A{7,15}) PMUs require a PPI too, so blacklist them as well. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1e545fe..e9cb8a9 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1105,6 +1105,9 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("multiboot,module"), DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_COMPATIBLE("arm,psci-0.2"), + DT_MATCH_COMPATIBLE("arm,cortex-a7-pmu"), + DT_MATCH_COMPATIBLE("arm,cortex-a15-pmu"), + DT_MATCH_COMPATIBLE("arm,armv8-pmuv3"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), /* The memory mapped timer is not supported by 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 Sat Jun 20 23:23:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6P-0003L4-GW; Sat, 20 Jun 2015 23:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6O-0003Kx-Iw for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:08 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id B7/94-03371-BD5F5855; Sat, 20 Jun 2015 23:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434842585!25181618!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22874 invoked from network); 20 Jun 2015 23:23:06 -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; 20 Jun 2015 23:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6L-0005Xl-N8 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6L-00035r-FM for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:05 +0000 Date: Sat, 20 Jun 2015 23:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: refactor toolstack save restore code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c6ef839d84726cf420a0381174f0f8ffac6ffd84 Author: Wei Liu AuthorDate: Wed Jun 17 12:08:38 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 14:11:25 2015 +0100 libxl: refactor toolstack save restore code This patch does following things: 1. Document v1 format. 2. Factor out function to handle QEMU restore data and function to handle v1 blob for restore path. 3. Refactor save function to generate different blobs in the order specified in format specification. 4. Change functions to use "goto out" idiom. No functional changes introduced. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 232 +++++++++++++++++++++++++++++------------------ 1 files changed, 142 insertions(+), 90 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 867172a..600393d 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1032,6 +1032,15 @@ struct libxl__physmap_info { char name[]; }; +/* Bump version every time when toolstack saved data changes. + * Different types of data are arranged in the specified order. + * + * Version 1: + * uint32_t version + * QEMU physmap data: + * uint32_t count + * libxl__physmap_info * count + */ #define TOOLSTACK_SAVE_VERSION 1 static inline char *restore_helper(libxl__gc *gc, uint32_t dm_domid, @@ -1043,41 +1052,28 @@ static inline char *restore_helper(libxl__gc *gc, uint32_t dm_domid, phys_offset, node); } -int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, - uint32_t size, void *user) +static int libxl__toolstack_restore_qemu(libxl__gc *gc, uint32_t domid, + const uint8_t *ptr, uint32_t size) { - libxl__save_helper_state *shs = user; - libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); - STATE_AO_GC(dcs->ao); - int i, ret; - const uint8_t *ptr = buf; - uint32_t count = 0, version = 0; - struct libxl__physmap_info* pi; + int ret, i; + uint32_t count; char *xs_path; uint32_t dm_domid; + struct libxl__physmap_info *pi; - LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); - - if (size < sizeof(version) + sizeof(count)) { + if (size < sizeof(count)) { LOG(ERROR, "wrong size"); - return -1; - } - - memcpy(&version, ptr, sizeof(version)); - ptr += sizeof(version); - - if (version != TOOLSTACK_SAVE_VERSION) { - LOG(ERROR, "wrong version"); - return -1; + ret = -1; + goto out; } memcpy(&count, ptr, sizeof(count)); ptr += sizeof(count); - if (size < sizeof(version) + sizeof(count) + - count * (sizeof(struct libxl__physmap_info))) { + if (size < sizeof(count) + count*(sizeof(struct libxl__physmap_info))) { LOG(ERROR, "wrong size"); - return -1; + ret = -1; + goto out; } dm_domid = libxl_get_stubdom_id(CTX, domid); @@ -1088,21 +1084,64 @@ int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "start_addr"); ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->start_addr); - if (ret) - return -1; + if (ret) goto out; + xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "size"); ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->size); - if (ret) - return -1; + if (ret) goto out; + if (pi->namelen > 0) { xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "name"); ret = libxl__xs_write(gc, 0, xs_path, "%s", pi->name); - if (ret) - return -1; + if (ret) goto out; } } - return 0; + + ret = 0; +out: + return ret; + +} + +static int libxl__toolstack_restore_v1(libxl__gc *gc, uint32_t domid, + const uint8_t *ptr, uint32_t size) +{ + return libxl__toolstack_restore_qemu(gc, domid, ptr, size); +} + +int libxl__toolstack_restore(uint32_t domid, const uint8_t *ptr, + uint32_t size, void *user) +{ + libxl__save_helper_state *shs = user; + libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); + STATE_AO_GC(dcs->ao); + int ret; + uint32_t version = 0, bufsize; + + LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); + + if (size < sizeof(version)) { + LOG(ERROR, "wrong size"); + ret = -1; + goto out; + } + + memcpy(&version, ptr, sizeof(version)); + ptr += sizeof(version); + bufsize = size - sizeof(version); + + switch (version) { + case 1: + ret = libxl__toolstack_restore_v1(gc, domid, ptr, bufsize); + break; + default: + LOG(ERROR, "wrong version"); + ret = -1; + } + +out: + return ret; } /*==================== Domain suspend (save) ====================*/ @@ -1685,81 +1724,94 @@ int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *dss_void) { libxl__domain_suspend_state *dss = dss_void; + int ret; STATE_AO_GC(dss->ao); int i = 0; - char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; - unsigned int num = 0; - uint32_t count = 0, version = TOOLSTACK_SAVE_VERSION, namelen = 0; + uint32_t version = TOOLSTACK_SAVE_VERSION; uint8_t *ptr = NULL; - char **entries = NULL; - struct libxl__physmap_info *pi; - uint32_t dm_domid; - dm_domid = libxl_get_stubdom_id(CTX, domid); + ret = -1; - entries = libxl__xs_directory(gc, 0, - libxl__device_model_xs_path(gc, dm_domid, domid, "/physmap"), - &num); - count = num; - - *len = sizeof(version) + sizeof(count); + /* Version number */ + *len = sizeof(version); *buf = calloc(1, *len); + if (*buf == NULL) goto out; ptr = *buf; - if (*buf == NULL) - return -1; - memcpy(ptr, &version, sizeof(version)); - ptr += sizeof(version); - memcpy(ptr, &count, sizeof(count)); - ptr += sizeof(count); - for (i = 0; i < count; i++) { - unsigned long offset; - char *xs_path; - phys_offset = entries[i]; - if (phys_offset == NULL) { - LOG(ERROR, "phys_offset %d is NULL", i); - return -1; - } + /* QEMU physmap data */ + { + char **entries = NULL, *xs_path; + struct libxl__physmap_info *pi; + uint32_t dm_domid; + char *start_addr = NULL, *size = NULL, *phys_offset = NULL; + char *name = NULL; + unsigned int num = 0; + uint32_t count = 0, namelen = 0; + + dm_domid = libxl_get_stubdom_id(CTX, domid); + + xs_path = libxl__device_model_xs_path(gc, dm_domid, domid, + "/physmap"); + entries = libxl__xs_directory(gc, 0, xs_path, &num); + count = num; + + *len += sizeof(count); + *buf = realloc(*buf, *len); + if (*buf == NULL) goto out; + ptr = *buf + sizeof(version); + memcpy(ptr, &count, sizeof(count)); + ptr += sizeof(count); + + for (i = 0; i < count; i++) { + unsigned long offset; + phys_offset = entries[i]; + if (phys_offset == NULL) { + LOG(ERROR, "phys_offset %d is NULL", i); + goto out; + } - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "start_addr"); - start_addr = libxl__xs_read(gc, 0, xs_path); - if (start_addr == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - return -1; - } + xs_path = physmap_path(gc, dm_domid, domid, phys_offset, + "start_addr"); + start_addr = libxl__xs_read(gc, 0, xs_path); + if (start_addr == NULL) { + LOG(ERROR, "%s is NULL", xs_path); + goto out; + } - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "size"); - size = libxl__xs_read(gc, 0, xs_path); - if (size == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - return -1; - } + xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "size"); + size = libxl__xs_read(gc, 0, xs_path); + if (size == NULL) { + LOG(ERROR, "%s is NULL", xs_path); + goto out; + } - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "name"); - name = libxl__xs_read(gc, 0, xs_path); - if (name == NULL) - namelen = 0; - else - namelen = strlen(name) + 1; - *len += namelen + sizeof(struct libxl__physmap_info); - offset = ptr - (*buf); - *buf = realloc(*buf, *len); - if (*buf == NULL) - return -1; - ptr = (*buf) + offset; - pi = (struct libxl__physmap_info *) ptr; - pi->phys_offset = strtoll(phys_offset, NULL, 16); - pi->start_addr = strtoll(start_addr, NULL, 16); - pi->size = strtoll(size, NULL, 16); - pi->namelen = namelen; - memcpy(pi->name, name, namelen); - ptr += sizeof(struct libxl__physmap_info) + namelen; + xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "name"); + name = libxl__xs_read(gc, 0, xs_path); + if (name == NULL) + namelen = 0; + else + namelen = strlen(name) + 1; + *len += namelen + sizeof(struct libxl__physmap_info); + offset = ptr - (*buf); + *buf = realloc(*buf, *len); + if (*buf == NULL) goto out; + ptr = (*buf) + offset; + pi = (struct libxl__physmap_info *) ptr; + pi->phys_offset = strtoll(phys_offset, NULL, 16); + pi->start_addr = strtoll(start_addr, NULL, 16); + pi->size = strtoll(size, NULL, 16); + pi->namelen = namelen; + memcpy(pi->name, name, namelen); + ptr += sizeof(struct libxl__physmap_info) + namelen; + } } LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, *len); - return 0; + ret = 0; +out: + return ret; } static void libxl__domain_suspend_callback(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 Jun 20 23:23:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6P-0003L4-GW; Sat, 20 Jun 2015 23:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6O-0003Kx-Iw for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:08 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id B7/94-03371-BD5F5855; Sat, 20 Jun 2015 23:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434842585!25181618!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22874 invoked from network); 20 Jun 2015 23:23:06 -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; 20 Jun 2015 23:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6L-0005Xl-N8 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6L-00035r-FM for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:05 +0000 Date: Sat, 20 Jun 2015 23:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: refactor toolstack save restore code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c6ef839d84726cf420a0381174f0f8ffac6ffd84 Author: Wei Liu AuthorDate: Wed Jun 17 12:08:38 2015 +0100 Commit: Ian Campbell CommitDate: Wed Jun 17 14:11:25 2015 +0100 libxl: refactor toolstack save restore code This patch does following things: 1. Document v1 format. 2. Factor out function to handle QEMU restore data and function to handle v1 blob for restore path. 3. Refactor save function to generate different blobs in the order specified in format specification. 4. Change functions to use "goto out" idiom. No functional changes introduced. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 232 +++++++++++++++++++++++++++++------------------ 1 files changed, 142 insertions(+), 90 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 867172a..600393d 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1032,6 +1032,15 @@ struct libxl__physmap_info { char name[]; }; +/* Bump version every time when toolstack saved data changes. + * Different types of data are arranged in the specified order. + * + * Version 1: + * uint32_t version + * QEMU physmap data: + * uint32_t count + * libxl__physmap_info * count + */ #define TOOLSTACK_SAVE_VERSION 1 static inline char *restore_helper(libxl__gc *gc, uint32_t dm_domid, @@ -1043,41 +1052,28 @@ static inline char *restore_helper(libxl__gc *gc, uint32_t dm_domid, phys_offset, node); } -int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, - uint32_t size, void *user) +static int libxl__toolstack_restore_qemu(libxl__gc *gc, uint32_t domid, + const uint8_t *ptr, uint32_t size) { - libxl__save_helper_state *shs = user; - libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); - STATE_AO_GC(dcs->ao); - int i, ret; - const uint8_t *ptr = buf; - uint32_t count = 0, version = 0; - struct libxl__physmap_info* pi; + int ret, i; + uint32_t count; char *xs_path; uint32_t dm_domid; + struct libxl__physmap_info *pi; - LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); - - if (size < sizeof(version) + sizeof(count)) { + if (size < sizeof(count)) { LOG(ERROR, "wrong size"); - return -1; - } - - memcpy(&version, ptr, sizeof(version)); - ptr += sizeof(version); - - if (version != TOOLSTACK_SAVE_VERSION) { - LOG(ERROR, "wrong version"); - return -1; + ret = -1; + goto out; } memcpy(&count, ptr, sizeof(count)); ptr += sizeof(count); - if (size < sizeof(version) + sizeof(count) + - count * (sizeof(struct libxl__physmap_info))) { + if (size < sizeof(count) + count*(sizeof(struct libxl__physmap_info))) { LOG(ERROR, "wrong size"); - return -1; + ret = -1; + goto out; } dm_domid = libxl_get_stubdom_id(CTX, domid); @@ -1088,21 +1084,64 @@ int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "start_addr"); ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->start_addr); - if (ret) - return -1; + if (ret) goto out; + xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "size"); ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->size); - if (ret) - return -1; + if (ret) goto out; + if (pi->namelen > 0) { xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "name"); ret = libxl__xs_write(gc, 0, xs_path, "%s", pi->name); - if (ret) - return -1; + if (ret) goto out; } } - return 0; + + ret = 0; +out: + return ret; + +} + +static int libxl__toolstack_restore_v1(libxl__gc *gc, uint32_t domid, + const uint8_t *ptr, uint32_t size) +{ + return libxl__toolstack_restore_qemu(gc, domid, ptr, size); +} + +int libxl__toolstack_restore(uint32_t domid, const uint8_t *ptr, + uint32_t size, void *user) +{ + libxl__save_helper_state *shs = user; + libxl__domain_create_state *dcs = CONTAINER_OF(shs, *dcs, shs); + STATE_AO_GC(dcs->ao); + int ret; + uint32_t version = 0, bufsize; + + LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); + + if (size < sizeof(version)) { + LOG(ERROR, "wrong size"); + ret = -1; + goto out; + } + + memcpy(&version, ptr, sizeof(version)); + ptr += sizeof(version); + bufsize = size - sizeof(version); + + switch (version) { + case 1: + ret = libxl__toolstack_restore_v1(gc, domid, ptr, bufsize); + break; + default: + LOG(ERROR, "wrong version"); + ret = -1; + } + +out: + return ret; } /*==================== Domain suspend (save) ====================*/ @@ -1685,81 +1724,94 @@ int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *dss_void) { libxl__domain_suspend_state *dss = dss_void; + int ret; STATE_AO_GC(dss->ao); int i = 0; - char *start_addr = NULL, *size = NULL, *phys_offset = NULL, *name = NULL; - unsigned int num = 0; - uint32_t count = 0, version = TOOLSTACK_SAVE_VERSION, namelen = 0; + uint32_t version = TOOLSTACK_SAVE_VERSION; uint8_t *ptr = NULL; - char **entries = NULL; - struct libxl__physmap_info *pi; - uint32_t dm_domid; - dm_domid = libxl_get_stubdom_id(CTX, domid); + ret = -1; - entries = libxl__xs_directory(gc, 0, - libxl__device_model_xs_path(gc, dm_domid, domid, "/physmap"), - &num); - count = num; - - *len = sizeof(version) + sizeof(count); + /* Version number */ + *len = sizeof(version); *buf = calloc(1, *len); + if (*buf == NULL) goto out; ptr = *buf; - if (*buf == NULL) - return -1; - memcpy(ptr, &version, sizeof(version)); - ptr += sizeof(version); - memcpy(ptr, &count, sizeof(count)); - ptr += sizeof(count); - for (i = 0; i < count; i++) { - unsigned long offset; - char *xs_path; - phys_offset = entries[i]; - if (phys_offset == NULL) { - LOG(ERROR, "phys_offset %d is NULL", i); - return -1; - } + /* QEMU physmap data */ + { + char **entries = NULL, *xs_path; + struct libxl__physmap_info *pi; + uint32_t dm_domid; + char *start_addr = NULL, *size = NULL, *phys_offset = NULL; + char *name = NULL; + unsigned int num = 0; + uint32_t count = 0, namelen = 0; + + dm_domid = libxl_get_stubdom_id(CTX, domid); + + xs_path = libxl__device_model_xs_path(gc, dm_domid, domid, + "/physmap"); + entries = libxl__xs_directory(gc, 0, xs_path, &num); + count = num; + + *len += sizeof(count); + *buf = realloc(*buf, *len); + if (*buf == NULL) goto out; + ptr = *buf + sizeof(version); + memcpy(ptr, &count, sizeof(count)); + ptr += sizeof(count); + + for (i = 0; i < count; i++) { + unsigned long offset; + phys_offset = entries[i]; + if (phys_offset == NULL) { + LOG(ERROR, "phys_offset %d is NULL", i); + goto out; + } - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "start_addr"); - start_addr = libxl__xs_read(gc, 0, xs_path); - if (start_addr == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - return -1; - } + xs_path = physmap_path(gc, dm_domid, domid, phys_offset, + "start_addr"); + start_addr = libxl__xs_read(gc, 0, xs_path); + if (start_addr == NULL) { + LOG(ERROR, "%s is NULL", xs_path); + goto out; + } - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "size"); - size = libxl__xs_read(gc, 0, xs_path); - if (size == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - return -1; - } + xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "size"); + size = libxl__xs_read(gc, 0, xs_path); + if (size == NULL) { + LOG(ERROR, "%s is NULL", xs_path); + goto out; + } - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "name"); - name = libxl__xs_read(gc, 0, xs_path); - if (name == NULL) - namelen = 0; - else - namelen = strlen(name) + 1; - *len += namelen + sizeof(struct libxl__physmap_info); - offset = ptr - (*buf); - *buf = realloc(*buf, *len); - if (*buf == NULL) - return -1; - ptr = (*buf) + offset; - pi = (struct libxl__physmap_info *) ptr; - pi->phys_offset = strtoll(phys_offset, NULL, 16); - pi->start_addr = strtoll(start_addr, NULL, 16); - pi->size = strtoll(size, NULL, 16); - pi->namelen = namelen; - memcpy(pi->name, name, namelen); - ptr += sizeof(struct libxl__physmap_info) + namelen; + xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "name"); + name = libxl__xs_read(gc, 0, xs_path); + if (name == NULL) + namelen = 0; + else + namelen = strlen(name) + 1; + *len += namelen + sizeof(struct libxl__physmap_info); + offset = ptr - (*buf); + *buf = realloc(*buf, *len); + if (*buf == NULL) goto out; + ptr = (*buf) + offset; + pi = (struct libxl__physmap_info *) ptr; + pi->phys_offset = strtoll(phys_offset, NULL, 16); + pi->start_addr = strtoll(start_addr, NULL, 16); + pi->size = strtoll(size, NULL, 16); + pi->namelen = namelen; + memcpy(pi->name, name, namelen); + ptr += sizeof(struct libxl__physmap_info) + namelen; + } } LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, *len); - return 0; + ret = 0; +out: + return ret; } static void libxl__domain_suspend_callback(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 Jun 20 23:23:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:23: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 1Z6S6Z-0003MY-J2; Sat, 20 Jun 2015 23:23:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6Y-0003MQ-K3 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:18 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 22/4F-13047-6E5F5855; Sat, 20 Jun 2015 23:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1434842596!25192018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14991 invoked from network); 20 Jun 2015 23:23:17 -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; 20 Jun 2015 23:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6V-0005Xt-R4 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6V-00036J-QE for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:15 +0000 Date: Sat, 20 Jun 2015 23:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: fix del_watches and del_transactions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d962aa44e4128ea677ce8407fc2483d94f007d91 Author: Wei Liu AuthorDate: Wed Jun 17 20:39:49 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 18 09:54:27 2015 +0100 oxenstored: fix del_watches and del_transactions The statement to reset nb_watches should be in del_watches, not del_transactions. Signed-off-by: Wei Liu Cc: David Scott Acked-by: David Scott [ ijc -- fix syntax error by adding a ";" to the previous line in the new location and removing from the previous line in the old ] --- tools/ocaml/xenstored/connection.ml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 9de4978..0a2c481 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -187,11 +187,11 @@ let del_watch con path token = apath, w let del_watches con = - Hashtbl.clear con.watches + Hashtbl.clear con.watches; + con.nb_watches <- 0 let del_transactions con = - Hashtbl.clear con.transactions; - con.nb_watches <- 0 + Hashtbl.clear con.transactions let list_watches con = let ll = Hashtbl.fold -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:23:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:23: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 1Z6S6Z-0003MY-J2; Sat, 20 Jun 2015 23:23:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6Y-0003MQ-K3 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:18 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 22/4F-13047-6E5F5855; Sat, 20 Jun 2015 23:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1434842596!25192018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14991 invoked from network); 20 Jun 2015 23:23:17 -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; 20 Jun 2015 23:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6V-0005Xt-R4 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6V-00036J-QE for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:15 +0000 Date: Sat, 20 Jun 2015 23:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: fix del_watches and del_transactions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d962aa44e4128ea677ce8407fc2483d94f007d91 Author: Wei Liu AuthorDate: Wed Jun 17 20:39:49 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 18 09:54:27 2015 +0100 oxenstored: fix del_watches and del_transactions The statement to reset nb_watches should be in del_watches, not del_transactions. Signed-off-by: Wei Liu Cc: David Scott Acked-by: David Scott [ ijc -- fix syntax error by adding a ";" to the previous line in the new location and removing from the previous line in the old ] --- tools/ocaml/xenstored/connection.ml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 9de4978..0a2c481 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -187,11 +187,11 @@ let del_watch con path token = apath, w let del_watches con = - Hashtbl.clear con.watches + Hashtbl.clear con.watches; + con.nb_watches <- 0 let del_transactions con = - Hashtbl.clear con.transactions; - con.nb_watches <- 0 + Hashtbl.clear con.transactions let list_watches con = let ll = Hashtbl.fold -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6k-0003O0-Lb; Sat, 20 Jun 2015 23:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6j-0003Nr-0R for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:29 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B0/B8-27764-0F5F5855; Sat, 20 Jun 2015 23:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1434842606!17601903!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27433 invoked from network); 20 Jun 2015 23:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6g-0005Y1-0i for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6f-00036s-VP for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:25 +0000 Date: Sat, 20 Jun 2015 23:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvusb: don't rely on linux kernel macros for the interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e320f14c6ad5e423c5fae088e69a72c42c9ad678 Author: Juergen Gross AuthorDate: Thu Jun 18 14:52:32 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:52:32 2015 +0200 pvusb: don't rely on linux kernel macros for the interface The interface description of pvUSB lacks some access macros as using linux kernel macros is assumed to work well. This solution is rather unfriendly for pvusb implementations being outside the linux kernel. Additionally things will break quite unpleasent in case the linux kernel implementation is changed. To avoid these problems define own macros for accessing bitfields of the interface and for values of several structure members. While working on the file add some more comments, especially for the xenstore interface. Signed-off-by: Juergen Gross --- xen/include/public/io/usbif.h | 140 +++++++++++++++++++++++++++++++++++------ 1 files changed, 121 insertions(+), 19 deletions(-) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index 0af2a38..9ef0cdc 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -31,6 +31,76 @@ #include "ring.h" #include "../grant_table.h" +/* + * Feature and Parameter Negotiation + * ================================= + * The two halves of a Xen pvUSB driver utilize nodes within the XenStore to + * communicate capabilities and to negotiate operating parameters. This + * section enumerates these nodes which reside in the respective front and + * backend portions of the XenStore, following the XenBus convention. + * + * Any specified default value is in effect if the corresponding XenBus node + * is not present in the XenStore. + * + * XenStore nodes in sections marked "PRIVATE" are solely for use by the + * driver side whose XenBus tree contains them. + * + ***************************************************************************** + * Backend XenBus Nodes + ***************************************************************************** + * + *------------------ Backend Device Identification (PRIVATE) ------------------ + * + * num-ports + * Values: unsigned [1...31] + * + * Number of ports for this (virtual) USB host connector. + * + * usb-ver + * Values: unsigned [1...2] + * + * USB version of this host connector: 1 = USB 1.1, 2 = USB 2.0. + * + * port/[1...31] + * Values: string + * + * Physical USB device connected to the given port, e.g. "3-1.5". + * + ***************************************************************************** + * Frontend XenBus Nodes + ***************************************************************************** + * + *----------------------- Request Transport Parameters ----------------------- + * + * event-channel + * Values: unsigned + * + * The identifier of the Xen event channel used to signal activity + * in the ring buffer. + * + * urb-ring-ref + * Values: unsigned + * + * The Xen grant reference granting permission for the backend to map + * the sole page in a single page sized ring buffer. This is the ring + * buffer for urb requests. + * + * conn-ring-ref + * Values: unsigned + * + * The Xen grant reference granting permission for the backend to map + * the sole page in a single page sized ring buffer. This is the ring + * buffer for connection/disconnection requests. + * + * protocol + * Values: string (XEN_IO_PROTO_ABI_*) + * Default Value: XEN_IO_PROTO_ABI_NATIVE + * + * The machine ABI rules governing the format of all ring request and + * response structures. + * + */ + enum usb_spec_version { USB_VER_UNKNOWN = 0, USB_VER_USB11, @@ -41,37 +111,65 @@ enum usb_spec_version { /* * USB pipe in usbif_request * - * bits 0-5 are specific bits for virtual USB driver. - * bits 7-31 are standard urb pipe. - * - * - port number(NEW): bits 0-4 - * (USB_MAXCHILDREN is 31) + * - port number: bits 0-4 + * (USB_MAXCHILDREN is 31) * - * - operation flag(NEW): bit 5 - * (0 = submit urb, - * 1 = unlink urb) + * - operation flag: bit 5 + * (0 = submit urb, + * 1 = unlink urb) * * - direction: bit 7 - * (0 = Host-to-Device [Out] - * 1 = Device-to-Host [In]) + * (0 = Host-to-Device [Out] + * 1 = Device-to-Host [In]) * * - device address: bits 8-14 * * - endpoint: bits 15-18 * - * - pipe type: bits 30-31 - * (00 = isochronous, 01 = interrupt, - * 10 = control, 11 = bulk) + * - pipe type: bits 30-31 + * (00 = isochronous, 01 = interrupt, + * 10 = control, 11 = bulk) */ -#define usbif_pipeportnum(pipe) ((pipe) & 0x1f) -#define usbif_setportnum_pipe(pipe, portnum) \ - ((pipe)|(portnum)) -#define usbif_pipeunlink(pipe) ((pipe) & 0x20) -#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) -#define usbif_setunlink_pipe(pipe) ((pipe)|(0x20)) +#define USBIF_PIPE_PORT_MASK 0x0000001f +#define USBIF_PIPE_UNLINK 0x00000020 +#define USBIF_PIPE_DIR 0x00000080 +#define USBIF_PIPE_DEV_MASK 0x0000007f +#define USBIF_PIPE_DEV_SHIFT 8 +#define USBIF_PIPE_EP_MASK 0x0000000f +#define USBIF_PIPE_EP_SHIFT 15 +#define USBIF_PIPE_TYPE_MASK 0x00000003 +#define USBIF_PIPE_TYPE_SHIFT 30 +#define USBIF_PIPE_TYPE_ISOC 0 +#define USBIF_PIPE_TYPE_INT 1 +#define USBIF_PIPE_TYPE_CTRL 2 +#define USBIF_PIPE_TYPE_BULK 3 + +#define usbif_pipeportnum(pipe) ((pipe) & USBIF_PIPE_PORT_MASK) +#define usbif_setportnum_pipe(pipe, portnum) ((pipe) | (portnum)) + +#define usbif_pipeunlink(pipe) ((pipe) & USBIF_PIPE_UNLINK) +#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) +#define usbif_setunlink_pipe(pipe) ((pipe) | USBIF_PIPE_UNLINK) + +#define usbif_pipein(pipe) ((pipe) & USBIF_PIPE_DIR) +#define usbif_pipeout(pipe) (!usbif_pipein(pipe)) + +#define usbif_pipedevice(pipe) \ + (((pipe) >> USBIF_PIPE_DEV_SHIFT) & USBIF_PIPE_DEV_MASK) + +#define usbif_pipeendpoint(pipe) \ + (((pipe) >> USBIF_PIPE_EP_SHIFT) & USBIF_PIPE_EP_MASK) + +#define usbif_pipetype(pipe) \ + (((pipe) >> USBIF_PIPE_TYPE_SHIFT) & USBIF_PIPE_TYPE_MASK) +#define usbif_pipeisoc(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_ISOC) +#define usbif_pipeint(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_INT) +#define usbif_pipectrl(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_CTRL) +#define usbif_pipebulk(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_BULK) #define USBIF_MAX_SEGMENTS_PER_REQUEST (16) +#define USBIF_MAX_PORTNR 31 /* * RING for transferring urbs. @@ -141,6 +239,10 @@ struct usbif_conn_response { uint16_t id; /* request id */ uint8_t portnum; /* port number */ uint8_t speed; /* usb_device_speed */ +#define USBIF_SPEED_NONE 0 +#define USBIF_SPEED_LOW 1 +#define USBIF_SPEED_FULL 2 +#define USBIF_SPEED_HIGH 3 }; typedef struct usbif_conn_response usbif_conn_response_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 Jun 20 23:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6k-0003O0-Lb; Sat, 20 Jun 2015 23:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6j-0003Nr-0R for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:29 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B0/B8-27764-0F5F5855; Sat, 20 Jun 2015 23:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1434842606!17601903!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27433 invoked from network); 20 Jun 2015 23:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6g-0005Y1-0i for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6f-00036s-VP for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:25 +0000 Date: Sat, 20 Jun 2015 23:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvusb: don't rely on linux kernel macros for the interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e320f14c6ad5e423c5fae088e69a72c42c9ad678 Author: Juergen Gross AuthorDate: Thu Jun 18 14:52:32 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:52:32 2015 +0200 pvusb: don't rely on linux kernel macros for the interface The interface description of pvUSB lacks some access macros as using linux kernel macros is assumed to work well. This solution is rather unfriendly for pvusb implementations being outside the linux kernel. Additionally things will break quite unpleasent in case the linux kernel implementation is changed. To avoid these problems define own macros for accessing bitfields of the interface and for values of several structure members. While working on the file add some more comments, especially for the xenstore interface. Signed-off-by: Juergen Gross --- xen/include/public/io/usbif.h | 140 +++++++++++++++++++++++++++++++++++------ 1 files changed, 121 insertions(+), 19 deletions(-) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index 0af2a38..9ef0cdc 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -31,6 +31,76 @@ #include "ring.h" #include "../grant_table.h" +/* + * Feature and Parameter Negotiation + * ================================= + * The two halves of a Xen pvUSB driver utilize nodes within the XenStore to + * communicate capabilities and to negotiate operating parameters. This + * section enumerates these nodes which reside in the respective front and + * backend portions of the XenStore, following the XenBus convention. + * + * Any specified default value is in effect if the corresponding XenBus node + * is not present in the XenStore. + * + * XenStore nodes in sections marked "PRIVATE" are solely for use by the + * driver side whose XenBus tree contains them. + * + ***************************************************************************** + * Backend XenBus Nodes + ***************************************************************************** + * + *------------------ Backend Device Identification (PRIVATE) ------------------ + * + * num-ports + * Values: unsigned [1...31] + * + * Number of ports for this (virtual) USB host connector. + * + * usb-ver + * Values: unsigned [1...2] + * + * USB version of this host connector: 1 = USB 1.1, 2 = USB 2.0. + * + * port/[1...31] + * Values: string + * + * Physical USB device connected to the given port, e.g. "3-1.5". + * + ***************************************************************************** + * Frontend XenBus Nodes + ***************************************************************************** + * + *----------------------- Request Transport Parameters ----------------------- + * + * event-channel + * Values: unsigned + * + * The identifier of the Xen event channel used to signal activity + * in the ring buffer. + * + * urb-ring-ref + * Values: unsigned + * + * The Xen grant reference granting permission for the backend to map + * the sole page in a single page sized ring buffer. This is the ring + * buffer for urb requests. + * + * conn-ring-ref + * Values: unsigned + * + * The Xen grant reference granting permission for the backend to map + * the sole page in a single page sized ring buffer. This is the ring + * buffer for connection/disconnection requests. + * + * protocol + * Values: string (XEN_IO_PROTO_ABI_*) + * Default Value: XEN_IO_PROTO_ABI_NATIVE + * + * The machine ABI rules governing the format of all ring request and + * response structures. + * + */ + enum usb_spec_version { USB_VER_UNKNOWN = 0, USB_VER_USB11, @@ -41,37 +111,65 @@ enum usb_spec_version { /* * USB pipe in usbif_request * - * bits 0-5 are specific bits for virtual USB driver. - * bits 7-31 are standard urb pipe. - * - * - port number(NEW): bits 0-4 - * (USB_MAXCHILDREN is 31) + * - port number: bits 0-4 + * (USB_MAXCHILDREN is 31) * - * - operation flag(NEW): bit 5 - * (0 = submit urb, - * 1 = unlink urb) + * - operation flag: bit 5 + * (0 = submit urb, + * 1 = unlink urb) * * - direction: bit 7 - * (0 = Host-to-Device [Out] - * 1 = Device-to-Host [In]) + * (0 = Host-to-Device [Out] + * 1 = Device-to-Host [In]) * * - device address: bits 8-14 * * - endpoint: bits 15-18 * - * - pipe type: bits 30-31 - * (00 = isochronous, 01 = interrupt, - * 10 = control, 11 = bulk) + * - pipe type: bits 30-31 + * (00 = isochronous, 01 = interrupt, + * 10 = control, 11 = bulk) */ -#define usbif_pipeportnum(pipe) ((pipe) & 0x1f) -#define usbif_setportnum_pipe(pipe, portnum) \ - ((pipe)|(portnum)) -#define usbif_pipeunlink(pipe) ((pipe) & 0x20) -#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) -#define usbif_setunlink_pipe(pipe) ((pipe)|(0x20)) +#define USBIF_PIPE_PORT_MASK 0x0000001f +#define USBIF_PIPE_UNLINK 0x00000020 +#define USBIF_PIPE_DIR 0x00000080 +#define USBIF_PIPE_DEV_MASK 0x0000007f +#define USBIF_PIPE_DEV_SHIFT 8 +#define USBIF_PIPE_EP_MASK 0x0000000f +#define USBIF_PIPE_EP_SHIFT 15 +#define USBIF_PIPE_TYPE_MASK 0x00000003 +#define USBIF_PIPE_TYPE_SHIFT 30 +#define USBIF_PIPE_TYPE_ISOC 0 +#define USBIF_PIPE_TYPE_INT 1 +#define USBIF_PIPE_TYPE_CTRL 2 +#define USBIF_PIPE_TYPE_BULK 3 + +#define usbif_pipeportnum(pipe) ((pipe) & USBIF_PIPE_PORT_MASK) +#define usbif_setportnum_pipe(pipe, portnum) ((pipe) | (portnum)) + +#define usbif_pipeunlink(pipe) ((pipe) & USBIF_PIPE_UNLINK) +#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) +#define usbif_setunlink_pipe(pipe) ((pipe) | USBIF_PIPE_UNLINK) + +#define usbif_pipein(pipe) ((pipe) & USBIF_PIPE_DIR) +#define usbif_pipeout(pipe) (!usbif_pipein(pipe)) + +#define usbif_pipedevice(pipe) \ + (((pipe) >> USBIF_PIPE_DEV_SHIFT) & USBIF_PIPE_DEV_MASK) + +#define usbif_pipeendpoint(pipe) \ + (((pipe) >> USBIF_PIPE_EP_SHIFT) & USBIF_PIPE_EP_MASK) + +#define usbif_pipetype(pipe) \ + (((pipe) >> USBIF_PIPE_TYPE_SHIFT) & USBIF_PIPE_TYPE_MASK) +#define usbif_pipeisoc(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_ISOC) +#define usbif_pipeint(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_INT) +#define usbif_pipectrl(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_CTRL) +#define usbif_pipebulk(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_BULK) #define USBIF_MAX_SEGMENTS_PER_REQUEST (16) +#define USBIF_MAX_PORTNR 31 /* * RING for transferring urbs. @@ -141,6 +239,10 @@ struct usbif_conn_response { uint16_t id; /* request id */ uint8_t portnum; /* port number */ uint8_t speed; /* usb_device_speed */ +#define USBIF_SPEED_NONE 0 +#define USBIF_SPEED_LOW 1 +#define USBIF_SPEED_FULL 2 +#define USBIF_SPEED_HIGH 3 }; typedef struct usbif_conn_response usbif_conn_response_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 Jun 20 23:23:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6t-0003PL-O6; Sat, 20 Jun 2015 23:23:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6s-0003P9-Du for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:38 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id EC/AD-11060-9F5F5855; Sat, 20 Jun 2015 23:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1434842616!18241958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3705 invoked from network); 20 Jun 2015 23:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6q-0005YB-6y for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6q-00037M-4h for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:36 +0000 Date: Sat, 20 Jun 2015 23:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: simplify port_is_valid() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01280dc19cf3da089f98faf4f524b54b5a191df0 Author: David Vrabel AuthorDate: Thu Jun 18 14:53:23 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:53:23 2015 +0200 evtchn: simplify port_is_valid() By keeping a count of the number of currently valid event channels, port_is_valid() can be simplified. d->valid_evtchns is only increased (while holding d->event_lock), so port_is_valid() may be safely called without taking the lock (this will be useful later). Signed-off-by: David Vrabel --- xen/common/event_channel.c | 3 +++ xen/include/xen/event.h | 6 +----- xen/include/xen/sched.h | 5 +++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 947880f..fd48646 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -189,6 +189,8 @@ static int get_free_port(struct domain *d) return -ENOMEM; bucket_from_port(d, port) = chn; + write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET); + return port; } @@ -1254,6 +1256,7 @@ int evtchn_init(struct domain *d) d->evtchn = alloc_evtchn_bucket(d, 0); if ( !d->evtchn ) return -ENOMEM; + d->valid_evtchns = EVTCHNS_PER_BUCKET; spin_lock_init_prof(d, event_lock); if ( get_free_port(d) != 0 ) diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 690f865..af923d1 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -89,11 +89,7 @@ static inline bool_t port_is_valid(struct domain *d, unsigned int p) { if ( p >= d->max_evtchns ) return 0; - if ( !d->evtchn ) - return 0; - if ( p < EVTCHNS_PER_BUCKET ) - return 1; - return group_from_port(d, p) != NULL && bucket_from_port(d, p) != NULL; + return p < read_atomic(&d->valid_evtchns); } static inline struct evtchn *evtchn_from_port(struct domain *d, unsigned int p) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 80c6f62..604d047 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -336,8 +336,9 @@ struct domain /* Event channel information. */ struct evtchn *evtchn; /* first bucket only */ struct evtchn **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */ - unsigned int max_evtchns; - unsigned int max_evtchn_port; + unsigned int max_evtchns; /* number supported by ABI */ + unsigned int max_evtchn_port; /* max permitted port number */ + unsigned int valid_evtchns; /* number of allocated event channels */ spinlock_t event_lock; const struct evtchn_port_ops *evtchn_port_ops; struct evtchn_fifo_domain *evtchn_fifo; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:23:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S6t-0003PL-O6; Sat, 20 Jun 2015 23:23:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6s-0003P9-Du for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:38 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id EC/AD-11060-9F5F5855; Sat, 20 Jun 2015 23:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1434842616!18241958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3705 invoked from network); 20 Jun 2015 23:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S6q-0005YB-6y for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S6q-00037M-4h for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:36 +0000 Date: Sat, 20 Jun 2015 23:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: simplify port_is_valid() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01280dc19cf3da089f98faf4f524b54b5a191df0 Author: David Vrabel AuthorDate: Thu Jun 18 14:53:23 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:53:23 2015 +0200 evtchn: simplify port_is_valid() By keeping a count of the number of currently valid event channels, port_is_valid() can be simplified. d->valid_evtchns is only increased (while holding d->event_lock), so port_is_valid() may be safely called without taking the lock (this will be useful later). Signed-off-by: David Vrabel --- xen/common/event_channel.c | 3 +++ xen/include/xen/event.h | 6 +----- xen/include/xen/sched.h | 5 +++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 947880f..fd48646 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -189,6 +189,8 @@ static int get_free_port(struct domain *d) return -ENOMEM; bucket_from_port(d, port) = chn; + write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET); + return port; } @@ -1254,6 +1256,7 @@ int evtchn_init(struct domain *d) d->evtchn = alloc_evtchn_bucket(d, 0); if ( !d->evtchn ) return -ENOMEM; + d->valid_evtchns = EVTCHNS_PER_BUCKET; spin_lock_init_prof(d, event_lock); if ( get_free_port(d) != 0 ) diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 690f865..af923d1 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -89,11 +89,7 @@ static inline bool_t port_is_valid(struct domain *d, unsigned int p) { if ( p >= d->max_evtchns ) return 0; - if ( !d->evtchn ) - return 0; - if ( p < EVTCHNS_PER_BUCKET ) - return 1; - return group_from_port(d, p) != NULL && bucket_from_port(d, p) != NULL; + return p < read_atomic(&d->valid_evtchns); } static inline struct evtchn *evtchn_from_port(struct domain *d, unsigned int p) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 80c6f62..604d047 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -336,8 +336,9 @@ struct domain /* Event channel information. */ struct evtchn *evtchn; /* first bucket only */ struct evtchn **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */ - unsigned int max_evtchns; - unsigned int max_evtchn_port; + unsigned int max_evtchns; /* number supported by ABI */ + unsigned int max_evtchn_port; /* max permitted port number */ + unsigned int valid_evtchns; /* number of allocated event channels */ spinlock_t event_lock; const struct evtchn_port_ops *evtchn_port_ops; struct evtchn_fifo_domain *evtchn_fifo; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:23:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:23: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 1Z6S73-0003RD-T3; Sat, 20 Jun 2015 23:23:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S72-0003R2-UF for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:49 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 5C/8E-31304-406F5855; Sat, 20 Jun 2015 23:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434842626!15692277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25360 invoked from network); 20 Jun 2015 23:23:47 -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; 20 Jun 2015 23:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S70-0005YJ-C1 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S70-00038r-Ae for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:46 +0000 Date: Sat, 20 Jun 2015 23:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: remove the locking when unmasking an event channel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e156654d4eb2fdeb524e6b40838767a5dc918966 Author: David Vrabel AuthorDate: Thu Jun 18 14:54:25 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:54:25 2015 +0200 evtchn: remove the locking when unmasking an event channel The event channel lock is no longer required to check if the port is valid. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index fd48646..2208de0 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -927,8 +927,6 @@ int evtchn_unmask(unsigned int port) struct domain *d = current->domain; struct evtchn *evtchn; - ASSERT(spin_is_locked(&d->event_lock)); - if ( unlikely(!port_is_valid(d, port)) ) return -EINVAL; @@ -1095,9 +1093,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_unmask unmask; if ( copy_from_guest(&unmask, arg, 1) != 0 ) return -EFAULT; - spin_lock(¤t->domain->event_lock); rc = evtchn_unmask(unmask.port); - spin_unlock(¤t->domain->event_lock); 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 Jun 20 23:23:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:23: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 1Z6S73-0003RD-T3; Sat, 20 Jun 2015 23:23:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S72-0003R2-UF for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:49 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 5C/8E-31304-406F5855; Sat, 20 Jun 2015 23:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434842626!15692277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25360 invoked from network); 20 Jun 2015 23:23:47 -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; 20 Jun 2015 23:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S70-0005YJ-C1 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S70-00038r-Ae for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:46 +0000 Date: Sat, 20 Jun 2015 23:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: remove the locking when unmasking an event channel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e156654d4eb2fdeb524e6b40838767a5dc918966 Author: David Vrabel AuthorDate: Thu Jun 18 14:54:25 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:54:25 2015 +0200 evtchn: remove the locking when unmasking an event channel The event channel lock is no longer required to check if the port is valid. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index fd48646..2208de0 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -927,8 +927,6 @@ int evtchn_unmask(unsigned int port) struct domain *d = current->domain; struct evtchn *evtchn; - ASSERT(spin_is_locked(&d->event_lock)); - if ( unlikely(!port_is_valid(d, port)) ) return -EINVAL; @@ -1095,9 +1093,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_unmask unmask; if ( copy_from_guest(&unmask, arg, 1) != 0 ) return -EFAULT; - spin_lock(¤t->domain->event_lock); rc = evtchn_unmask(unmask.port); - spin_unlock(¤t->domain->event_lock); 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 Jun 20 23:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S7D-0003Sk-W0; Sat, 20 Jun 2015 23:23:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7C-0003SW-Uz for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:59 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id E8/F9-10593-E06F5855; Sat, 20 Jun 2015 23:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1434842636!18204472!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28242 invoked from network); 20 Jun 2015 23:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7A-0005YU-GT for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7A-00039E-Fd for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:56 +0000 Date: Sat, 20 Jun 2015 23:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] slightly simplify SCHEDOP_remote_shutdown handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d89d78912179fb6591f43abff879f43e37ba4654 Author: Jan Beulich AuthorDate: Thu Jun 18 14:55:18 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:55:18 2015 +0200 slightly simplify SCHEDOP_remote_shutdown handling There's no need for two exit paths each using rcu_unlock_domain() on its own here. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/schedule.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3325ccd..ecf1545 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -970,16 +970,10 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; ret = xsm_schedop_shutdown(XSM_DM_PRIV, current->domain, d); - if ( ret ) - { - rcu_unlock_domain(d); - return ret; - } - - domain_shutdown(d, (u8)sched_remote_shutdown.reason); + if ( likely(!ret) ) + domain_shutdown(d, sched_remote_shutdown.reason); rcu_unlock_domain(d); - ret = 0; 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 Jun 20 23:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S7D-0003Sk-W0; Sat, 20 Jun 2015 23:23:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7C-0003SW-Uz for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:59 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id E8/F9-10593-E06F5855; Sat, 20 Jun 2015 23:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1434842636!18204472!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28242 invoked from network); 20 Jun 2015 23:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7A-0005YU-GT for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7A-00039E-Fd for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:23:56 +0000 Date: Sat, 20 Jun 2015 23:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] slightly simplify SCHEDOP_remote_shutdown handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d89d78912179fb6591f43abff879f43e37ba4654 Author: Jan Beulich AuthorDate: Thu Jun 18 14:55:18 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 14:55:18 2015 +0200 slightly simplify SCHEDOP_remote_shutdown handling There's no need for two exit paths each using rcu_unlock_domain() on its own here. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/schedule.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3325ccd..ecf1545 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -970,16 +970,10 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; ret = xsm_schedop_shutdown(XSM_DM_PRIV, current->domain, d); - if ( ret ) - { - rcu_unlock_domain(d); - return ret; - } - - domain_shutdown(d, (u8)sched_remote_shutdown.reason); + if ( likely(!ret) ) + domain_shutdown(d, sched_remote_shutdown.reason); rcu_unlock_domain(d); - ret = 0; 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 Jun 20 23:24:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:24: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 1Z6S7Q-0003UE-2M; Sat, 20 Jun 2015 23:24:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7O-0003U5-CY for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:10 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id F0/B5-30151-916F5855; Sat, 20 Jun 2015 23:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434842647!25181721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31536 invoked from network); 20 Jun 2015 23:24:08 -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; 20 Jun 2015 23:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7K-0005Z3-QW for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7K-00039r-MV for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:06 +0000 Date: Sat, 20 Jun 2015 23:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: synchronize PCI config space access decoding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d67a7a4d37a4759bcd7f2ee2d740497ad669c7d Author: Jan Beulich AuthorDate: Thu Jun 18 15:07:10 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 15:07:10 2015 +0200 x86: synchronize PCI config space access decoding Both PV and HVM logic have similar but not similar enough code here. Synchronize the two so that - in the HVM case we don't unconditionally try to access extended config space - in the PV case we pass a correct range to the XSM hook - in the PV case we don't needlessly deny access when the operation isn't really on PCI config space All this along with sharing the macros HVM already had here. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/centaur.c | 2 +- xen/arch/x86/cpu/common.c | 23 ++++++++++++----------- xen/arch/x86/cpu/cpu.h | 2 +- xen/arch/x86/cpu/intel.c | 2 +- xen/arch/x86/domain.c | 4 ++++ xen/arch/x86/domctl.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 22 +++++++++++----------- xen/arch/x86/traps.c | 19 +++++++++++-------- xen/include/asm-x86/domain.h | 5 +++++ xen/include/asm-x86/pci.h | 5 +++++ xen/include/asm-x86/processor.h | 7 +++++++ 12 files changed, 91 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 566cdac..ad5fd09 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -620,7 +620,7 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) check_syscfg_dram_mod_en(); } -static struct cpu_dev amd_cpu_dev __cpuinitdata = { +static const struct cpu_dev amd_cpu_dev = { .c_vendor = "AMD", .c_ident = { "AuthenticAMD" }, .c_init = init_amd, diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c index 4aaa144..aaa0386 100644 --- a/xen/arch/x86/cpu/centaur.c +++ b/xen/arch/x86/cpu/centaur.c @@ -60,7 +60,7 @@ static void __init init_centaur(struct cpuinfo_x86 *c) init_c3(c); } -static struct cpu_dev centaur_cpu_dev __cpuinitdata = { +static const struct cpu_dev centaur_cpu_dev = { .c_vendor = "Centaur", .c_ident = { "CentaurHauls" }, .c_init = init_centaur, diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 53dbd84..c44a371 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -35,7 +35,7 @@ integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u; integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx); -struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {}; +const struct cpu_dev *__read_mostly cpu_devs[X86_VENDOR_NUM] = {}; unsigned int paddr_bits __read_mostly = 36; @@ -61,11 +61,11 @@ static void default_init(struct cpuinfo_x86 * c) __clear_bit(X86_FEATURE_SEP, c->x86_capability); } -static struct cpu_dev default_cpu = { +static const struct cpu_dev default_cpu = { .c_init = default_init, .c_vendor = "Unknown", }; -static struct cpu_dev * this_cpu = &default_cpu; +static const struct cpu_dev *this_cpu = &default_cpu; bool_t opt_cpu_info; boolean_param("cpuinfo", opt_cpu_info); @@ -126,9 +126,8 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) l2size, ecx & 0xFF); } -static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) +int get_cpu_vendor(const char v[], enum get_cpu_vendor mode) { - char *v = c->x86_vendor_id; int i; static int printed; @@ -137,20 +136,22 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) if (!strcmp(v,cpu_devs[i]->c_ident[0]) || (cpu_devs[i]->c_ident[1] && !strcmp(v,cpu_devs[i]->c_ident[1]))) { - c->x86_vendor = i; - if (!early) + if (mode == gcv_host_late) this_cpu = cpu_devs[i]; - return; + return i; } } } + if (mode == gcv_guest) + return X86_VENDOR_UNKNOWN; if (!printed) { printed++; printk(KERN_ERR "CPU: Vendor unknown, using generic init.\n"); printk(KERN_ERR "CPU: Your system may be unstable.\n"); } - c->x86_vendor = X86_VENDOR_UNKNOWN; this_cpu = &default_cpu; + + return X86_VENDOR_UNKNOWN; } static inline u32 _phys_pkg_id(u32 cpuid_apic, int index_msb) @@ -189,7 +190,7 @@ static void __init early_cpu_detect(void) (int *)&c->x86_vendor_id[8], (int *)&c->x86_vendor_id[4]); - get_cpu_vendor(c, 1); + c->x86_vendor = get_cpu_vendor(c->x86_vendor_id, gcv_host_early); cpuid(0x00000001, &tfms, &misc, &cap4, &cap0); c->x86 = (tfms >> 8) & 15; @@ -218,7 +219,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) (int *)&c->x86_vendor_id[8], (int *)&c->x86_vendor_id[4]); - get_cpu_vendor(c, 0); + c->x86_vendor = get_cpu_vendor(c->x86_vendor_id, gcv_host_late); /* Initialize the standard set of capabilities */ /* Note that the vendor-specific code below might override */ diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 68563bb..ed6cdf0 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -8,7 +8,7 @@ struct cpu_dev { void (*c_init)(struct cpuinfo_x86 * c); }; -extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; +extern const struct cpu_dev *cpu_devs[X86_VENDOR_NUM]; extern bool_t opt_arat; extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 9868cd5..53bfec8 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -286,7 +286,7 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) set_bit(X86_FEATURE_ARAT, c->x86_capability); } -static struct cpu_dev intel_cpu_dev __cpuinitdata = { +static const struct cpu_dev intel_cpu_dev = { .c_vendor = "Intel", .c_ident = { "GenuineIntel" }, .c_init = init_intel, diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ed82a07..0363650 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -579,6 +579,10 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, d->arch.cpuids[i].input[1] = XEN_CPUID_INPUT_UNUSED; } + d->arch.x86_vendor = boot_cpu_data.x86_vendor; + d->arch.x86 = boot_cpu_data.x86; + d->arch.x86_model = boot_cpu_data.x86_model; + d->arch.ioport_caps = rangeset_new(d, "I/O Ports", RANGESETF_prettyprint_hex); rc = -ENOMEM; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c61cacd..d8ffe2b 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -695,6 +695,38 @@ long arch_do_domctl( *unused = *ctl; else ret = -ENOENT; + + if ( !ret ) + { + switch ( ctl->input[0] ) + { + case 0: { + union { + typeof(boot_cpu_data.x86_vendor_id) str; + struct { + uint32_t ebx, edx, ecx; + } reg; + } vendor_id = { + .reg = { + .ebx = ctl->ebx, + .edx = ctl->edx, + .ecx = ctl->ecx + } + }; + + d->arch.x86_vendor = get_cpu_vendor(vendor_id.str, gcv_guest); + break; + } + case 1: + d->arch.x86 = (ctl->eax >> 8) & 0xf; + if ( d->arch.x86 == 0xf ) + d->arch.x86 += (ctl->eax >> 20) & 0xff; + d->arch.x86_model = (ctl->eax >> 4) & 0xf; + if ( d->arch.x86 >= 0x6 ) + d->arch.x86_model |= (ctl->eax >> 12) & 0xf0; + break; + } + } break; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 65baa1b..77b0122 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2406,11 +2406,6 @@ void hvm_vcpu_down(struct vcpu *v) struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, ioreq_t *p) { -#define CF8_BDF(cf8) (((cf8) & 0x00ffff00) >> 8) -#define CF8_ADDR_LO(cf8) ((cf8) & 0x000000fc) -#define CF8_ADDR_HI(cf8) (((cf8) & 0x0f000000) >> 16) -#define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000)) - struct hvm_ioreq_server *s; uint32_t cf8; uint8_t type; @@ -2439,9 +2434,19 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, type = IOREQ_TYPE_PCI_CONFIG; addr = ((uint64_t)sbdf << 32) | - CF8_ADDR_HI(cf8) | CF8_ADDR_LO(cf8) | (p->addr & 3); + /* AMD extended configuration space access? */ + if ( CF8_ADDR_HI(cf8) && + d->arch.x86_vendor == X86_VENDOR_AMD && + d->arch.x86 >= 0x10 && d->arch.x86 <= 0x17 ) + { + uint64_t msr_val; + + if ( !rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) && + (msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)) ) + addr |= CF8_ADDR_HI(cf8); + } } else { @@ -2495,11 +2500,6 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, } return d->arch.hvm_domain.default_ioreq_server; - -#undef CF8_ADDR_ENABLED -#undef CF8_ADDR_HI -#undef CF8_ADDR_LO -#undef CF8_BDF } int hvm_buffered_io_send(ioreq_t *p) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index b6c69c9..c634008 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1771,15 +1771,18 @@ static bool_t admin_io_okay(unsigned int port, unsigned int bytes, return ioports_access_permitted(d, port, port + bytes - 1); } -static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) +static bool_t pci_cfg_ok(struct domain *currd, bool_t write, + unsigned int start, unsigned int size) { uint32_t machine_bdf; - unsigned int start; if ( !is_hardware_domain(currd) ) return 0; - machine_bdf = (currd->arch.pci_cf8 >> 8) & 0xFFFF; + if ( !CF8_ENABLED(currd->arch.pci_cf8) ) + return 1; + + machine_bdf = CF8_BDF(currd->arch.pci_cf8); if ( write ) { const unsigned long *ro_map = pci_get_ro_map(0); @@ -1787,9 +1790,9 @@ static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) if ( ro_map && test_bit(machine_bdf, ro_map) ) return 0; } - start = currd->arch.pci_cf8 & 0xFF; + start |= CF8_ADDR_LO(currd->arch.pci_cf8); /* AMD extended configuration space access? */ - if ( (currd->arch.pci_cf8 & 0x0F000000) && + if ( CF8_ADDR_HI(currd->arch.pci_cf8) && boot_cpu_data.x86_vendor == X86_VENDOR_AMD && boot_cpu_data.x86 >= 0x10 && boot_cpu_data.x86 <= 0x17 ) { @@ -1798,7 +1801,7 @@ static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) if ( rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) ) return 0; if ( msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT) ) - start |= (currd->arch.pci_cf8 >> 16) & 0xF00; + start |= CF8_ADDR_HI(currd->arch.pci_cf8); } return !xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, @@ -1854,7 +1857,7 @@ uint32_t guest_io_read(unsigned int port, unsigned int bytes, size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(currd, 0, size) ) + if ( pci_cfg_ok(currd, 0, port & 3, size) ) sub_data = pci_conf_read(currd->arch.pci_cf8, port & 3, size); } @@ -1925,7 +1928,7 @@ void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(currd, 1, size) ) + if ( pci_cfg_ok(currd, 1, port & 3, size) ) pci_conf_write(currd->arch.pci_cf8, port & 3, size, data); } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index a3c117f..5eb6832 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -308,6 +308,11 @@ struct arch_domain /* Is PHYSDEVOP_eoi to automatically unmask the event channel? */ bool_t auto_unmask; + /* Values snooped from updates to cpuids[] (below). */ + u8 x86; /* CPU family */ + u8 x86_vendor; /* CPU vendor */ + u8 x86_model; /* CPU model */ + cpuid_input_t *cpuids; struct PITState vpit; diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index e0598fd..af63a57 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -1,6 +1,11 @@ #ifndef __X86_PCI_H__ #define __X86_PCI_H__ +#define CF8_BDF(cf8) ( ((cf8) & 0x00ffff00) >> 8) +#define CF8_ADDR_LO(cf8) ( (cf8) & 0x000000fc) +#define CF8_ADDR_HI(cf8) ( ((cf8) & 0x0f000000) >> 16) +#define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000)) + #define IS_SNB_GFX(id) (id == 0x01068086 || id == 0x01168086 \ || id == 0x01268086 || id == 0x01028086 \ || id == 0x01128086 || id == 0x01228086 \ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index fb2c2fc..ec2e15e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -561,6 +561,13 @@ void microcode_set_module(unsigned int); int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); int microcode_resume_cpu(int cpu); +enum get_cpu_vendor { + gcv_host_early, + gcv_host_late, + gcv_guest +}; + +int get_cpu_vendor(const char vendor_id[], enum get_cpu_vendor); void pv_cpuid(struct cpu_user_regs *regs); #endif /* !__ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:24:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:24: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 1Z6S7Q-0003UE-2M; Sat, 20 Jun 2015 23:24:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7O-0003U5-CY for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:10 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id F0/B5-30151-916F5855; Sat, 20 Jun 2015 23:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434842647!25181721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31536 invoked from network); 20 Jun 2015 23:24:08 -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; 20 Jun 2015 23:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7K-0005Z3-QW for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7K-00039r-MV for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:06 +0000 Date: Sat, 20 Jun 2015 23:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: synchronize PCI config space access decoding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d67a7a4d37a4759bcd7f2ee2d740497ad669c7d Author: Jan Beulich AuthorDate: Thu Jun 18 15:07:10 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 15:07:10 2015 +0200 x86: synchronize PCI config space access decoding Both PV and HVM logic have similar but not similar enough code here. Synchronize the two so that - in the HVM case we don't unconditionally try to access extended config space - in the PV case we pass a correct range to the XSM hook - in the PV case we don't needlessly deny access when the operation isn't really on PCI config space All this along with sharing the macros HVM already had here. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/centaur.c | 2 +- xen/arch/x86/cpu/common.c | 23 ++++++++++++----------- xen/arch/x86/cpu/cpu.h | 2 +- xen/arch/x86/cpu/intel.c | 2 +- xen/arch/x86/domain.c | 4 ++++ xen/arch/x86/domctl.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 22 +++++++++++----------- xen/arch/x86/traps.c | 19 +++++++++++-------- xen/include/asm-x86/domain.h | 5 +++++ xen/include/asm-x86/pci.h | 5 +++++ xen/include/asm-x86/processor.h | 7 +++++++ 12 files changed, 91 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 566cdac..ad5fd09 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -620,7 +620,7 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) check_syscfg_dram_mod_en(); } -static struct cpu_dev amd_cpu_dev __cpuinitdata = { +static const struct cpu_dev amd_cpu_dev = { .c_vendor = "AMD", .c_ident = { "AuthenticAMD" }, .c_init = init_amd, diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c index 4aaa144..aaa0386 100644 --- a/xen/arch/x86/cpu/centaur.c +++ b/xen/arch/x86/cpu/centaur.c @@ -60,7 +60,7 @@ static void __init init_centaur(struct cpuinfo_x86 *c) init_c3(c); } -static struct cpu_dev centaur_cpu_dev __cpuinitdata = { +static const struct cpu_dev centaur_cpu_dev = { .c_vendor = "Centaur", .c_ident = { "CentaurHauls" }, .c_init = init_centaur, diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 53dbd84..c44a371 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -35,7 +35,7 @@ integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u; integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx); -struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {}; +const struct cpu_dev *__read_mostly cpu_devs[X86_VENDOR_NUM] = {}; unsigned int paddr_bits __read_mostly = 36; @@ -61,11 +61,11 @@ static void default_init(struct cpuinfo_x86 * c) __clear_bit(X86_FEATURE_SEP, c->x86_capability); } -static struct cpu_dev default_cpu = { +static const struct cpu_dev default_cpu = { .c_init = default_init, .c_vendor = "Unknown", }; -static struct cpu_dev * this_cpu = &default_cpu; +static const struct cpu_dev *this_cpu = &default_cpu; bool_t opt_cpu_info; boolean_param("cpuinfo", opt_cpu_info); @@ -126,9 +126,8 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) l2size, ecx & 0xFF); } -static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) +int get_cpu_vendor(const char v[], enum get_cpu_vendor mode) { - char *v = c->x86_vendor_id; int i; static int printed; @@ -137,20 +136,22 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) if (!strcmp(v,cpu_devs[i]->c_ident[0]) || (cpu_devs[i]->c_ident[1] && !strcmp(v,cpu_devs[i]->c_ident[1]))) { - c->x86_vendor = i; - if (!early) + if (mode == gcv_host_late) this_cpu = cpu_devs[i]; - return; + return i; } } } + if (mode == gcv_guest) + return X86_VENDOR_UNKNOWN; if (!printed) { printed++; printk(KERN_ERR "CPU: Vendor unknown, using generic init.\n"); printk(KERN_ERR "CPU: Your system may be unstable.\n"); } - c->x86_vendor = X86_VENDOR_UNKNOWN; this_cpu = &default_cpu; + + return X86_VENDOR_UNKNOWN; } static inline u32 _phys_pkg_id(u32 cpuid_apic, int index_msb) @@ -189,7 +190,7 @@ static void __init early_cpu_detect(void) (int *)&c->x86_vendor_id[8], (int *)&c->x86_vendor_id[4]); - get_cpu_vendor(c, 1); + c->x86_vendor = get_cpu_vendor(c->x86_vendor_id, gcv_host_early); cpuid(0x00000001, &tfms, &misc, &cap4, &cap0); c->x86 = (tfms >> 8) & 15; @@ -218,7 +219,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) (int *)&c->x86_vendor_id[8], (int *)&c->x86_vendor_id[4]); - get_cpu_vendor(c, 0); + c->x86_vendor = get_cpu_vendor(c->x86_vendor_id, gcv_host_late); /* Initialize the standard set of capabilities */ /* Note that the vendor-specific code below might override */ diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 68563bb..ed6cdf0 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -8,7 +8,7 @@ struct cpu_dev { void (*c_init)(struct cpuinfo_x86 * c); }; -extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; +extern const struct cpu_dev *cpu_devs[X86_VENDOR_NUM]; extern bool_t opt_arat; extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 9868cd5..53bfec8 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -286,7 +286,7 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) set_bit(X86_FEATURE_ARAT, c->x86_capability); } -static struct cpu_dev intel_cpu_dev __cpuinitdata = { +static const struct cpu_dev intel_cpu_dev = { .c_vendor = "Intel", .c_ident = { "GenuineIntel" }, .c_init = init_intel, diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ed82a07..0363650 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -579,6 +579,10 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, d->arch.cpuids[i].input[1] = XEN_CPUID_INPUT_UNUSED; } + d->arch.x86_vendor = boot_cpu_data.x86_vendor; + d->arch.x86 = boot_cpu_data.x86; + d->arch.x86_model = boot_cpu_data.x86_model; + d->arch.ioport_caps = rangeset_new(d, "I/O Ports", RANGESETF_prettyprint_hex); rc = -ENOMEM; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c61cacd..d8ffe2b 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -695,6 +695,38 @@ long arch_do_domctl( *unused = *ctl; else ret = -ENOENT; + + if ( !ret ) + { + switch ( ctl->input[0] ) + { + case 0: { + union { + typeof(boot_cpu_data.x86_vendor_id) str; + struct { + uint32_t ebx, edx, ecx; + } reg; + } vendor_id = { + .reg = { + .ebx = ctl->ebx, + .edx = ctl->edx, + .ecx = ctl->ecx + } + }; + + d->arch.x86_vendor = get_cpu_vendor(vendor_id.str, gcv_guest); + break; + } + case 1: + d->arch.x86 = (ctl->eax >> 8) & 0xf; + if ( d->arch.x86 == 0xf ) + d->arch.x86 += (ctl->eax >> 20) & 0xff; + d->arch.x86_model = (ctl->eax >> 4) & 0xf; + if ( d->arch.x86 >= 0x6 ) + d->arch.x86_model |= (ctl->eax >> 12) & 0xf0; + break; + } + } break; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 65baa1b..77b0122 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2406,11 +2406,6 @@ void hvm_vcpu_down(struct vcpu *v) struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, ioreq_t *p) { -#define CF8_BDF(cf8) (((cf8) & 0x00ffff00) >> 8) -#define CF8_ADDR_LO(cf8) ((cf8) & 0x000000fc) -#define CF8_ADDR_HI(cf8) (((cf8) & 0x0f000000) >> 16) -#define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000)) - struct hvm_ioreq_server *s; uint32_t cf8; uint8_t type; @@ -2439,9 +2434,19 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, type = IOREQ_TYPE_PCI_CONFIG; addr = ((uint64_t)sbdf << 32) | - CF8_ADDR_HI(cf8) | CF8_ADDR_LO(cf8) | (p->addr & 3); + /* AMD extended configuration space access? */ + if ( CF8_ADDR_HI(cf8) && + d->arch.x86_vendor == X86_VENDOR_AMD && + d->arch.x86 >= 0x10 && d->arch.x86 <= 0x17 ) + { + uint64_t msr_val; + + if ( !rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) && + (msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)) ) + addr |= CF8_ADDR_HI(cf8); + } } else { @@ -2495,11 +2500,6 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, } return d->arch.hvm_domain.default_ioreq_server; - -#undef CF8_ADDR_ENABLED -#undef CF8_ADDR_HI -#undef CF8_ADDR_LO -#undef CF8_BDF } int hvm_buffered_io_send(ioreq_t *p) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index b6c69c9..c634008 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1771,15 +1771,18 @@ static bool_t admin_io_okay(unsigned int port, unsigned int bytes, return ioports_access_permitted(d, port, port + bytes - 1); } -static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) +static bool_t pci_cfg_ok(struct domain *currd, bool_t write, + unsigned int start, unsigned int size) { uint32_t machine_bdf; - unsigned int start; if ( !is_hardware_domain(currd) ) return 0; - machine_bdf = (currd->arch.pci_cf8 >> 8) & 0xFFFF; + if ( !CF8_ENABLED(currd->arch.pci_cf8) ) + return 1; + + machine_bdf = CF8_BDF(currd->arch.pci_cf8); if ( write ) { const unsigned long *ro_map = pci_get_ro_map(0); @@ -1787,9 +1790,9 @@ static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) if ( ro_map && test_bit(machine_bdf, ro_map) ) return 0; } - start = currd->arch.pci_cf8 & 0xFF; + start |= CF8_ADDR_LO(currd->arch.pci_cf8); /* AMD extended configuration space access? */ - if ( (currd->arch.pci_cf8 & 0x0F000000) && + if ( CF8_ADDR_HI(currd->arch.pci_cf8) && boot_cpu_data.x86_vendor == X86_VENDOR_AMD && boot_cpu_data.x86 >= 0x10 && boot_cpu_data.x86 <= 0x17 ) { @@ -1798,7 +1801,7 @@ static bool_t pci_cfg_ok(struct domain *currd, bool_t write, unsigned int size) if ( rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) ) return 0; if ( msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT) ) - start |= (currd->arch.pci_cf8 >> 16) & 0xF00; + start |= CF8_ADDR_HI(currd->arch.pci_cf8); } return !xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, @@ -1854,7 +1857,7 @@ uint32_t guest_io_read(unsigned int port, unsigned int bytes, size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(currd, 0, size) ) + if ( pci_cfg_ok(currd, 0, port & 3, size) ) sub_data = pci_conf_read(currd->arch.pci_cf8, port & 3, size); } @@ -1925,7 +1928,7 @@ void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, size = min(bytes, 4 - (port & 3)); if ( size == 3 ) size = 2; - if ( pci_cfg_ok(currd, 1, size) ) + if ( pci_cfg_ok(currd, 1, port & 3, size) ) pci_conf_write(currd->arch.pci_cf8, port & 3, size, data); } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index a3c117f..5eb6832 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -308,6 +308,11 @@ struct arch_domain /* Is PHYSDEVOP_eoi to automatically unmask the event channel? */ bool_t auto_unmask; + /* Values snooped from updates to cpuids[] (below). */ + u8 x86; /* CPU family */ + u8 x86_vendor; /* CPU vendor */ + u8 x86_model; /* CPU model */ + cpuid_input_t *cpuids; struct PITState vpit; diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index e0598fd..af63a57 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -1,6 +1,11 @@ #ifndef __X86_PCI_H__ #define __X86_PCI_H__ +#define CF8_BDF(cf8) ( ((cf8) & 0x00ffff00) >> 8) +#define CF8_ADDR_LO(cf8) ( (cf8) & 0x000000fc) +#define CF8_ADDR_HI(cf8) ( ((cf8) & 0x0f000000) >> 16) +#define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000)) + #define IS_SNB_GFX(id) (id == 0x01068086 || id == 0x01168086 \ || id == 0x01268086 || id == 0x01028086 \ || id == 0x01128086 || id == 0x01228086 \ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index fb2c2fc..ec2e15e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -561,6 +561,13 @@ void microcode_set_module(unsigned int); int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); int microcode_resume_cpu(int cpu); +enum get_cpu_vendor { + gcv_host_early, + gcv_host_late, + gcv_guest +}; + +int get_cpu_vendor(const char vendor_id[], enum get_cpu_vendor); void pv_cpuid(struct cpu_user_regs *regs); #endif /* !__ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:24:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S7Z-0003Va-4v; Sat, 20 Jun 2015 23:24:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7X-0003VM-VL for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:20 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id D2/7C-31258-326F5855; Sat, 20 Jun 2015 23:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1434842657!25186400!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20510 invoked from network); 20 Jun 2015 23:24:18 -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; 20 Jun 2015 23:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7U-0005ZE-VS for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7U-0003AG-Tz for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:16 +0000 Date: Sat, 20 Jun 2015 23:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add a common interface for cpu matching X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12fb4a5ac037763713f373416af9f230fbe374ab Author: Wei Wang AuthorDate: Thu Jun 18 16:07:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:07:40 2015 +0200 x86: add a common interface for cpu matching Add a common interface for matching the current cpu against an array of x86_cpu_ids. Also change mwait-idle.c to use it. Signed-off-by: Wei Wang --- xen/arch/x86/cpu/common.c | 38 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/mwait-idle.c | 27 ++++++++++----------------- xen/include/asm-x86/processor.h | 10 ++++++++++ 3 files changed, 58 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index c44a371..35ef21b 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -638,3 +638,41 @@ void cpu_uninit(unsigned int cpu) { cpumask_clear_cpu(cpu, &cpu_initialized); } + +/* + * x86_match_cpu - match the current CPU against an array of + * x86_cpu_ids + * @match: Pointer to array of x86_cpu_ids. Last entry terminated with + * {}. + * Return the entry if the current CPU matches the entries in the + * passed x86_cpu_id match table. Otherwise NULL. The match table + * contains vendor (X86_VENDOR_*), family, model and feature bits or + * respective wildcard entries. + * + * A typical table entry would be to match a specific CPU + * { X86_VENDOR_INTEL, 6, 0x12 } + * or to match a specific CPU feature + * { X86_FEATURE_MATCH(X86_FEATURE_FOOBAR) } + * + * This always matches against the boot cpu, assuming models and +features are + * consistent over all CPUs. + */ +const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id table[]) +{ + const struct x86_cpu_id *m; + const struct cpuinfo_x86 *c = &boot_cpu_data; + + for (m = table; m->vendor | m->family | m->model | m->feature; m++) { + if (c->x86_vendor != m->vendor) + continue; + if (c->x86 != m->family) + continue; + if (c->x86_model != m->model) + continue; + if (!cpu_has(c, m->feature)) + continue; + return m; + } + return NULL; +} diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 91b76ec..976f4ba 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -689,12 +689,11 @@ static const struct idle_cpu idle_cpu_avn = { .disable_promotion_to_c1e = 1, }; -#define ICPU(model, cpu) { 6, model, &idle_cpu_##cpu } +#define ICPU(model, cpu) \ + { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, \ + &idle_cpu_##cpu} -static struct intel_idle_id { - unsigned int family, model; - const struct idle_cpu *data; -} intel_idle_ids[] __initdata = { +static const struct x86_cpu_id intel_idle_ids[] __initconst = { ICPU(0x1a, nehalem), ICPU(0x1e, nehalem), ICPU(0x1f, nehalem), @@ -757,23 +756,17 @@ static void __init mwait_idle_state_table_update(void) static int __init mwait_idle_probe(void) { unsigned int eax, ebx, ecx; - const struct intel_idle_id *id; + const struct x86_cpu_id *id = x86_match_cpu(intel_idle_ids); - if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || - !boot_cpu_has(X86_FEATURE_MWAIT) || - boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) - return -ENODEV; - - for (id = intel_idle_ids; id->family; ++id) - if (id->family == boot_cpu_data.x86 && - id->model == boot_cpu_data.x86_model) - break; - if (!id->family) { + if (!id) { pr_debug(PREFIX "does not run on family %d model %d\n", boot_cpu_data.x86, boot_cpu_data.x86_model); return -ENODEV; } + if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) + return -ENODEV; + cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || @@ -788,7 +781,7 @@ static int __init mwait_idle_probe(void) pr_debug(PREFIX "MWAIT substates: %#x\n", mwait_substates); - icpu = id->data; + icpu = id->driver_data; cpuidle_state_table = icpu->state_table; if (boot_cpu_has(X86_FEATURE_ARAT)) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index ec2e15e..cb36f0c 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -163,6 +163,14 @@ struct vcpu; pc; \ }) +struct x86_cpu_id { + uint16_t vendor; + uint16_t family; + uint16_t model; + uint16_t feature; /* bit index */ + const void *driver_data; +}; + struct cpuinfo_x86 { __u8 x86; /* CPU family */ __u8 x86_vendor; /* CPU vendor */ @@ -204,6 +212,8 @@ extern u32 cpuid_ext_features; /* Maximum width of physical addresses supported by the hardware */ extern unsigned int paddr_bits; +extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id table[]); + extern void identify_cpu(struct cpuinfo_x86 *); extern void setup_clear_cpu_cap(unsigned int); extern void print_cpu_info(unsigned int cpu); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:24:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S7Z-0003Va-4v; Sat, 20 Jun 2015 23:24:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7X-0003VM-VL for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:20 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id D2/7C-31258-326F5855; Sat, 20 Jun 2015 23:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1434842657!25186400!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20510 invoked from network); 20 Jun 2015 23:24:18 -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; 20 Jun 2015 23:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7U-0005ZE-VS for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7U-0003AG-Tz for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:16 +0000 Date: Sat, 20 Jun 2015 23:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add a common interface for cpu matching X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12fb4a5ac037763713f373416af9f230fbe374ab Author: Wei Wang AuthorDate: Thu Jun 18 16:07:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:07:40 2015 +0200 x86: add a common interface for cpu matching Add a common interface for matching the current cpu against an array of x86_cpu_ids. Also change mwait-idle.c to use it. Signed-off-by: Wei Wang --- xen/arch/x86/cpu/common.c | 38 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/mwait-idle.c | 27 ++++++++++----------------- xen/include/asm-x86/processor.h | 10 ++++++++++ 3 files changed, 58 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index c44a371..35ef21b 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -638,3 +638,41 @@ void cpu_uninit(unsigned int cpu) { cpumask_clear_cpu(cpu, &cpu_initialized); } + +/* + * x86_match_cpu - match the current CPU against an array of + * x86_cpu_ids + * @match: Pointer to array of x86_cpu_ids. Last entry terminated with + * {}. + * Return the entry if the current CPU matches the entries in the + * passed x86_cpu_id match table. Otherwise NULL. The match table + * contains vendor (X86_VENDOR_*), family, model and feature bits or + * respective wildcard entries. + * + * A typical table entry would be to match a specific CPU + * { X86_VENDOR_INTEL, 6, 0x12 } + * or to match a specific CPU feature + * { X86_FEATURE_MATCH(X86_FEATURE_FOOBAR) } + * + * This always matches against the boot cpu, assuming models and +features are + * consistent over all CPUs. + */ +const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id table[]) +{ + const struct x86_cpu_id *m; + const struct cpuinfo_x86 *c = &boot_cpu_data; + + for (m = table; m->vendor | m->family | m->model | m->feature; m++) { + if (c->x86_vendor != m->vendor) + continue; + if (c->x86 != m->family) + continue; + if (c->x86_model != m->model) + continue; + if (!cpu_has(c, m->feature)) + continue; + return m; + } + return NULL; +} diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 91b76ec..976f4ba 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -689,12 +689,11 @@ static const struct idle_cpu idle_cpu_avn = { .disable_promotion_to_c1e = 1, }; -#define ICPU(model, cpu) { 6, model, &idle_cpu_##cpu } +#define ICPU(model, cpu) \ + { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, \ + &idle_cpu_##cpu} -static struct intel_idle_id { - unsigned int family, model; - const struct idle_cpu *data; -} intel_idle_ids[] __initdata = { +static const struct x86_cpu_id intel_idle_ids[] __initconst = { ICPU(0x1a, nehalem), ICPU(0x1e, nehalem), ICPU(0x1f, nehalem), @@ -757,23 +756,17 @@ static void __init mwait_idle_state_table_update(void) static int __init mwait_idle_probe(void) { unsigned int eax, ebx, ecx; - const struct intel_idle_id *id; + const struct x86_cpu_id *id = x86_match_cpu(intel_idle_ids); - if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || - !boot_cpu_has(X86_FEATURE_MWAIT) || - boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) - return -ENODEV; - - for (id = intel_idle_ids; id->family; ++id) - if (id->family == boot_cpu_data.x86 && - id->model == boot_cpu_data.x86_model) - break; - if (!id->family) { + if (!id) { pr_debug(PREFIX "does not run on family %d model %d\n", boot_cpu_data.x86, boot_cpu_data.x86_model); return -ENODEV; } + if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) + return -ENODEV; + cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || @@ -788,7 +781,7 @@ static int __init mwait_idle_probe(void) pr_debug(PREFIX "MWAIT substates: %#x\n", mwait_substates); - icpu = id->data; + icpu = id->driver_data; cpuidle_state_table = icpu->state_table; if (boot_cpu_has(X86_FEATURE_ARAT)) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index ec2e15e..cb36f0c 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -163,6 +163,14 @@ struct vcpu; pc; \ }) +struct x86_cpu_id { + uint16_t vendor; + uint16_t family; + uint16_t model; + uint16_t feature; /* bit index */ + const void *driver_data; +}; + struct cpuinfo_x86 { __u8 x86; /* CPU family */ __u8 x86_vendor; /* CPU vendor */ @@ -204,6 +212,8 @@ extern u32 cpuid_ext_features; /* Maximum width of physical addresses supported by the hardware */ extern unsigned int paddr_bits; +extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id table[]); + extern void identify_cpu(struct cpuinfo_x86 *); extern void setup_clear_cpu_cap(unsigned int); extern void print_cpu_info(unsigned int cpu); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:24:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S7j-0003XG-9V; Sat, 20 Jun 2015 23:24:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7h-0003X1-Ax for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:29 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 10/BD-23096-C26F5855; Sat, 20 Jun 2015 23:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1434842667!11572586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22896 invoked from network); 20 Jun 2015 23:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7f-0005ZM-4r for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7f-0003Ao-3w for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:27 +0000 Date: Sat, 20 Jun 2015 23:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: prefer is_..._domain() over is_..._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 42ef6ec965cb93e17b485caa860ff09d8a932733 Author: Jan Beulich AuthorDate: Thu Jun 18 16:42:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:42:26 2015 +0200 x86/mm: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/guest_walk.c | 2 +- xen/arch/x86/mm/shadow/common.c | 4 +--- xen/arch/x86/mm/shadow/multi.c | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index d8f5a35..9c6c74f 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -159,7 +159,7 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, mflags = mandatory_flags(v, pfec); iflags = (_PAGE_NX_BIT | _PAGE_INVALID_BITS); - if ( is_hvm_vcpu(v) && !(pfec & PFEC_user_mode) ) + if ( is_hvm_domain(d) && !(pfec & PFEC_user_mode) ) { struct segment_register seg; const struct cpu_user_regs *regs = guest_cpu_user_regs(); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 919b15b..c7e0e54 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3157,12 +3157,10 @@ void shadow_teardown(struct domain *d) * destroyed any shadows of it or sh_destroy_shadow will get confused. */ if ( !pagetable_is_null(d->arch.paging.shadow.unpaged_pagetable) ) { + ASSERT(is_hvm_domain(d)); for_each_vcpu(d, v) - { - ASSERT(is_hvm_vcpu(v)); if ( !hvm_paging_enabled(v) ) v->arch.guest_table = pagetable_null(); - } unpaged_pagetable = pagetable_get_page(d->arch.paging.shadow.unpaged_pagetable); d->arch.paging.shadow.unpaged_pagetable = pagetable_null(); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 6edac71..42204d9 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2043,7 +2043,7 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) sh_unmap_domain_page(l3e); shadow_free(d, m3mfn); - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32on64_domain(d) ) { /* Need to destroy the l3 and l2 monitor pages that map the * Xen VAs at 3GB-4GB */ @@ -3963,7 +3963,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) (unsigned long)pagetable_get_pfn(v->arch.guest_table)); #if GUEST_PAGING_LEVELS == 4 - if ( !(v->arch.flags & TF_kernel_mode) && !is_pv_32on64_vcpu(v) ) + if ( !(v->arch.flags & TF_kernel_mode) && !is_pv_32on64_domain(d) ) gmfn = pagetable_get_mfn(v->arch.guest_table_user); else #endif @@ -4674,7 +4674,7 @@ static void *emulate_map_dest(struct vcpu *v, /* Cross-page emulated writes are only supported for HVM guests; * PV guests ought to know better */ - if ( !is_hvm_vcpu(v) ) + if ( !is_hvm_domain(d) ) return MAPPING_UNHANDLEABLE; /* This write crosses a page boundary. Translate the second page */ @@ -5104,7 +5104,7 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) gmfn = get_shadow_status(d, get_gfn_query_unlocked( d, gfn_x(gfn), &p2mt), ((GUEST_PAGING_LEVELS == 3 || - is_pv_32on64_vcpu(v)) + is_pv_32on64_domain(d)) && !shadow_mode_external(d) && (guest_index(gl3e) % 4) == 3) ? SH_type_l2h_shadow -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:24:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S7j-0003XG-9V; Sat, 20 Jun 2015 23:24:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7h-0003X1-Ax for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:29 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 10/BD-23096-C26F5855; Sat, 20 Jun 2015 23:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1434842667!11572586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22896 invoked from network); 20 Jun 2015 23:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Jun 2015 23:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7f-0005ZM-4r for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7f-0003Ao-3w for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:27 +0000 Date: Sat, 20 Jun 2015 23:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: prefer is_..._domain() over is_..._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 42ef6ec965cb93e17b485caa860ff09d8a932733 Author: Jan Beulich AuthorDate: Thu Jun 18 16:42:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:42:26 2015 +0200 x86/mm: prefer is_..._domain() over is_..._vcpu() ... when the domain pointer is already available. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/guest_walk.c | 2 +- xen/arch/x86/mm/shadow/common.c | 4 +--- xen/arch/x86/mm/shadow/multi.c | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index d8f5a35..9c6c74f 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -159,7 +159,7 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, mflags = mandatory_flags(v, pfec); iflags = (_PAGE_NX_BIT | _PAGE_INVALID_BITS); - if ( is_hvm_vcpu(v) && !(pfec & PFEC_user_mode) ) + if ( is_hvm_domain(d) && !(pfec & PFEC_user_mode) ) { struct segment_register seg; const struct cpu_user_regs *regs = guest_cpu_user_regs(); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 919b15b..c7e0e54 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3157,12 +3157,10 @@ void shadow_teardown(struct domain *d) * destroyed any shadows of it or sh_destroy_shadow will get confused. */ if ( !pagetable_is_null(d->arch.paging.shadow.unpaged_pagetable) ) { + ASSERT(is_hvm_domain(d)); for_each_vcpu(d, v) - { - ASSERT(is_hvm_vcpu(v)); if ( !hvm_paging_enabled(v) ) v->arch.guest_table = pagetable_null(); - } unpaged_pagetable = pagetable_get_page(d->arch.paging.shadow.unpaged_pagetable); d->arch.paging.shadow.unpaged_pagetable = pagetable_null(); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 6edac71..42204d9 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2043,7 +2043,7 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) sh_unmap_domain_page(l3e); shadow_free(d, m3mfn); - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32on64_domain(d) ) { /* Need to destroy the l3 and l2 monitor pages that map the * Xen VAs at 3GB-4GB */ @@ -3963,7 +3963,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) (unsigned long)pagetable_get_pfn(v->arch.guest_table)); #if GUEST_PAGING_LEVELS == 4 - if ( !(v->arch.flags & TF_kernel_mode) && !is_pv_32on64_vcpu(v) ) + if ( !(v->arch.flags & TF_kernel_mode) && !is_pv_32on64_domain(d) ) gmfn = pagetable_get_mfn(v->arch.guest_table_user); else #endif @@ -4674,7 +4674,7 @@ static void *emulate_map_dest(struct vcpu *v, /* Cross-page emulated writes are only supported for HVM guests; * PV guests ought to know better */ - if ( !is_hvm_vcpu(v) ) + if ( !is_hvm_domain(d) ) return MAPPING_UNHANDLEABLE; /* This write crosses a page boundary. Translate the second page */ @@ -5104,7 +5104,7 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) gmfn = get_shadow_status(d, get_gfn_query_unlocked( d, gfn_x(gfn), &p2mt), ((GUEST_PAGING_LEVELS == 3 || - is_pv_32on64_vcpu(v)) + is_pv_32on64_domain(d)) && !shadow_mode_external(d) && (guest_index(gl3e) % 4) == 3) ? SH_type_l2h_shadow -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:24:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:24: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 1Z6S7u-0003Ys-CR; Sat, 20 Jun 2015 23:24:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7s-0003YZ-9w for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:40 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 74/8C-31258-736F5855; Sat, 20 Jun 2015 23:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1434842677!25205134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11580 invoked from network); 20 Jun 2015 23:24:38 -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; 20 Jun 2015 23:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7p-0005ZW-9W for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7p-0003BH-8c for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:37 +0000 Date: Sat, 20 Jun 2015 23:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HAP: prefer is_..._domain() over is_..._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 cc0fa33fe8b6c2c8ed9d078705070b62ec396051 Author: Jan Beulich AuthorDate: Thu Jun 18 16:42:56 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:42:56 2015 +0200 x86/HAP: prefer is_..._domain() over is_..._vcpu() In hvm_hap_nested_page_fault() latch the current domain alongside the current vCPU into a local variable, making use of it where possible also beyond what the title says. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 77b0122..183b26c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2776,7 +2776,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, p2m_type_t p2mt; p2m_access_t p2ma; mfn_t mfn; - struct vcpu *v = current; + struct vcpu *curr = current; + struct domain *currd = curr->domain; struct p2m_domain *p2m; int rc, fall_through = 0, paged = 0; int sharing_enomem = 0; @@ -2786,9 +2787,9 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * If this succeeds, all is fine. * If this fails, inject a nested page fault into the guest. */ - if ( nestedhvm_enabled(v->domain) - && nestedhvm_vcpu_in_guestmode(v) - && nestedhvm_paging_mode_hap(v) ) + if ( nestedhvm_enabled(currd) + && nestedhvm_vcpu_in_guestmode(curr) + && nestedhvm_paging_mode_hap(curr) ) { int rv; @@ -2800,7 +2801,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * the same as for shadow paging. */ - rv = nestedhvm_hap_nested_page_fault(v, &gpa, + rv = nestedhvm_hap_nested_page_fault(curr, &gpa, npfec.read_access, npfec.write_access, npfec.insn_fetch); @@ -2830,8 +2831,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * - 32-bit WinXP (& older Windows) on AMD CPUs for LAPIC accesses, * - newer Windows (like Server 2012) for HPET accesses. */ - if ( !nestedhvm_vcpu_in_guestmode(v) - && is_hvm_vcpu(v) + if ( !nestedhvm_vcpu_in_guestmode(curr) + && is_hvm_domain(currd) && hvm_mmio_internal(gpa) ) { if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) @@ -2840,7 +2841,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, goto out; } - p2m = p2m_get_hostp2m(v->domain); + p2m = p2m_get_hostp2m(currd); mfn = get_gfn_type_access(p2m, gfn, &p2mt, &p2ma, P2M_ALLOC | (npfec.write_access ? P2M_UNSHARE : 0), NULL); @@ -2903,10 +2904,10 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, (npfec.write_access && (p2m_is_discard_write(p2mt) || (p2mt == p2m_mmio_write_dm))) ) { - put_gfn(p2m->domain, gfn); + put_gfn(currd, gfn); rc = 0; - if ( unlikely(is_pvh_vcpu(v)) ) + if ( unlikely(is_pvh_domain(currd)) ) goto out; if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) @@ -2924,7 +2925,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, { ASSERT(p2m_is_hostp2m(p2m)); sharing_enomem = - (mem_sharing_unshare_page(p2m->domain, gfn, 0) < 0); + (mem_sharing_unshare_page(currd, gfn, 0) < 0); rc = 1; goto out_put_gfn; } @@ -2939,8 +2940,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, */ if ( npfec.write_access ) { - paging_mark_dirty(v->domain, mfn_x(mfn)); - p2m_change_type_one(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + paging_mark_dirty(currd, mfn_x(mfn)); + p2m_change_type_one(currd, gfn, p2m_ram_logdirty, p2m_ram_rw); } rc = 1; goto out_put_gfn; @@ -2952,28 +2953,28 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, rc = fall_through; out_put_gfn: - put_gfn(p2m->domain, gfn); + put_gfn(currd, gfn); out: /* All of these are delayed until we exit, since we might * sleep on event ring wait queues, and we must not hold * locks in such circumstance */ if ( paged ) - p2m_mem_paging_populate(v->domain, gfn); + p2m_mem_paging_populate(currd, gfn); if ( sharing_enomem ) { int rv; - if ( (rv = mem_sharing_notify_enomem(v->domain, gfn, 1)) < 0 ) + if ( (rv = mem_sharing_notify_enomem(currd, gfn, 1)) < 0 ) { gdprintk(XENLOG_ERR, "Domain %hu attempt to unshare " "gfn %lx, ENOMEM and no helper (rc %d)\n", - v->domain->domain_id, gfn, rv); + currd->domain_id, gfn, rv); /* Crash the domain */ rc = 0; } } if ( req_ptr ) { - mem_access_send_req(v->domain, req_ptr); + mem_access_send_req(currd, req_ptr); xfree(req_ptr); } 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 Jun 20 23:24:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:24: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 1Z6S7u-0003Ys-CR; Sat, 20 Jun 2015 23:24:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7s-0003YZ-9w for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:40 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 74/8C-31258-736F5855; Sat, 20 Jun 2015 23:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1434842677!25205134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11580 invoked from network); 20 Jun 2015 23:24:38 -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; 20 Jun 2015 23:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7p-0005ZW-9W for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7p-0003BH-8c for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:37 +0000 Date: Sat, 20 Jun 2015 23:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HAP: prefer is_..._domain() over is_..._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 cc0fa33fe8b6c2c8ed9d078705070b62ec396051 Author: Jan Beulich AuthorDate: Thu Jun 18 16:42:56 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:42:56 2015 +0200 x86/HAP: prefer is_..._domain() over is_..._vcpu() In hvm_hap_nested_page_fault() latch the current domain alongside the current vCPU into a local variable, making use of it where possible also beyond what the title says. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 77b0122..183b26c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2776,7 +2776,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, p2m_type_t p2mt; p2m_access_t p2ma; mfn_t mfn; - struct vcpu *v = current; + struct vcpu *curr = current; + struct domain *currd = curr->domain; struct p2m_domain *p2m; int rc, fall_through = 0, paged = 0; int sharing_enomem = 0; @@ -2786,9 +2787,9 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * If this succeeds, all is fine. * If this fails, inject a nested page fault into the guest. */ - if ( nestedhvm_enabled(v->domain) - && nestedhvm_vcpu_in_guestmode(v) - && nestedhvm_paging_mode_hap(v) ) + if ( nestedhvm_enabled(currd) + && nestedhvm_vcpu_in_guestmode(curr) + && nestedhvm_paging_mode_hap(curr) ) { int rv; @@ -2800,7 +2801,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * the same as for shadow paging. */ - rv = nestedhvm_hap_nested_page_fault(v, &gpa, + rv = nestedhvm_hap_nested_page_fault(curr, &gpa, npfec.read_access, npfec.write_access, npfec.insn_fetch); @@ -2830,8 +2831,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * - 32-bit WinXP (& older Windows) on AMD CPUs for LAPIC accesses, * - newer Windows (like Server 2012) for HPET accesses. */ - if ( !nestedhvm_vcpu_in_guestmode(v) - && is_hvm_vcpu(v) + if ( !nestedhvm_vcpu_in_guestmode(curr) + && is_hvm_domain(currd) && hvm_mmio_internal(gpa) ) { if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) @@ -2840,7 +2841,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, goto out; } - p2m = p2m_get_hostp2m(v->domain); + p2m = p2m_get_hostp2m(currd); mfn = get_gfn_type_access(p2m, gfn, &p2mt, &p2ma, P2M_ALLOC | (npfec.write_access ? P2M_UNSHARE : 0), NULL); @@ -2903,10 +2904,10 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, (npfec.write_access && (p2m_is_discard_write(p2mt) || (p2mt == p2m_mmio_write_dm))) ) { - put_gfn(p2m->domain, gfn); + put_gfn(currd, gfn); rc = 0; - if ( unlikely(is_pvh_vcpu(v)) ) + if ( unlikely(is_pvh_domain(currd)) ) goto out; if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) @@ -2924,7 +2925,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, { ASSERT(p2m_is_hostp2m(p2m)); sharing_enomem = - (mem_sharing_unshare_page(p2m->domain, gfn, 0) < 0); + (mem_sharing_unshare_page(currd, gfn, 0) < 0); rc = 1; goto out_put_gfn; } @@ -2939,8 +2940,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, */ if ( npfec.write_access ) { - paging_mark_dirty(v->domain, mfn_x(mfn)); - p2m_change_type_one(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + paging_mark_dirty(currd, mfn_x(mfn)); + p2m_change_type_one(currd, gfn, p2m_ram_logdirty, p2m_ram_rw); } rc = 1; goto out_put_gfn; @@ -2952,28 +2953,28 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, rc = fall_through; out_put_gfn: - put_gfn(p2m->domain, gfn); + put_gfn(currd, gfn); out: /* All of these are delayed until we exit, since we might * sleep on event ring wait queues, and we must not hold * locks in such circumstance */ if ( paged ) - p2m_mem_paging_populate(v->domain, gfn); + p2m_mem_paging_populate(currd, gfn); if ( sharing_enomem ) { int rv; - if ( (rv = mem_sharing_notify_enomem(v->domain, gfn, 1)) < 0 ) + if ( (rv = mem_sharing_notify_enomem(currd, gfn, 1)) < 0 ) { gdprintk(XENLOG_ERR, "Domain %hu attempt to unshare " "gfn %lx, ENOMEM and no helper (rc %d)\n", - v->domain->domain_id, gfn, rv); + currd->domain_id, gfn, rv); /* Crash the domain */ rc = 0; } } if ( req_ptr ) { - mem_access_send_req(v->domain, req_ptr); + mem_access_send_req(currd, req_ptr); xfree(req_ptr); } 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 Jun 20 23:24:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S83-0003aC-F0; Sat, 20 Jun 2015 23:24:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S82-0003a1-GO for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:50 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B4/09-02969-146F5855; Sat, 20 Jun 2015 23:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434842687!13757154!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4320 invoked from network); 20 Jun 2015 23:24:48 -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; 20 Jun 2015 23:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7z-0005Ze-G4 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7z-0003CA-ES for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:47 +0000 Date: Sat, 20 Jun 2015 23:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: avoid pointer wraparound in bufioreq handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b7007bc6f9a45cef9262b1ec4280eb67140a5112 Author: Jan Beulich AuthorDate: Thu Jun 18 16:44:15 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:44:15 2015 +0200 x86/HVM: avoid pointer wraparound in bufioreq handling The number of slots per page being 511 (i.e. not a power of two) means that the (32-bit) read and write indexes going beyond 2^32 will likely disturb operation. Extend I/O req server creation so the caller can indicate that it is using suitable atomic accesses where needed (not all accesses to the two pointers really need to be atomic), allowing the hypervisor to atomically canonicalize both pointers when both have gone through at least one cycle. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- tools/libxc/include/xenctrl.h | 3 +- tools/libxc/xc_domain.c | 2 +- xen/arch/x86/hvm/hvm.c | 40 ++++++++++++++++++++++++++++--------- xen/include/asm-x86/hvm/domain.h | 1 + xen/include/public/hvm/hvm_op.h | 7 ++++++ xen/include/public/hvm/ioreq.h | 13 ++++++++++- 6 files changed, 52 insertions(+), 14 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 50fa9e7..d1d2ab3 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1933,7 +1933,8 @@ int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long * * @parm xch a handle to an open hypervisor interface. * @parm domid the domain id to be serviced - * @parm handle_bufioreq should the IOREQ Server handle buffered requests? + * @parm handle_bufioreq how should the IOREQ Server handle buffered requests + * (HVM_IOREQSRV_BUFIOREQ_*)? * @parm id pointer to an ioservid_t to receive the IOREQ Server id. * @return 0 on success, -1 on failure. */ diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index b0cb6e1..ce51e69 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1411,7 +1411,7 @@ int xc_hvm_create_ioreq_server(xc_interface *xch, hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg); arg->domid = domid; - arg->handle_bufioreq = !!handle_bufioreq; + arg->handle_bufioreq = handle_bufioreq; rc = do_xen_hypercall(xch, &hypercall); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 183b26c..d5e5242 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -921,7 +921,7 @@ static void hvm_ioreq_server_disable(struct hvm_ioreq_server *s, static int hvm_ioreq_server_init(struct hvm_ioreq_server *s, struct domain *d, domid_t domid, bool_t is_default, - bool_t handle_bufioreq, ioservid_t id) + int bufioreq_handling, ioservid_t id) { struct vcpu *v; int rc; @@ -938,7 +938,11 @@ static int hvm_ioreq_server_init(struct hvm_ioreq_server *s, struct domain *d, if ( rc ) return rc; - rc = hvm_ioreq_server_setup_pages(s, is_default, handle_bufioreq); + if ( bufioreq_handling == HVM_IOREQSRV_BUFIOREQ_ATOMIC ) + s->bufioreq_atomic = 1; + + rc = hvm_ioreq_server_setup_pages( + s, is_default, bufioreq_handling != HVM_IOREQSRV_BUFIOREQ_OFF); if ( rc ) goto fail_map; @@ -997,12 +1001,15 @@ static ioservid_t next_ioservid(struct domain *d) } static int hvm_create_ioreq_server(struct domain *d, domid_t domid, - bool_t is_default, bool_t handle_bufioreq, + bool_t is_default, int bufioreq_handling, ioservid_t *id) { struct hvm_ioreq_server *s; int rc; + if ( bufioreq_handling > HVM_IOREQSRV_BUFIOREQ_ATOMIC ) + return -EINVAL; + rc = -ENOMEM; s = xzalloc(struct hvm_ioreq_server); if ( !s ) @@ -1015,7 +1022,7 @@ static int hvm_create_ioreq_server(struct domain *d, domid_t domid, if ( is_default && d->arch.hvm_domain.default_ioreq_server != NULL ) goto fail2; - rc = hvm_ioreq_server_init(s, d, domid, is_default, handle_bufioreq, + rc = hvm_ioreq_server_init(s, d, domid, is_default, bufioreq_handling, next_ioservid(d)); if ( rc ) goto fail3; @@ -2560,7 +2567,7 @@ int hvm_buffered_io_send(ioreq_t *p) spin_lock(&s->bufioreq_lock); - if ( (pg->write_pointer - pg->read_pointer) >= + if ( (pg->ptrs.write_pointer - pg->ptrs.read_pointer) >= (IOREQ_BUFFER_SLOT_NUM - qw) ) { /* The queue is full: send the iopacket through the normal path. */ @@ -2568,17 +2575,29 @@ int hvm_buffered_io_send(ioreq_t *p) return 0; } - pg->buf_ioreq[pg->write_pointer % IOREQ_BUFFER_SLOT_NUM] = bp; + pg->buf_ioreq[pg->ptrs.write_pointer % IOREQ_BUFFER_SLOT_NUM] = bp; if ( qw ) { bp.data = p->data >> 32; - pg->buf_ioreq[(pg->write_pointer+1) % IOREQ_BUFFER_SLOT_NUM] = bp; + pg->buf_ioreq[(pg->ptrs.write_pointer+1) % IOREQ_BUFFER_SLOT_NUM] = bp; } /* Make the ioreq_t visible /before/ write_pointer. */ wmb(); - pg->write_pointer += qw ? 2 : 1; + pg->ptrs.write_pointer += qw ? 2 : 1; + + /* Canonicalize read/write pointers to prevent their overflow. */ + while ( s->bufioreq_atomic && qw++ < IOREQ_BUFFER_SLOT_NUM && + pg->ptrs.read_pointer >= IOREQ_BUFFER_SLOT_NUM ) + { + union bufioreq_pointers old = pg->ptrs, new; + unsigned int n = old.read_pointer / IOREQ_BUFFER_SLOT_NUM; + + new.read_pointer = old.read_pointer - n * IOREQ_BUFFER_SLOT_NUM; + new.write_pointer = old.write_pointer - n * IOREQ_BUFFER_SLOT_NUM; + cmpxchg(&pg->ptrs.full, old.full, new.full); + } notify_via_xen_event_channel(d, s->bufioreq_evtchn); spin_unlock(&s->bufioreq_lock); @@ -5447,7 +5466,7 @@ static int hvmop_create_ioreq_server( goto out; rc = hvm_create_ioreq_server(d, curr_d->domain_id, 0, - !!op.handle_bufioreq, &op.id); + op.handle_bufioreq, &op.id); if ( rc != 0 ) goto out; @@ -5929,7 +5948,8 @@ static int hvmop_get_param( /* May need to create server. */ domid = d->arch.hvm_domain.params[HVM_PARAM_DM_DOMAIN]; - rc = hvm_create_ioreq_server(d, domid, 1, 1, NULL); + rc = hvm_create_ioreq_server(d, domid, 1, + HVM_IOREQSRV_BUFIOREQ_LEGACY, NULL); if ( rc != 0 && rc != -EEXIST ) goto out; } diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index bdab45d..ad68fcf 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -70,6 +70,7 @@ struct hvm_ioreq_server { evtchn_port_t bufioreq_evtchn; struct rangeset *range[NR_IO_RANGE_TYPES]; bool_t enabled; + bool_t bufioreq_atomic; }; struct hvm_domain { diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index cde3571..9b84e84 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -266,6 +266,13 @@ typedef uint16_t ioservid_t; #define HVMOP_create_ioreq_server 17 struct xen_hvm_create_ioreq_server { domid_t domid; /* IN - domain to be serviced */ +#define HVM_IOREQSRV_BUFIOREQ_OFF 0 +#define HVM_IOREQSRV_BUFIOREQ_LEGACY 1 +/* + * Use this when read_pointer gets updated atomically and + * the pointer pair gets read atomically: + */ +#define HVM_IOREQSRV_BUFIOREQ_ATOMIC 2 uint8_t handle_bufioreq; /* IN - should server handle buffered ioreqs */ ioservid_t id; /* OUT - server id */ }; diff --git a/xen/include/public/hvm/ioreq.h b/xen/include/public/hvm/ioreq.h index 5b5fedf..2e5809b 100644 --- a/xen/include/public/hvm/ioreq.h +++ b/xen/include/public/hvm/ioreq.h @@ -83,8 +83,17 @@ typedef struct buf_ioreq buf_ioreq_t; #define IOREQ_BUFFER_SLOT_NUM 511 /* 8 bytes each, plus 2 4-byte indexes */ struct buffered_iopage { - unsigned int read_pointer; - unsigned int write_pointer; +#ifdef __XEN__ + union bufioreq_pointers { + struct { +#endif + uint32_t read_pointer; + uint32_t write_pointer; +#ifdef __XEN__ + }; + uint64_t full; + } ptrs; +#endif buf_ioreq_t buf_ioreq[IOREQ_BUFFER_SLOT_NUM]; }; /* NB. Size of this structure must be no greater than one page. */ typedef struct buffered_iopage buffered_iopage_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 Jun 20 23:24:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S83-0003aC-F0; Sat, 20 Jun 2015 23:24:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S82-0003a1-GO for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:50 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B4/09-02969-146F5855; Sat, 20 Jun 2015 23:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1434842687!13757154!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4320 invoked from network); 20 Jun 2015 23:24:48 -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; 20 Jun 2015 23:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S7z-0005Ze-G4 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S7z-0003CA-ES for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:47 +0000 Date: Sat, 20 Jun 2015 23:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: avoid pointer wraparound in bufioreq handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b7007bc6f9a45cef9262b1ec4280eb67140a5112 Author: Jan Beulich AuthorDate: Thu Jun 18 16:44:15 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 16:44:15 2015 +0200 x86/HVM: avoid pointer wraparound in bufioreq handling The number of slots per page being 511 (i.e. not a power of two) means that the (32-bit) read and write indexes going beyond 2^32 will likely disturb operation. Extend I/O req server creation so the caller can indicate that it is using suitable atomic accesses where needed (not all accesses to the two pointers really need to be atomic), allowing the hypervisor to atomically canonicalize both pointers when both have gone through at least one cycle. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- tools/libxc/include/xenctrl.h | 3 +- tools/libxc/xc_domain.c | 2 +- xen/arch/x86/hvm/hvm.c | 40 ++++++++++++++++++++++++++++--------- xen/include/asm-x86/hvm/domain.h | 1 + xen/include/public/hvm/hvm_op.h | 7 ++++++ xen/include/public/hvm/ioreq.h | 13 ++++++++++- 6 files changed, 52 insertions(+), 14 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 50fa9e7..d1d2ab3 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1933,7 +1933,8 @@ int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long * * @parm xch a handle to an open hypervisor interface. * @parm domid the domain id to be serviced - * @parm handle_bufioreq should the IOREQ Server handle buffered requests? + * @parm handle_bufioreq how should the IOREQ Server handle buffered requests + * (HVM_IOREQSRV_BUFIOREQ_*)? * @parm id pointer to an ioservid_t to receive the IOREQ Server id. * @return 0 on success, -1 on failure. */ diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index b0cb6e1..ce51e69 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1411,7 +1411,7 @@ int xc_hvm_create_ioreq_server(xc_interface *xch, hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg); arg->domid = domid; - arg->handle_bufioreq = !!handle_bufioreq; + arg->handle_bufioreq = handle_bufioreq; rc = do_xen_hypercall(xch, &hypercall); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 183b26c..d5e5242 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -921,7 +921,7 @@ static void hvm_ioreq_server_disable(struct hvm_ioreq_server *s, static int hvm_ioreq_server_init(struct hvm_ioreq_server *s, struct domain *d, domid_t domid, bool_t is_default, - bool_t handle_bufioreq, ioservid_t id) + int bufioreq_handling, ioservid_t id) { struct vcpu *v; int rc; @@ -938,7 +938,11 @@ static int hvm_ioreq_server_init(struct hvm_ioreq_server *s, struct domain *d, if ( rc ) return rc; - rc = hvm_ioreq_server_setup_pages(s, is_default, handle_bufioreq); + if ( bufioreq_handling == HVM_IOREQSRV_BUFIOREQ_ATOMIC ) + s->bufioreq_atomic = 1; + + rc = hvm_ioreq_server_setup_pages( + s, is_default, bufioreq_handling != HVM_IOREQSRV_BUFIOREQ_OFF); if ( rc ) goto fail_map; @@ -997,12 +1001,15 @@ static ioservid_t next_ioservid(struct domain *d) } static int hvm_create_ioreq_server(struct domain *d, domid_t domid, - bool_t is_default, bool_t handle_bufioreq, + bool_t is_default, int bufioreq_handling, ioservid_t *id) { struct hvm_ioreq_server *s; int rc; + if ( bufioreq_handling > HVM_IOREQSRV_BUFIOREQ_ATOMIC ) + return -EINVAL; + rc = -ENOMEM; s = xzalloc(struct hvm_ioreq_server); if ( !s ) @@ -1015,7 +1022,7 @@ static int hvm_create_ioreq_server(struct domain *d, domid_t domid, if ( is_default && d->arch.hvm_domain.default_ioreq_server != NULL ) goto fail2; - rc = hvm_ioreq_server_init(s, d, domid, is_default, handle_bufioreq, + rc = hvm_ioreq_server_init(s, d, domid, is_default, bufioreq_handling, next_ioservid(d)); if ( rc ) goto fail3; @@ -2560,7 +2567,7 @@ int hvm_buffered_io_send(ioreq_t *p) spin_lock(&s->bufioreq_lock); - if ( (pg->write_pointer - pg->read_pointer) >= + if ( (pg->ptrs.write_pointer - pg->ptrs.read_pointer) >= (IOREQ_BUFFER_SLOT_NUM - qw) ) { /* The queue is full: send the iopacket through the normal path. */ @@ -2568,17 +2575,29 @@ int hvm_buffered_io_send(ioreq_t *p) return 0; } - pg->buf_ioreq[pg->write_pointer % IOREQ_BUFFER_SLOT_NUM] = bp; + pg->buf_ioreq[pg->ptrs.write_pointer % IOREQ_BUFFER_SLOT_NUM] = bp; if ( qw ) { bp.data = p->data >> 32; - pg->buf_ioreq[(pg->write_pointer+1) % IOREQ_BUFFER_SLOT_NUM] = bp; + pg->buf_ioreq[(pg->ptrs.write_pointer+1) % IOREQ_BUFFER_SLOT_NUM] = bp; } /* Make the ioreq_t visible /before/ write_pointer. */ wmb(); - pg->write_pointer += qw ? 2 : 1; + pg->ptrs.write_pointer += qw ? 2 : 1; + + /* Canonicalize read/write pointers to prevent their overflow. */ + while ( s->bufioreq_atomic && qw++ < IOREQ_BUFFER_SLOT_NUM && + pg->ptrs.read_pointer >= IOREQ_BUFFER_SLOT_NUM ) + { + union bufioreq_pointers old = pg->ptrs, new; + unsigned int n = old.read_pointer / IOREQ_BUFFER_SLOT_NUM; + + new.read_pointer = old.read_pointer - n * IOREQ_BUFFER_SLOT_NUM; + new.write_pointer = old.write_pointer - n * IOREQ_BUFFER_SLOT_NUM; + cmpxchg(&pg->ptrs.full, old.full, new.full); + } notify_via_xen_event_channel(d, s->bufioreq_evtchn); spin_unlock(&s->bufioreq_lock); @@ -5447,7 +5466,7 @@ static int hvmop_create_ioreq_server( goto out; rc = hvm_create_ioreq_server(d, curr_d->domain_id, 0, - !!op.handle_bufioreq, &op.id); + op.handle_bufioreq, &op.id); if ( rc != 0 ) goto out; @@ -5929,7 +5948,8 @@ static int hvmop_get_param( /* May need to create server. */ domid = d->arch.hvm_domain.params[HVM_PARAM_DM_DOMAIN]; - rc = hvm_create_ioreq_server(d, domid, 1, 1, NULL); + rc = hvm_create_ioreq_server(d, domid, 1, + HVM_IOREQSRV_BUFIOREQ_LEGACY, NULL); if ( rc != 0 && rc != -EEXIST ) goto out; } diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index bdab45d..ad68fcf 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -70,6 +70,7 @@ struct hvm_ioreq_server { evtchn_port_t bufioreq_evtchn; struct rangeset *range[NR_IO_RANGE_TYPES]; bool_t enabled; + bool_t bufioreq_atomic; }; struct hvm_domain { diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index cde3571..9b84e84 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -266,6 +266,13 @@ typedef uint16_t ioservid_t; #define HVMOP_create_ioreq_server 17 struct xen_hvm_create_ioreq_server { domid_t domid; /* IN - domain to be serviced */ +#define HVM_IOREQSRV_BUFIOREQ_OFF 0 +#define HVM_IOREQSRV_BUFIOREQ_LEGACY 1 +/* + * Use this when read_pointer gets updated atomically and + * the pointer pair gets read atomically: + */ +#define HVM_IOREQSRV_BUFIOREQ_ATOMIC 2 uint8_t handle_bufioreq; /* IN - should server handle buffered ioreqs */ ioservid_t id; /* OUT - server id */ }; diff --git a/xen/include/public/hvm/ioreq.h b/xen/include/public/hvm/ioreq.h index 5b5fedf..2e5809b 100644 --- a/xen/include/public/hvm/ioreq.h +++ b/xen/include/public/hvm/ioreq.h @@ -83,8 +83,17 @@ typedef struct buf_ioreq buf_ioreq_t; #define IOREQ_BUFFER_SLOT_NUM 511 /* 8 bytes each, plus 2 4-byte indexes */ struct buffered_iopage { - unsigned int read_pointer; - unsigned int write_pointer; +#ifdef __XEN__ + union bufioreq_pointers { + struct { +#endif + uint32_t read_pointer; + uint32_t write_pointer; +#ifdef __XEN__ + }; + uint64_t full; + } ptrs; +#endif buf_ioreq_t buf_ioreq[IOREQ_BUFFER_SLOT_NUM]; }; /* NB. Size of this structure must be no greater than one page. */ typedef struct buffered_iopage buffered_iopage_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 Jun 20 23:25:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8E-0003cC-3O; Sat, 20 Jun 2015 23:25:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8C-0003bl-I6 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:00 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 7D/30-17050-B46F5855; Sat, 20 Jun 2015 23:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1434842697!18177456!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15142 invoked from network); 20 Jun 2015 23:24:58 -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; 20 Jun 2015 23:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S89-0005Zu-LY for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S89-0003CX-KI for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:57 +0000 Date: Sat, 20 Jun 2015 23:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI-X: cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 236e13ce60e1c0eb0535ad258e74a3789bc0d074 Author: Jan Beulich AuthorDate: Fri Jun 19 10:58:45 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 10:58:45 2015 +0200 x86/MSI-X: cleanup - __pci_enable_msix() now checks that an MSI-X capability was actually found - pass "pos" to msix_capability_init() as both callers already know it (and hence there's no need to re-obtain it) - call __pci_disable_msi{,x}() directly instead of via pci_disable_msi() from __pci_enable_msi{x,}() state validation paths - use msix_control_reg() instead of open coding it - log message adjustments - coding style corrections Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msi.c | 104 +++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 53 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e89f326..b36f080 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -35,6 +35,8 @@ static s8 __read_mostly use_msi = -1; boolean_param("msi", use_msi); +static void __pci_disable_msix(struct msi_desc *); + /* bitmap indicate which fixed map is free */ static DEFINE_SPINLOCK(msix_fixmap_lock); static DECLARE_BITMAP(msix_fixmap_pages, FIX_MSIX_MAX_PAGES); @@ -129,12 +131,14 @@ void msi_compose_msg(unsigned vector, const cpumask_t *cpu_mask, struct msi_msg unsigned dest; memset(msg, 0, sizeof(*msg)); - if ( !cpumask_intersects(cpu_mask, &cpu_online_map) ) { + if ( !cpumask_intersects(cpu_mask, &cpu_online_map) ) + { dprintk(XENLOG_ERR,"%s, compose msi message error!!\n", __func__); return; } - if ( vector ) { + if ( vector ) + { cpumask_t *mask = this_cpu(scratch_mask); cpumask_and(mask, cpu_mask, &cpu_online_map); @@ -195,8 +199,7 @@ static void read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) } case PCI_CAP_ID_MSIX: { - void __iomem *base; - base = entry->mask_base; + void __iomem *base = entry->mask_base; msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); @@ -257,8 +260,7 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) } case PCI_CAP_ID_MSIX: { - void __iomem *base; - base = entry->mask_base; + void __iomem *base = entry->mask_base; writel(msg->address_lo, base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); @@ -281,7 +283,7 @@ void set_msi_affinity(struct irq_desc *desc, const cpumask_t *mask) struct msi_desc *msi_desc = desc->msi_desc; dest = set_desc_affinity(desc, mask); - if (dest == BAD_APICID || !msi_desc) + if ( dest == BAD_APICID || !msi_desc ) return; ASSERT(spin_is_locked(&desc->lock)); @@ -332,11 +334,11 @@ static void msix_set_enable(struct pci_dev *dev, int enable) pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); if ( pos ) { - control = pci_conf_read16(seg, bus, slot, func, pos + PCI_MSIX_FLAGS); + control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); control &= ~PCI_MSIX_FLAGS_ENABLE; if ( enable ) control |= PCI_MSIX_FLAGS_ENABLE; - pci_conf_write16(seg, bus, slot, func, pos + PCI_MSIX_FLAGS, control); + pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); } } @@ -353,9 +355,11 @@ static void msi_set_mask_bit(struct irq_desc *desc, int flag) ASSERT(spin_is_locked(&desc->lock)); BUG_ON(!entry || !entry->dev); - switch (entry->msi_attrib.type) { + switch ( entry->msi_attrib.type ) + { case PCI_CAP_ID_MSI: - if (entry->msi_attrib.maskbit) { + if ( entry->msi_attrib.maskbit ) + { u32 mask_bits; u16 seg = entry->dev->seg; u8 bus = entry->dev->bus; @@ -701,13 +705,14 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, + unsigned int pos, struct msi_info *msi, struct msi_desc **desc, unsigned int nr_entries) { struct arch_msix *msix = dev->msix; struct msi_desc *entry = NULL; - int pos, vf; + int vf; u16 control; u64 table_paddr; u32 table_offset; @@ -719,7 +724,6 @@ static int msix_capability_init(struct pci_dev *dev, ASSERT(spin_is_locked(&pcidevs_lock)); - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); msix_set_enable(dev, 0);/* Ensure msix is disabled as I set it up */ @@ -884,10 +888,9 @@ static int __pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) old_desc = find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSI); if ( old_desc ) { - dprintk(XENLOG_WARNING, "irq %d has already mapped to MSI on " - "device %04x:%02x:%02x.%01x\n", - msi->irq, msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + printk(XENLOG_WARNING "irq %d already mapped to MSI on %04x:%02x:%02x.%u\n", + msi->irq, msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); *desc = old_desc; return 0; } @@ -895,10 +898,10 @@ static int __pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) old_desc = find_msi_entry(pdev, -1, PCI_CAP_ID_MSIX); if ( old_desc ) { - dprintk(XENLOG_WARNING, "MSI-X is already in use on " - "device %04x:%02x:%02x.%01x\n", msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); - pci_disable_msi(old_desc); + printk(XENLOG_WARNING "MSI-X already in use on %04x:%02x:%02x.%u\n", + msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + __pci_disable_msix(old_desc); } return msi_capability_init(pdev, msi->irq, desc, msi->entry_nr); @@ -912,7 +915,6 @@ static void __pci_disable_msi(struct msi_desc *entry) msi_set_enable(dev, 0); BUG_ON(list_empty(&dev->msi_list)); - } /** @@ -932,7 +934,7 @@ static void __pci_disable_msi(struct msi_desc *entry) **/ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) { - int status, pos, nr_entries; + int pos, nr_entries; struct pci_dev *pdev; u16 control; u8 slot = PCI_SLOT(msi->devfn); @@ -941,23 +943,22 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) ASSERT(spin_is_locked(&pcidevs_lock)); pdev = pci_get_pdev(msi->seg, msi->bus, msi->devfn); - if ( !pdev ) + pos = pci_find_cap_offset(msi->seg, msi->bus, slot, func, PCI_CAP_ID_MSIX); + if ( !pdev || !pos ) return -ENODEV; - pos = pci_find_cap_offset(msi->seg, msi->bus, slot, func, PCI_CAP_ID_MSIX); control = pci_conf_read16(msi->seg, msi->bus, slot, func, msix_control_reg(pos)); nr_entries = multi_msix_capable(control); - if (msi->entry_nr >= nr_entries) + if ( msi->entry_nr >= nr_entries ) return -EINVAL; old_desc = find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSIX); if ( old_desc ) { - dprintk(XENLOG_WARNING, "irq %d has already mapped to MSIX on " - "device %04x:%02x:%02x.%01x\n", - msi->irq, msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + printk(XENLOG_WARNING "irq %d already mapped to MSI-X on %04x:%02x:%02x.%u\n", + msi->irq, msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); *desc = old_desc; return 0; } @@ -965,15 +966,13 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) old_desc = find_msi_entry(pdev, -1, PCI_CAP_ID_MSI); if ( old_desc ) { - dprintk(XENLOG_WARNING, "MSI is already in use on " - "device %04x:%02x:%02x.%01x\n", msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); - pci_disable_msi(old_desc); - + printk(XENLOG_WARNING "MSI already in use on %04x:%02x:%02x.%u\n", + msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + __pci_disable_msi(old_desc); } - status = msix_capability_init(pdev, msi, desc, nr_entries); - return status; + return msix_capability_init(pdev, pos, msi, desc, nr_entries); } static void _pci_cleanup_msix(struct arch_msix *msix) @@ -991,19 +990,16 @@ static void _pci_cleanup_msix(struct arch_msix *msix) static void __pci_disable_msix(struct msi_desc *entry) { - struct pci_dev *dev; - int pos; - u16 control, seg; - u8 bus, slot, func; - - dev = entry->dev; - seg = dev->seg; - bus = dev->bus; - slot = PCI_SLOT(dev->devfn); - func = PCI_FUNC(dev->devfn); + struct pci_dev *dev = entry->dev; + u16 seg = dev->seg; + u8 bus = dev->bus; + u8 slot = PCI_SLOT(dev->devfn); + u8 func = PCI_FUNC(dev->devfn); + unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, + PCI_CAP_ID_MSIX); + u16 control = pci_conf_read16(seg, bus, slot, func, + msix_control_reg(entry->msi_attrib.pos)); - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); - control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); msix_set_enable(dev, 0); BUG_ON(list_empty(&dev->msi_list)); @@ -1045,7 +1041,7 @@ int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off) u16 control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); - rc = msix_capability_init(pdev, NULL, NULL, + rc = msix_capability_init(pdev, pos, NULL, NULL, multi_msix_capable(control)); } spin_unlock(&pcidevs_lock); @@ -1064,8 +1060,8 @@ int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) if ( !use_msi ) return -EPERM; - return msi->table_base ? __pci_enable_msix(msi, desc) : - __pci_enable_msi(msi, desc); + return msi->table_base ? __pci_enable_msix(msi, desc) : + __pci_enable_msi(msi, desc); } /* @@ -1115,7 +1111,9 @@ int pci_restore_msi_state(struct pci_dev *pdev) if ( !pdev ) return -EINVAL; - ret = xsm_resource_setup_pci(XSM_PRIV, (pdev->seg << 16) | (pdev->bus << 8) | pdev->devfn); + ret = xsm_resource_setup_pci(XSM_PRIV, + (pdev->seg << 16) | (pdev->bus << 8) | + pdev->devfn); if ( ret ) 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 Jun 20 23:25:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8E-0003cC-3O; Sat, 20 Jun 2015 23:25:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8C-0003bl-I6 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:00 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 7D/30-17050-B46F5855; Sat, 20 Jun 2015 23:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1434842697!18177456!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15142 invoked from network); 20 Jun 2015 23:24:58 -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; 20 Jun 2015 23:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S89-0005Zu-LY for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S89-0003CX-KI for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:24:57 +0000 Date: Sat, 20 Jun 2015 23:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI-X: cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 236e13ce60e1c0eb0535ad258e74a3789bc0d074 Author: Jan Beulich AuthorDate: Fri Jun 19 10:58:45 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 10:58:45 2015 +0200 x86/MSI-X: cleanup - __pci_enable_msix() now checks that an MSI-X capability was actually found - pass "pos" to msix_capability_init() as both callers already know it (and hence there's no need to re-obtain it) - call __pci_disable_msi{,x}() directly instead of via pci_disable_msi() from __pci_enable_msi{x,}() state validation paths - use msix_control_reg() instead of open coding it - log message adjustments - coding style corrections Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msi.c | 104 +++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 53 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e89f326..b36f080 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -35,6 +35,8 @@ static s8 __read_mostly use_msi = -1; boolean_param("msi", use_msi); +static void __pci_disable_msix(struct msi_desc *); + /* bitmap indicate which fixed map is free */ static DEFINE_SPINLOCK(msix_fixmap_lock); static DECLARE_BITMAP(msix_fixmap_pages, FIX_MSIX_MAX_PAGES); @@ -129,12 +131,14 @@ void msi_compose_msg(unsigned vector, const cpumask_t *cpu_mask, struct msi_msg unsigned dest; memset(msg, 0, sizeof(*msg)); - if ( !cpumask_intersects(cpu_mask, &cpu_online_map) ) { + if ( !cpumask_intersects(cpu_mask, &cpu_online_map) ) + { dprintk(XENLOG_ERR,"%s, compose msi message error!!\n", __func__); return; } - if ( vector ) { + if ( vector ) + { cpumask_t *mask = this_cpu(scratch_mask); cpumask_and(mask, cpu_mask, &cpu_online_map); @@ -195,8 +199,7 @@ static void read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) } case PCI_CAP_ID_MSIX: { - void __iomem *base; - base = entry->mask_base; + void __iomem *base = entry->mask_base; msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); @@ -257,8 +260,7 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) } case PCI_CAP_ID_MSIX: { - void __iomem *base; - base = entry->mask_base; + void __iomem *base = entry->mask_base; writel(msg->address_lo, base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); @@ -281,7 +283,7 @@ void set_msi_affinity(struct irq_desc *desc, const cpumask_t *mask) struct msi_desc *msi_desc = desc->msi_desc; dest = set_desc_affinity(desc, mask); - if (dest == BAD_APICID || !msi_desc) + if ( dest == BAD_APICID || !msi_desc ) return; ASSERT(spin_is_locked(&desc->lock)); @@ -332,11 +334,11 @@ static void msix_set_enable(struct pci_dev *dev, int enable) pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); if ( pos ) { - control = pci_conf_read16(seg, bus, slot, func, pos + PCI_MSIX_FLAGS); + control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); control &= ~PCI_MSIX_FLAGS_ENABLE; if ( enable ) control |= PCI_MSIX_FLAGS_ENABLE; - pci_conf_write16(seg, bus, slot, func, pos + PCI_MSIX_FLAGS, control); + pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); } } @@ -353,9 +355,11 @@ static void msi_set_mask_bit(struct irq_desc *desc, int flag) ASSERT(spin_is_locked(&desc->lock)); BUG_ON(!entry || !entry->dev); - switch (entry->msi_attrib.type) { + switch ( entry->msi_attrib.type ) + { case PCI_CAP_ID_MSI: - if (entry->msi_attrib.maskbit) { + if ( entry->msi_attrib.maskbit ) + { u32 mask_bits; u16 seg = entry->dev->seg; u8 bus = entry->dev->bus; @@ -701,13 +705,14 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, + unsigned int pos, struct msi_info *msi, struct msi_desc **desc, unsigned int nr_entries) { struct arch_msix *msix = dev->msix; struct msi_desc *entry = NULL; - int pos, vf; + int vf; u16 control; u64 table_paddr; u32 table_offset; @@ -719,7 +724,6 @@ static int msix_capability_init(struct pci_dev *dev, ASSERT(spin_is_locked(&pcidevs_lock)); - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); msix_set_enable(dev, 0);/* Ensure msix is disabled as I set it up */ @@ -884,10 +888,9 @@ static int __pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) old_desc = find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSI); if ( old_desc ) { - dprintk(XENLOG_WARNING, "irq %d has already mapped to MSI on " - "device %04x:%02x:%02x.%01x\n", - msi->irq, msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + printk(XENLOG_WARNING "irq %d already mapped to MSI on %04x:%02x:%02x.%u\n", + msi->irq, msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); *desc = old_desc; return 0; } @@ -895,10 +898,10 @@ static int __pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) old_desc = find_msi_entry(pdev, -1, PCI_CAP_ID_MSIX); if ( old_desc ) { - dprintk(XENLOG_WARNING, "MSI-X is already in use on " - "device %04x:%02x:%02x.%01x\n", msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); - pci_disable_msi(old_desc); + printk(XENLOG_WARNING "MSI-X already in use on %04x:%02x:%02x.%u\n", + msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + __pci_disable_msix(old_desc); } return msi_capability_init(pdev, msi->irq, desc, msi->entry_nr); @@ -912,7 +915,6 @@ static void __pci_disable_msi(struct msi_desc *entry) msi_set_enable(dev, 0); BUG_ON(list_empty(&dev->msi_list)); - } /** @@ -932,7 +934,7 @@ static void __pci_disable_msi(struct msi_desc *entry) **/ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) { - int status, pos, nr_entries; + int pos, nr_entries; struct pci_dev *pdev; u16 control; u8 slot = PCI_SLOT(msi->devfn); @@ -941,23 +943,22 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) ASSERT(spin_is_locked(&pcidevs_lock)); pdev = pci_get_pdev(msi->seg, msi->bus, msi->devfn); - if ( !pdev ) + pos = pci_find_cap_offset(msi->seg, msi->bus, slot, func, PCI_CAP_ID_MSIX); + if ( !pdev || !pos ) return -ENODEV; - pos = pci_find_cap_offset(msi->seg, msi->bus, slot, func, PCI_CAP_ID_MSIX); control = pci_conf_read16(msi->seg, msi->bus, slot, func, msix_control_reg(pos)); nr_entries = multi_msix_capable(control); - if (msi->entry_nr >= nr_entries) + if ( msi->entry_nr >= nr_entries ) return -EINVAL; old_desc = find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSIX); if ( old_desc ) { - dprintk(XENLOG_WARNING, "irq %d has already mapped to MSIX on " - "device %04x:%02x:%02x.%01x\n", - msi->irq, msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + printk(XENLOG_WARNING "irq %d already mapped to MSI-X on %04x:%02x:%02x.%u\n", + msi->irq, msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); *desc = old_desc; return 0; } @@ -965,15 +966,13 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) old_desc = find_msi_entry(pdev, -1, PCI_CAP_ID_MSI); if ( old_desc ) { - dprintk(XENLOG_WARNING, "MSI is already in use on " - "device %04x:%02x:%02x.%01x\n", msi->seg, msi->bus, - PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); - pci_disable_msi(old_desc); - + printk(XENLOG_WARNING "MSI already in use on %04x:%02x:%02x.%u\n", + msi->seg, msi->bus, + PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn)); + __pci_disable_msi(old_desc); } - status = msix_capability_init(pdev, msi, desc, nr_entries); - return status; + return msix_capability_init(pdev, pos, msi, desc, nr_entries); } static void _pci_cleanup_msix(struct arch_msix *msix) @@ -991,19 +990,16 @@ static void _pci_cleanup_msix(struct arch_msix *msix) static void __pci_disable_msix(struct msi_desc *entry) { - struct pci_dev *dev; - int pos; - u16 control, seg; - u8 bus, slot, func; - - dev = entry->dev; - seg = dev->seg; - bus = dev->bus; - slot = PCI_SLOT(dev->devfn); - func = PCI_FUNC(dev->devfn); + struct pci_dev *dev = entry->dev; + u16 seg = dev->seg; + u8 bus = dev->bus; + u8 slot = PCI_SLOT(dev->devfn); + u8 func = PCI_FUNC(dev->devfn); + unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, + PCI_CAP_ID_MSIX); + u16 control = pci_conf_read16(seg, bus, slot, func, + msix_control_reg(entry->msi_attrib.pos)); - pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); - control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); msix_set_enable(dev, 0); BUG_ON(list_empty(&dev->msi_list)); @@ -1045,7 +1041,7 @@ int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off) u16 control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); - rc = msix_capability_init(pdev, NULL, NULL, + rc = msix_capability_init(pdev, pos, NULL, NULL, multi_msix_capable(control)); } spin_unlock(&pcidevs_lock); @@ -1064,8 +1060,8 @@ int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) if ( !use_msi ) return -EPERM; - return msi->table_base ? __pci_enable_msix(msi, desc) : - __pci_enable_msi(msi, desc); + return msi->table_base ? __pci_enable_msix(msi, desc) : + __pci_enable_msi(msi, desc); } /* @@ -1115,7 +1111,9 @@ int pci_restore_msi_state(struct pci_dev *pdev) if ( !pdev ) return -EINVAL; - ret = xsm_resource_setup_pci(XSM_PRIV, (pdev->seg << 16) | (pdev->bus << 8) | pdev->devfn); + ret = xsm_resource_setup_pci(XSM_PRIV, + (pdev->seg << 16) | (pdev->bus << 8) | + pdev->devfn); if ( ret ) 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 Jun 20 23:25:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S8O-0003eS-91; Sat, 20 Jun 2015 23:25:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8N-0003eE-J3 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:11 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 4B/A2-01139-656F5855; Sat, 20 Jun 2015 23:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1434842708!12818590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6766 invoked from network); 20 Jun 2015 23:25:09 -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; 20 Jun 2015 23:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8J-0005aT-U4 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8J-0003D8-Pa for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:07 +0000 Date: Sat, 20 Jun 2015 23:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: track host and guest masking separately X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad28e42bd1d28d746988ed71654e8aa670629753 Author: Jan Beulich AuthorDate: Fri Jun 19 10:59:53 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 10:59:53 2015 +0200 x86/MSI: track host and guest masking separately In particular we want to avoid losing track of our own intention to have an entry masked. Physical unmasking now happens only when both host and guest requested so. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hpet.c | 4 +- xen/arch/x86/hvm/vmsi.c | 48 +++++++---------------------- xen/arch/x86/msi.c | 43 ++++++++++++++++++++------- xen/drivers/passthrough/amd/iommu_init.c | 4 +- xen/drivers/passthrough/vtd/iommu.c | 4 +- xen/include/asm-x86/msi.h | 12 ++++--- 6 files changed, 57 insertions(+), 58 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 8f36f6f..f78054d 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -241,7 +241,7 @@ static void hpet_msi_unmask(struct irq_desc *desc) cfg = hpet_read32(HPET_Tn_CFG(ch->idx)); cfg |= HPET_TN_ENABLE; hpet_write32(cfg, HPET_Tn_CFG(ch->idx)); - ch->msi.msi_attrib.masked = 0; + ch->msi.msi_attrib.host_masked = 0; } static void hpet_msi_mask(struct irq_desc *desc) @@ -252,7 +252,7 @@ static void hpet_msi_mask(struct irq_desc *desc) cfg = hpet_read32(HPET_Tn_CFG(ch->idx)); cfg &= ~HPET_TN_ENABLE; hpet_write32(cfg, HPET_Tn_CFG(ch->idx)); - ch->msi.msi_attrib.masked = 1; + ch->msi.msi_attrib.host_masked = 1; } static int hpet_msi_write(struct hpet_event_channel *ch, struct msi_msg *msg) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 4968d39..fef1ca8 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -219,7 +219,6 @@ static int msixtbl_read( { unsigned long offset; struct msixtbl_entry *entry; - void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; @@ -253,13 +252,20 @@ static int msixtbl_read( } if ( offset == PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { - virt = msixtbl_addr_to_virt(entry, address); + const struct msi_desc *msi_desc; + void *virt = msixtbl_addr_to_virt(entry, address); + if ( !virt ) goto out; + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc ) + goto out; if ( len == 4 ) - *pval = readl(virt); + *pval = MASK_INSR(msi_desc->msi_attrib.guest_masked, + PCI_MSIX_VECTOR_BITMASK); else - *pval |= (u64)readl(virt) << 32; + *pval |= (u64)MASK_INSR(msi_desc->msi_attrib.guest_masked, + PCI_MSIX_VECTOR_BITMASK) << 32; } r = X86EMUL_OKAY; @@ -277,7 +283,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - unsigned long flags, orig; + unsigned long flags; struct irq_desc *desc; if ( (len != 4 && len != 8) || (address & (len - 1)) ) @@ -337,37 +343,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, ASSERT(msi_desc == desc->msi_desc); - orig = readl(virt); - - /* - * Do not allow guest to modify MSI-X control bit if it is masked - * by Xen. We'll only handle the case where Xen thinks that - * bit is unmasked, but hardware has silently masked the bit - * (in case of SR-IOV VF reset, etc). On the other hand, if Xen - * thinks that the bit is masked, but it's really not, - * we log a warning. - */ - if ( msi_desc->msi_attrib.masked ) - { - if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) - printk(XENLOG_WARNING "MSI-X control bit is unmasked when" - " it is expected to be masked [%04x:%02x:%02x.%u]\n", - entry->pdev->seg, entry->pdev->bus, - PCI_SLOT(entry->pdev->devfn), - PCI_FUNC(entry->pdev->devfn)); - - goto unlock; - } - - /* - * The mask bit is the only defined bit in the word. But we - * ought to preserve the reserved bits. Clearing the reserved - * bits can result in undefined behaviour (see PCI Local Bus - * Specification revision 2.3). - */ - val &= PCI_MSIX_VECTOR_BITMASK; - val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); - writel(val, virt); + guest_mask_msi_irq(desc, !!(val & PCI_MSIX_VECTOR_BITMASK)); unlock: spin_unlock_irqrestore(&desc->lock, flags); diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index b36f080..a8923fc 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -349,9 +349,10 @@ int msi_maskable_irq(const struct msi_desc *entry) || entry->msi_attrib.maskbit; } -static void msi_set_mask_bit(struct irq_desc *desc, int flag) +static void msi_set_mask_bit(struct irq_desc *desc, bool_t host, bool_t guest) { struct msi_desc *entry = desc->msi_desc; + bool_t flag = host || guest; ASSERT(spin_is_locked(&desc->lock)); BUG_ON(!entry || !entry->dev); @@ -383,7 +384,8 @@ static void msi_set_mask_bit(struct irq_desc *desc, int flag) BUG(); break; } - entry->msi_attrib.masked = !!flag; + entry->msi_attrib.host_masked = host; + entry->msi_attrib.guest_masked = guest; } static int msi_get_mask_bit(const struct msi_desc *entry) @@ -405,20 +407,33 @@ static int msi_get_mask_bit(const struct msi_desc *entry) void mask_msi_irq(struct irq_desc *desc) { - msi_set_mask_bit(desc, 1); + msi_set_mask_bit(desc, 1, desc->msi_desc->msi_attrib.guest_masked); } void unmask_msi_irq(struct irq_desc *desc) { - msi_set_mask_bit(desc, 0); + msi_set_mask_bit(desc, 0, desc->msi_desc->msi_attrib.guest_masked); +} + +void guest_mask_msi_irq(struct irq_desc *desc, bool_t mask) +{ + msi_set_mask_bit(desc, desc->msi_desc->msi_attrib.host_masked, mask); } static unsigned int startup_msi_irq(struct irq_desc *desc) { - unmask_msi_irq(desc); + bool_t guest_masked = (desc->status & IRQ_GUEST) && + is_hvm_domain(desc->msi_desc->dev->domain); + + msi_set_mask_bit(desc, 0, guest_masked); return 0; } +static void shutdown_msi_irq(struct irq_desc *desc) +{ + msi_set_mask_bit(desc, 1, 1); +} + void ack_nonmaskable_msi_irq(struct irq_desc *desc) { irq_complete_move(desc); @@ -443,7 +458,7 @@ void end_nonmaskable_msi_irq(struct irq_desc *desc, u8 vector) static hw_irq_controller pci_msi_maskable = { .typename = "PCI-MSI/-X", .startup = startup_msi_irq, - .shutdown = mask_msi_irq, + .shutdown = shutdown_msi_irq, .enable = unmask_msi_irq, .disable = mask_msi_irq, .ack = ack_maskable_msi_irq, @@ -591,7 +606,8 @@ static int msi_capability_init(struct pci_dev *dev, entry[i].msi_attrib.is_64 = is_64bit_address(control); entry[i].msi_attrib.entry_nr = i; entry[i].msi_attrib.maskbit = is_mask_bit_support(control); - entry[i].msi_attrib.masked = 1; + entry[i].msi_attrib.host_masked = 1; + entry[i].msi_attrib.guest_masked = 0; entry[i].msi_attrib.pos = pos; if ( entry[i].msi_attrib.maskbit ) entry[i].msi.mpos = mpos; @@ -817,7 +833,8 @@ static int msix_capability_init(struct pci_dev *dev, entry->msi_attrib.is_64 = 1; entry->msi_attrib.entry_nr = msi->entry_nr; entry->msi_attrib.maskbit = 1; - entry->msi_attrib.masked = 1; + entry->msi_attrib.host_masked = 1; + entry->msi_attrib.guest_masked = 1; entry->msi_attrib.pos = pos; entry->irq = msi->irq; entry->dev = dev; @@ -1152,7 +1169,8 @@ int pci_restore_msi_state(struct pci_dev *pdev) for ( i = 0; ; ) { - msi_set_mask_bit(desc, entry[i].msi_attrib.masked); + msi_set_mask_bit(desc, entry[i].msi_attrib.host_masked, + entry[i].msi_attrib.guest_masked); if ( !--nr ) break; @@ -1304,7 +1322,7 @@ static void dump_msi(unsigned char key) else mask = '?'; printk(" %-6s%4u vec=%02x%7s%6s%3sassert%5s%7s" - " dest=%08x mask=%d/%d/%c\n", + " dest=%08x mask=%d/%c%c/%c\n", type, irq, (data & MSI_DATA_VECTOR_MASK) >> MSI_DATA_VECTOR_SHIFT, data & MSI_DATA_DELIVERY_LOWPRI ? "lowest" : "fixed", @@ -1312,7 +1330,10 @@ static void dump_msi(unsigned char key) data & MSI_DATA_LEVEL_ASSERT ? "" : "de", addr & MSI_ADDR_DESTMODE_LOGIC ? "log" : "phys", addr & MSI_ADDR_REDIRECTION_LOWPRI ? "lowest" : "cpu", - dest32, attr.maskbit, attr.masked, mask); + dest32, attr.maskbit, + attr.host_masked ? 'H' : ' ', + attr.guest_masked ? 'G' : ' ', + mask); } } diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 56bda00..61698b3 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -451,7 +451,7 @@ static void iommu_msi_unmask(struct irq_desc *desc) spin_lock_irqsave(&iommu->lock, flags); amd_iommu_msi_enable(iommu, IOMMU_CONTROL_ENABLED); spin_unlock_irqrestore(&iommu->lock, flags); - iommu->msi.msi_attrib.masked = 0; + iommu->msi.msi_attrib.host_masked = 0; } static void iommu_msi_mask(struct irq_desc *desc) @@ -464,7 +464,7 @@ static void iommu_msi_mask(struct irq_desc *desc) spin_lock_irqsave(&iommu->lock, flags); amd_iommu_msi_enable(iommu, IOMMU_CONTROL_DISABLED); spin_unlock_irqrestore(&iommu->lock, flags); - iommu->msi.msi_attrib.masked = 1; + iommu->msi.msi_attrib.host_masked = 1; } static unsigned int iommu_msi_startup(struct irq_desc *desc) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 6ef5a80..a88b5a3 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -997,7 +997,7 @@ static void dma_msi_unmask(struct irq_desc *desc) spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FECTL_REG, 0); spin_unlock_irqrestore(&iommu->register_lock, flags); - iommu->msi.msi_attrib.masked = 0; + iommu->msi.msi_attrib.host_masked = 0; } static void dma_msi_mask(struct irq_desc *desc) @@ -1009,7 +1009,7 @@ static void dma_msi_mask(struct irq_desc *desc) spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FECTL_REG, DMA_FECTL_IM); spin_unlock_irqrestore(&iommu->register_lock, flags); - iommu->msi.msi_attrib.masked = 1; + iommu->msi.msi_attrib.host_masked = 1; } static unsigned int dma_msi_startup(struct irq_desc *desc) diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index abbecf8..8c7a93d 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -95,12 +95,13 @@ extern unsigned int pci_msix_get_table_len(struct pci_dev *pdev); struct msi_desc { struct msi_attrib { - __u8 type : 5; /* {0: unused, 5h:MSI, 11h:MSI-X} */ - __u8 maskbit : 1; /* mask-pending bit supported ? */ - __u8 masked : 1; + __u8 type; /* {0: unused, 5h:MSI, 11h:MSI-X} */ + __u8 pos; /* Location of the MSI capability */ + __u8 maskbit : 1; /* mask/pending bit supported ? */ __u8 is_64 : 1; /* Address size: 0=32bit 1=64bit */ - __u8 pos; /* Location of the msi capability */ - __u16 entry_nr; /* specific enabled entry */ + __u8 host_masked : 1; + __u8 guest_masked : 1; + __u16 entry_nr; /* specific enabled entry */ } msi_attrib; struct list_head list; @@ -241,6 +242,7 @@ void msi_compose_msg(unsigned vector, const cpumask_t *mask, void __msi_set_enable(u16 seg, u8 bus, u8 slot, u8 func, int pos, int enable); void mask_msi_irq(struct irq_desc *); void unmask_msi_irq(struct irq_desc *); +void guest_mask_msi_irq(struct irq_desc *, bool_t mask); void ack_nonmaskable_msi_irq(struct irq_desc *); void end_nonmaskable_msi_irq(struct irq_desc *, u8 vector); void set_msi_affinity(struct irq_desc *, const cpumask_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 Jun 20 23:25:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23: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 1Z6S8O-0003eS-91; Sat, 20 Jun 2015 23:25:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8N-0003eE-J3 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:11 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 4B/A2-01139-656F5855; Sat, 20 Jun 2015 23:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1434842708!12818590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6766 invoked from network); 20 Jun 2015 23:25:09 -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; 20 Jun 2015 23:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8J-0005aT-U4 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8J-0003D8-Pa for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:07 +0000 Date: Sat, 20 Jun 2015 23:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: track host and guest masking separately X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad28e42bd1d28d746988ed71654e8aa670629753 Author: Jan Beulich AuthorDate: Fri Jun 19 10:59:53 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 10:59:53 2015 +0200 x86/MSI: track host and guest masking separately In particular we want to avoid losing track of our own intention to have an entry masked. Physical unmasking now happens only when both host and guest requested so. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hpet.c | 4 +- xen/arch/x86/hvm/vmsi.c | 48 +++++++---------------------- xen/arch/x86/msi.c | 43 ++++++++++++++++++++------- xen/drivers/passthrough/amd/iommu_init.c | 4 +- xen/drivers/passthrough/vtd/iommu.c | 4 +- xen/include/asm-x86/msi.h | 12 ++++--- 6 files changed, 57 insertions(+), 58 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 8f36f6f..f78054d 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -241,7 +241,7 @@ static void hpet_msi_unmask(struct irq_desc *desc) cfg = hpet_read32(HPET_Tn_CFG(ch->idx)); cfg |= HPET_TN_ENABLE; hpet_write32(cfg, HPET_Tn_CFG(ch->idx)); - ch->msi.msi_attrib.masked = 0; + ch->msi.msi_attrib.host_masked = 0; } static void hpet_msi_mask(struct irq_desc *desc) @@ -252,7 +252,7 @@ static void hpet_msi_mask(struct irq_desc *desc) cfg = hpet_read32(HPET_Tn_CFG(ch->idx)); cfg &= ~HPET_TN_ENABLE; hpet_write32(cfg, HPET_Tn_CFG(ch->idx)); - ch->msi.msi_attrib.masked = 1; + ch->msi.msi_attrib.host_masked = 1; } static int hpet_msi_write(struct hpet_event_channel *ch, struct msi_msg *msg) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 4968d39..fef1ca8 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -219,7 +219,6 @@ static int msixtbl_read( { unsigned long offset; struct msixtbl_entry *entry; - void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; @@ -253,13 +252,20 @@ static int msixtbl_read( } if ( offset == PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { - virt = msixtbl_addr_to_virt(entry, address); + const struct msi_desc *msi_desc; + void *virt = msixtbl_addr_to_virt(entry, address); + if ( !virt ) goto out; + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc ) + goto out; if ( len == 4 ) - *pval = readl(virt); + *pval = MASK_INSR(msi_desc->msi_attrib.guest_masked, + PCI_MSIX_VECTOR_BITMASK); else - *pval |= (u64)readl(virt) << 32; + *pval |= (u64)MASK_INSR(msi_desc->msi_attrib.guest_masked, + PCI_MSIX_VECTOR_BITMASK) << 32; } r = X86EMUL_OKAY; @@ -277,7 +283,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - unsigned long flags, orig; + unsigned long flags; struct irq_desc *desc; if ( (len != 4 && len != 8) || (address & (len - 1)) ) @@ -337,37 +343,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, ASSERT(msi_desc == desc->msi_desc); - orig = readl(virt); - - /* - * Do not allow guest to modify MSI-X control bit if it is masked - * by Xen. We'll only handle the case where Xen thinks that - * bit is unmasked, but hardware has silently masked the bit - * (in case of SR-IOV VF reset, etc). On the other hand, if Xen - * thinks that the bit is masked, but it's really not, - * we log a warning. - */ - if ( msi_desc->msi_attrib.masked ) - { - if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) - printk(XENLOG_WARNING "MSI-X control bit is unmasked when" - " it is expected to be masked [%04x:%02x:%02x.%u]\n", - entry->pdev->seg, entry->pdev->bus, - PCI_SLOT(entry->pdev->devfn), - PCI_FUNC(entry->pdev->devfn)); - - goto unlock; - } - - /* - * The mask bit is the only defined bit in the word. But we - * ought to preserve the reserved bits. Clearing the reserved - * bits can result in undefined behaviour (see PCI Local Bus - * Specification revision 2.3). - */ - val &= PCI_MSIX_VECTOR_BITMASK; - val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); - writel(val, virt); + guest_mask_msi_irq(desc, !!(val & PCI_MSIX_VECTOR_BITMASK)); unlock: spin_unlock_irqrestore(&desc->lock, flags); diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index b36f080..a8923fc 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -349,9 +349,10 @@ int msi_maskable_irq(const struct msi_desc *entry) || entry->msi_attrib.maskbit; } -static void msi_set_mask_bit(struct irq_desc *desc, int flag) +static void msi_set_mask_bit(struct irq_desc *desc, bool_t host, bool_t guest) { struct msi_desc *entry = desc->msi_desc; + bool_t flag = host || guest; ASSERT(spin_is_locked(&desc->lock)); BUG_ON(!entry || !entry->dev); @@ -383,7 +384,8 @@ static void msi_set_mask_bit(struct irq_desc *desc, int flag) BUG(); break; } - entry->msi_attrib.masked = !!flag; + entry->msi_attrib.host_masked = host; + entry->msi_attrib.guest_masked = guest; } static int msi_get_mask_bit(const struct msi_desc *entry) @@ -405,20 +407,33 @@ static int msi_get_mask_bit(const struct msi_desc *entry) void mask_msi_irq(struct irq_desc *desc) { - msi_set_mask_bit(desc, 1); + msi_set_mask_bit(desc, 1, desc->msi_desc->msi_attrib.guest_masked); } void unmask_msi_irq(struct irq_desc *desc) { - msi_set_mask_bit(desc, 0); + msi_set_mask_bit(desc, 0, desc->msi_desc->msi_attrib.guest_masked); +} + +void guest_mask_msi_irq(struct irq_desc *desc, bool_t mask) +{ + msi_set_mask_bit(desc, desc->msi_desc->msi_attrib.host_masked, mask); } static unsigned int startup_msi_irq(struct irq_desc *desc) { - unmask_msi_irq(desc); + bool_t guest_masked = (desc->status & IRQ_GUEST) && + is_hvm_domain(desc->msi_desc->dev->domain); + + msi_set_mask_bit(desc, 0, guest_masked); return 0; } +static void shutdown_msi_irq(struct irq_desc *desc) +{ + msi_set_mask_bit(desc, 1, 1); +} + void ack_nonmaskable_msi_irq(struct irq_desc *desc) { irq_complete_move(desc); @@ -443,7 +458,7 @@ void end_nonmaskable_msi_irq(struct irq_desc *desc, u8 vector) static hw_irq_controller pci_msi_maskable = { .typename = "PCI-MSI/-X", .startup = startup_msi_irq, - .shutdown = mask_msi_irq, + .shutdown = shutdown_msi_irq, .enable = unmask_msi_irq, .disable = mask_msi_irq, .ack = ack_maskable_msi_irq, @@ -591,7 +606,8 @@ static int msi_capability_init(struct pci_dev *dev, entry[i].msi_attrib.is_64 = is_64bit_address(control); entry[i].msi_attrib.entry_nr = i; entry[i].msi_attrib.maskbit = is_mask_bit_support(control); - entry[i].msi_attrib.masked = 1; + entry[i].msi_attrib.host_masked = 1; + entry[i].msi_attrib.guest_masked = 0; entry[i].msi_attrib.pos = pos; if ( entry[i].msi_attrib.maskbit ) entry[i].msi.mpos = mpos; @@ -817,7 +833,8 @@ static int msix_capability_init(struct pci_dev *dev, entry->msi_attrib.is_64 = 1; entry->msi_attrib.entry_nr = msi->entry_nr; entry->msi_attrib.maskbit = 1; - entry->msi_attrib.masked = 1; + entry->msi_attrib.host_masked = 1; + entry->msi_attrib.guest_masked = 1; entry->msi_attrib.pos = pos; entry->irq = msi->irq; entry->dev = dev; @@ -1152,7 +1169,8 @@ int pci_restore_msi_state(struct pci_dev *pdev) for ( i = 0; ; ) { - msi_set_mask_bit(desc, entry[i].msi_attrib.masked); + msi_set_mask_bit(desc, entry[i].msi_attrib.host_masked, + entry[i].msi_attrib.guest_masked); if ( !--nr ) break; @@ -1304,7 +1322,7 @@ static void dump_msi(unsigned char key) else mask = '?'; printk(" %-6s%4u vec=%02x%7s%6s%3sassert%5s%7s" - " dest=%08x mask=%d/%d/%c\n", + " dest=%08x mask=%d/%c%c/%c\n", type, irq, (data & MSI_DATA_VECTOR_MASK) >> MSI_DATA_VECTOR_SHIFT, data & MSI_DATA_DELIVERY_LOWPRI ? "lowest" : "fixed", @@ -1312,7 +1330,10 @@ static void dump_msi(unsigned char key) data & MSI_DATA_LEVEL_ASSERT ? "" : "de", addr & MSI_ADDR_DESTMODE_LOGIC ? "log" : "phys", addr & MSI_ADDR_REDIRECTION_LOWPRI ? "lowest" : "cpu", - dest32, attr.maskbit, attr.masked, mask); + dest32, attr.maskbit, + attr.host_masked ? 'H' : ' ', + attr.guest_masked ? 'G' : ' ', + mask); } } diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 56bda00..61698b3 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -451,7 +451,7 @@ static void iommu_msi_unmask(struct irq_desc *desc) spin_lock_irqsave(&iommu->lock, flags); amd_iommu_msi_enable(iommu, IOMMU_CONTROL_ENABLED); spin_unlock_irqrestore(&iommu->lock, flags); - iommu->msi.msi_attrib.masked = 0; + iommu->msi.msi_attrib.host_masked = 0; } static void iommu_msi_mask(struct irq_desc *desc) @@ -464,7 +464,7 @@ static void iommu_msi_mask(struct irq_desc *desc) spin_lock_irqsave(&iommu->lock, flags); amd_iommu_msi_enable(iommu, IOMMU_CONTROL_DISABLED); spin_unlock_irqrestore(&iommu->lock, flags); - iommu->msi.msi_attrib.masked = 1; + iommu->msi.msi_attrib.host_masked = 1; } static unsigned int iommu_msi_startup(struct irq_desc *desc) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 6ef5a80..a88b5a3 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -997,7 +997,7 @@ static void dma_msi_unmask(struct irq_desc *desc) spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FECTL_REG, 0); spin_unlock_irqrestore(&iommu->register_lock, flags); - iommu->msi.msi_attrib.masked = 0; + iommu->msi.msi_attrib.host_masked = 0; } static void dma_msi_mask(struct irq_desc *desc) @@ -1009,7 +1009,7 @@ static void dma_msi_mask(struct irq_desc *desc) spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FECTL_REG, DMA_FECTL_IM); spin_unlock_irqrestore(&iommu->register_lock, flags); - iommu->msi.msi_attrib.masked = 1; + iommu->msi.msi_attrib.host_masked = 1; } static unsigned int dma_msi_startup(struct irq_desc *desc) diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index abbecf8..8c7a93d 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -95,12 +95,13 @@ extern unsigned int pci_msix_get_table_len(struct pci_dev *pdev); struct msi_desc { struct msi_attrib { - __u8 type : 5; /* {0: unused, 5h:MSI, 11h:MSI-X} */ - __u8 maskbit : 1; /* mask-pending bit supported ? */ - __u8 masked : 1; + __u8 type; /* {0: unused, 5h:MSI, 11h:MSI-X} */ + __u8 pos; /* Location of the MSI capability */ + __u8 maskbit : 1; /* mask/pending bit supported ? */ __u8 is_64 : 1; /* Address size: 0=32bit 1=64bit */ - __u8 pos; /* Location of the msi capability */ - __u16 entry_nr; /* specific enabled entry */ + __u8 host_masked : 1; + __u8 guest_masked : 1; + __u16 entry_nr; /* specific enabled entry */ } msi_attrib; struct list_head list; @@ -241,6 +242,7 @@ void msi_compose_msg(unsigned vector, const cpumask_t *mask, void __msi_set_enable(u16 seg, u8 bus, u8 slot, u8 func, int pos, int enable); void mask_msi_irq(struct irq_desc *); void unmask_msi_irq(struct irq_desc *); +void guest_mask_msi_irq(struct irq_desc *, bool_t mask); void ack_nonmaskable_msi_irq(struct irq_desc *); void end_nonmaskable_msi_irq(struct irq_desc *, u8 vector); void set_msi_affinity(struct irq_desc *, const cpumask_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 Jun 20 23:25:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8Y-0003gj-BZ; Sat, 20 Jun 2015 23:25:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8W-0003gH-QX for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:20 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 3A/93-25925-066F5855; Sat, 20 Jun 2015 23:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1434842718!11572624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25208 invoked from network); 20 Jun 2015 23:25:19 -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 Jun 2015 23:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8U-0005ax-G6 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8U-0003DW-E5 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:18 +0000 Date: Sat, 20 Jun 2015 23:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI-X: cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 43147e03e8f4d82d1eb8c2324336b720d43fc6fd Author: Jan Beulich AuthorDate: Fri Jun 19 11:00:36 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 11:00:36 2015 +0200 x86/MSI-X: cleanup Fold msixtbl_addr_to_virt() + virt_to_msi_desc() into simplified msixtbl_addr_to_desc(), as the callers don't need the virtual address anymore. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmsi.c | 54 ++++++++++++---------------------------------- 1 files changed, 14 insertions(+), 40 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index fef1ca8..3dbbe37 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -181,36 +181,23 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } -static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +static struct msi_desc *msixtbl_addr_to_desc( + const struct msixtbl_entry *entry, unsigned long addr) { + unsigned int nr_entry; struct msi_desc *desc; - list_for_each_entry( desc, &dev->msi_list, list ) - if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && - virt >= desc->mask_base && - virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) - return desc; - - return NULL; -} - -static void __iomem *msixtbl_addr_to_virt( - struct msixtbl_entry *entry, unsigned long addr) -{ - unsigned int idx, nr_page; - if ( !entry || !entry->pdev ) return NULL; - nr_page = (addr >> PAGE_SHIFT) - - (entry->gtable >> PAGE_SHIFT); + nr_entry = (addr - entry->gtable) / PCI_MSIX_ENTRY_SIZE; - idx = entry->pdev->msix->table_idx[nr_page]; - if ( !idx ) - return NULL; + list_for_each_entry( desc, &entry->pdev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + desc->msi_attrib.entry_nr == nr_entry ) + return desc; - return (void *)(fix_to_virt(idx) + - (addr & ((1UL << PAGE_SHIFT) - 1))); + return NULL; } static int msixtbl_read( @@ -252,12 +239,8 @@ static int msixtbl_read( } if ( offset == PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { - const struct msi_desc *msi_desc; - void *virt = msixtbl_addr_to_virt(entry, address); + const struct msi_desc *msi_desc = msixtbl_addr_to_desc(entry, address); - if ( !virt ) - goto out; - msi_desc = virt_to_msi_desc(entry->pdev, virt); if ( !msi_desc ) goto out; if ( len == 4 ) @@ -280,7 +263,6 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unsigned long offset; struct msixtbl_entry *entry; const struct msi_desc *msi_desc; - void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; unsigned long flags; @@ -324,11 +306,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, goto out; } - virt = msixtbl_addr_to_virt(entry, address); - if ( !virt ) - goto out; - - msi_desc = virt_to_msi_desc(entry->pdev, virt); + msi_desc = msixtbl_addr_to_desc(entry, address); if ( !msi_desc || msi_desc->irq < 0 ) goto out; @@ -357,17 +335,13 @@ out: static int msixtbl_range(struct vcpu *v, unsigned long addr) { - struct msixtbl_entry *entry; - void *virt; + const struct msi_desc *desc; rcu_read_lock(&msixtbl_rcu_lock); - - entry = msixtbl_find_entry(v, addr); - virt = msixtbl_addr_to_virt(entry, addr); - + desc = msixtbl_addr_to_desc(msixtbl_find_entry(v, addr), addr); rcu_read_unlock(&msixtbl_rcu_lock); - return !!virt; + return !!desc; } const struct hvm_mmio_handler msixtbl_mmio_handler = { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:25:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8Y-0003gj-BZ; Sat, 20 Jun 2015 23:25:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8W-0003gH-QX for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:20 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 3A/93-25925-066F5855; Sat, 20 Jun 2015 23:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1434842718!11572624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25208 invoked from network); 20 Jun 2015 23:25:19 -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 Jun 2015 23:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8U-0005ax-G6 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8U-0003DW-E5 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:18 +0000 Date: Sat, 20 Jun 2015 23:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI-X: cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 43147e03e8f4d82d1eb8c2324336b720d43fc6fd Author: Jan Beulich AuthorDate: Fri Jun 19 11:00:36 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 11:00:36 2015 +0200 x86/MSI-X: cleanup Fold msixtbl_addr_to_virt() + virt_to_msi_desc() into simplified msixtbl_addr_to_desc(), as the callers don't need the virtual address anymore. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmsi.c | 54 ++++++++++++---------------------------------- 1 files changed, 14 insertions(+), 40 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index fef1ca8..3dbbe37 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -181,36 +181,23 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } -static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +static struct msi_desc *msixtbl_addr_to_desc( + const struct msixtbl_entry *entry, unsigned long addr) { + unsigned int nr_entry; struct msi_desc *desc; - list_for_each_entry( desc, &dev->msi_list, list ) - if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && - virt >= desc->mask_base && - virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) - return desc; - - return NULL; -} - -static void __iomem *msixtbl_addr_to_virt( - struct msixtbl_entry *entry, unsigned long addr) -{ - unsigned int idx, nr_page; - if ( !entry || !entry->pdev ) return NULL; - nr_page = (addr >> PAGE_SHIFT) - - (entry->gtable >> PAGE_SHIFT); + nr_entry = (addr - entry->gtable) / PCI_MSIX_ENTRY_SIZE; - idx = entry->pdev->msix->table_idx[nr_page]; - if ( !idx ) - return NULL; + list_for_each_entry( desc, &entry->pdev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + desc->msi_attrib.entry_nr == nr_entry ) + return desc; - return (void *)(fix_to_virt(idx) + - (addr & ((1UL << PAGE_SHIFT) - 1))); + return NULL; } static int msixtbl_read( @@ -252,12 +239,8 @@ static int msixtbl_read( } if ( offset == PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { - const struct msi_desc *msi_desc; - void *virt = msixtbl_addr_to_virt(entry, address); + const struct msi_desc *msi_desc = msixtbl_addr_to_desc(entry, address); - if ( !virt ) - goto out; - msi_desc = virt_to_msi_desc(entry->pdev, virt); if ( !msi_desc ) goto out; if ( len == 4 ) @@ -280,7 +263,6 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unsigned long offset; struct msixtbl_entry *entry; const struct msi_desc *msi_desc; - void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; unsigned long flags; @@ -324,11 +306,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, goto out; } - virt = msixtbl_addr_to_virt(entry, address); - if ( !virt ) - goto out; - - msi_desc = virt_to_msi_desc(entry->pdev, virt); + msi_desc = msixtbl_addr_to_desc(entry, address); if ( !msi_desc || msi_desc->irq < 0 ) goto out; @@ -357,17 +335,13 @@ out: static int msixtbl_range(struct vcpu *v, unsigned long addr) { - struct msixtbl_entry *entry; - void *virt; + const struct msi_desc *desc; rcu_read_lock(&msixtbl_rcu_lock); - - entry = msixtbl_find_entry(v, addr); - virt = msixtbl_addr_to_virt(entry, addr); - + desc = msixtbl_addr_to_desc(msixtbl_find_entry(v, addr), addr); rcu_read_unlock(&msixtbl_rcu_lock); - return !!virt; + return !!desc; } const struct hvm_mmio_handler msixtbl_mmio_handler = { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8j-0003io-EH; Sat, 20 Jun 2015 23:25:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8h-0003iV-S5 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:32 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 8B/AF-13047-B66F5855; Sat, 20 Jun 2015 23:25:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1434842728!13776796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6021 invoked from network); 20 Jun 2015 23:25:29 -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; 20 Jun 2015 23:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8e-0005b7-M0 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8e-0003Dv-Kx for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:28 +0000 Date: Sat, 20 Jun 2015 23:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: use per-VCPU maptrack free lists X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff515dfeac4c1c13422a128c558ac21ddc6c8db Author: Malcolm Crossley AuthorDate: Fri Jun 19 11:01:24 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 11:01:24 2015 +0200 gnttab: use per-VCPU maptrack free lists Performance analysis of aggregate network throughput with many VMs shows that performance is signficantly limited by contention on the maptrack lock when obtaining/releasing maptrack handles from the free list. Instead of a single free list use a per-VCPU list. This avoids any contention when obtaining a handle. Handles must be released back to their original list and since this may occur on a different VCPU there is some contention on the destination VCPU's free list tail pointer (but this is much better than a per-domain lock). Increase the default maximum number of maptrack frames by 4 times because: a) struct grant_mapping is now 16 bytes (instead of 8); and b) a guest may not evenly distribute all the grant map operations across the VCPUs (meaning some VCPUs need more maptrack entries than others). Signed-off-by: Malcolm Crossley Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/domain.c | 2 + xen/common/grant_table.c | 126 +++++++++++++++++++++++++++-------------- xen/include/xen/grant_table.h | 4 +- xen/include/xen/sched.h | 4 + 4 files changed, 92 insertions(+), 44 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index b0e83f5..3bc52e6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -127,6 +127,8 @@ struct vcpu *alloc_vcpu( tasklet_init(&v->continue_hypercall_tasklet, NULL, 0); + grant_table_init_vcpu(v); + if ( !zalloc_cpumask_var(&v->cpu_hard_affinity) || !zalloc_cpumask_var(&v->cpu_hard_affinity_tmp) || !zalloc_cpumask_var(&v->cpu_hard_affinity_saved) || diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index a011276..7056b96 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -57,7 +58,7 @@ integer_param("gnttab_max_frames", max_grant_frames); * New options allow to set max_maptrack_frames and * map_grant_table_frames independently. */ -#define DEFAULT_MAX_MAPTRACK_FRAMES 256 +#define DEFAULT_MAX_MAPTRACK_FRAMES 1024 static unsigned int __read_mostly max_maptrack_frames; integer_param("gnttab_max_maptrack_frames", max_maptrack_frames); @@ -121,6 +122,8 @@ struct grant_mapping { u32 ref; /* grant ref */ u16 flags; /* 0-4: GNTMAP_* ; 5-15: unused */ domid_t domid; /* granting domain */ + u32 vcpu; /* vcpu which created the grant mapping */ + u32 pad; /* round size to a power of 2 */ }; #define MAPTRACK_PER_PAGE (PAGE_SIZE / sizeof(struct grant_mapping)) @@ -289,62 +292,103 @@ double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) static inline int __get_maptrack_handle( - struct grant_table *t) + struct grant_table *t, + struct vcpu *v) { - unsigned int h; - if ( unlikely((h = t->maptrack_head) == MAPTRACK_TAIL) ) + unsigned int head, next; + + /* No maptrack pages allocated for this VCPU yet? */ + head = v->maptrack_head; + if ( unlikely(head == MAPTRACK_TAIL) ) + return -1; + + /* + * Always keep one entry in the free list to make it easier to add + * free entries to the tail. + */ + next = read_atomic(&maptrack_entry(t, head).ref); + if ( unlikely(next == MAPTRACK_TAIL) ) return -1; - t->maptrack_head = maptrack_entry(t, h).ref; - return h; + + v->maptrack_head = next; + + return head; } static inline void put_maptrack_handle( struct grant_table *t, int handle) { - spin_lock(&t->maptrack_lock); - maptrack_entry(t, handle).ref = t->maptrack_head; - t->maptrack_head = handle; - spin_unlock(&t->maptrack_lock); + struct domain *currd = current->domain; + struct vcpu *v; + unsigned int prev_tail, cur_tail; + + /* 1. Set entry to be a tail. */ + maptrack_entry(t, handle).ref = MAPTRACK_TAIL; + + /* 2. Add entry to the tail of the list on the original VCPU. */ + v = currd->vcpu[maptrack_entry(t, handle).vcpu]; + + cur_tail = read_atomic(&v->maptrack_tail); + do { + prev_tail = cur_tail; + cur_tail = cmpxchg(&v->maptrack_tail, prev_tail, handle); + } while ( cur_tail != prev_tail ); + + /* 3. Update the old tail entry to point to the new entry. */ + write_atomic(&maptrack_entry(t, prev_tail).ref, handle); } static inline int get_maptrack_handle( struct grant_table *lgt) { + struct vcpu *curr = current; int i; grant_handle_t handle; struct grant_mapping *new_mt; - unsigned int new_mt_limit, nr_frames; + + handle = __get_maptrack_handle(lgt, curr); + if ( likely(handle != -1) ) + return handle; spin_lock(&lgt->maptrack_lock); - while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) ) + if ( nr_maptrack_frames(lgt) >= max_maptrack_frames ) { - nr_frames = nr_maptrack_frames(lgt); - if ( nr_frames >= max_maptrack_frames ) - break; + spin_unlock(&lgt->maptrack_lock); + return -1; + } - new_mt = alloc_xenheap_page(); - if ( !new_mt ) - break; + new_mt = alloc_xenheap_page(); + if ( !new_mt ) + { + spin_unlock(&lgt->maptrack_lock); + return -1; + } + clear_page(new_mt); - clear_page(new_mt); + /* + * Use the first new entry and add the remaining entries to the + * head of the free list. + */ + handle = lgt->maptrack_limit; - new_mt_limit = lgt->maptrack_limit + MAPTRACK_PER_PAGE; + for ( i = 0; i < MAPTRACK_PER_PAGE; i++ ) + { + new_mt[i].ref = handle + i + 1; + new_mt[i].vcpu = curr->vcpu_id; + } + new_mt[i - 1].ref = curr->maptrack_head; - for ( i = 1; i < MAPTRACK_PER_PAGE; i++ ) - new_mt[i - 1].ref = lgt->maptrack_limit + i; - new_mt[i - 1].ref = lgt->maptrack_head; - lgt->maptrack_head = lgt->maptrack_limit; + /* Set tail directly if this is the first page for this VCPU. */ + if ( curr->maptrack_tail == MAPTRACK_TAIL ) + curr->maptrack_tail = handle + MAPTRACK_PER_PAGE - 1; - lgt->maptrack[nr_frames] = new_mt; - smp_wmb(); - lgt->maptrack_limit = new_mt_limit; + curr->maptrack_head = handle + 1; - gdprintk(XENLOG_INFO, "Increased maptrack size to %u frames\n", - nr_frames + 1); - } + lgt->maptrack[nr_maptrack_frames(lgt)] = new_mt; + lgt->maptrack_limit += MAPTRACK_PER_PAGE; spin_unlock(&lgt->maptrack_lock); @@ -3048,16 +3092,9 @@ grant_table_create( } /* Tracking of mapped foreign frames table */ - if ( (t->maptrack = xzalloc_array(struct grant_mapping *, - max_maptrack_frames)) == NULL ) + t->maptrack = vzalloc(max_maptrack_frames * sizeof(*t->maptrack)); + if ( t->maptrack == NULL ) goto no_mem_2; - if ( (t->maptrack[0] = alloc_xenheap_page()) == NULL ) - goto no_mem_3; - clear_page(t->maptrack[0]); - t->maptrack_limit = MAPTRACK_PER_PAGE; - for ( i = 1; i < MAPTRACK_PER_PAGE; i++ ) - t->maptrack[0][i - 1].ref = i; - t->maptrack[0][i - 1].ref = MAPTRACK_TAIL; /* Shared grant table. */ if ( (t->shared_raw = xzalloc_array(void *, max_grant_frames)) == NULL ) @@ -3089,8 +3126,7 @@ grant_table_create( free_xenheap_page(t->shared_raw[i]); xfree(t->shared_raw); no_mem_3: - free_xenheap_page(t->maptrack[0]); - xfree(t->maptrack); + vfree(t->maptrack); no_mem_2: for ( i = 0; i < num_act_frames_from_sha_frames(INITIAL_NR_GRANT_FRAMES); i++ ) @@ -3225,7 +3261,7 @@ grant_table_destroy( for ( i = 0; i < nr_maptrack_frames(t); i++ ) free_xenheap_page(t->maptrack[i]); - xfree(t->maptrack); + vfree(t->maptrack); for ( i = 0; i < nr_active_grant_frames(t); i++ ) free_xenheap_page(t->active[i]); @@ -3239,6 +3275,12 @@ grant_table_destroy( d->grant_table = NULL; } +void grant_table_init_vcpu(struct vcpu *v) +{ + v->maptrack_head = MAPTRACK_TAIL; + v->maptrack_tail = MAPTRACK_TAIL; +} + static void gnttab_usage_print(struct domain *rd) { int first = 1; diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 9536331..9c7b5a3 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -73,9 +73,8 @@ struct grant_table { grant_status_t **status; /* Active grant table. */ struct active_grant_entry **active; - /* Mapping tracking table. */ + /* Mapping tracking table per vcpu. */ struct grant_mapping **maptrack; - unsigned int maptrack_head; unsigned int maptrack_limit; /* Lock protecting the maptrack page list, head, and limit */ spinlock_t maptrack_lock; @@ -89,6 +88,7 @@ int grant_table_create( struct domain *d); void grant_table_destroy( struct domain *d); +void grant_table_init_vcpu(struct vcpu *v); /* Domain death release of granted mappings of other domains' memory. */ void diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 604d047..d810e1c 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -219,6 +219,10 @@ struct vcpu /* VCPU paused by system controller. */ int controller_pause_count; + /* Maptrack */ + unsigned int maptrack_head; + unsigned int maptrack_tail; + /* 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 Sat Jun 20 23:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8j-0003io-EH; Sat, 20 Jun 2015 23:25:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8h-0003iV-S5 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:32 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 8B/AF-13047-B66F5855; Sat, 20 Jun 2015 23:25:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1434842728!13776796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6021 invoked from network); 20 Jun 2015 23:25:29 -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; 20 Jun 2015 23:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8e-0005b7-M0 for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8e-0003Dv-Kx for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:28 +0000 Date: Sat, 20 Jun 2015 23:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: use per-VCPU maptrack free lists X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff515dfeac4c1c13422a128c558ac21ddc6c8db Author: Malcolm Crossley AuthorDate: Fri Jun 19 11:01:24 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 11:01:24 2015 +0200 gnttab: use per-VCPU maptrack free lists Performance analysis of aggregate network throughput with many VMs shows that performance is signficantly limited by contention on the maptrack lock when obtaining/releasing maptrack handles from the free list. Instead of a single free list use a per-VCPU list. This avoids any contention when obtaining a handle. Handles must be released back to their original list and since this may occur on a different VCPU there is some contention on the destination VCPU's free list tail pointer (but this is much better than a per-domain lock). Increase the default maximum number of maptrack frames by 4 times because: a) struct grant_mapping is now 16 bytes (instead of 8); and b) a guest may not evenly distribute all the grant map operations across the VCPUs (meaning some VCPUs need more maptrack entries than others). Signed-off-by: Malcolm Crossley Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/domain.c | 2 + xen/common/grant_table.c | 126 +++++++++++++++++++++++++++-------------- xen/include/xen/grant_table.h | 4 +- xen/include/xen/sched.h | 4 + 4 files changed, 92 insertions(+), 44 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index b0e83f5..3bc52e6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -127,6 +127,8 @@ struct vcpu *alloc_vcpu( tasklet_init(&v->continue_hypercall_tasklet, NULL, 0); + grant_table_init_vcpu(v); + if ( !zalloc_cpumask_var(&v->cpu_hard_affinity) || !zalloc_cpumask_var(&v->cpu_hard_affinity_tmp) || !zalloc_cpumask_var(&v->cpu_hard_affinity_saved) || diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index a011276..7056b96 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -57,7 +58,7 @@ integer_param("gnttab_max_frames", max_grant_frames); * New options allow to set max_maptrack_frames and * map_grant_table_frames independently. */ -#define DEFAULT_MAX_MAPTRACK_FRAMES 256 +#define DEFAULT_MAX_MAPTRACK_FRAMES 1024 static unsigned int __read_mostly max_maptrack_frames; integer_param("gnttab_max_maptrack_frames", max_maptrack_frames); @@ -121,6 +122,8 @@ struct grant_mapping { u32 ref; /* grant ref */ u16 flags; /* 0-4: GNTMAP_* ; 5-15: unused */ domid_t domid; /* granting domain */ + u32 vcpu; /* vcpu which created the grant mapping */ + u32 pad; /* round size to a power of 2 */ }; #define MAPTRACK_PER_PAGE (PAGE_SIZE / sizeof(struct grant_mapping)) @@ -289,62 +292,103 @@ double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) static inline int __get_maptrack_handle( - struct grant_table *t) + struct grant_table *t, + struct vcpu *v) { - unsigned int h; - if ( unlikely((h = t->maptrack_head) == MAPTRACK_TAIL) ) + unsigned int head, next; + + /* No maptrack pages allocated for this VCPU yet? */ + head = v->maptrack_head; + if ( unlikely(head == MAPTRACK_TAIL) ) + return -1; + + /* + * Always keep one entry in the free list to make it easier to add + * free entries to the tail. + */ + next = read_atomic(&maptrack_entry(t, head).ref); + if ( unlikely(next == MAPTRACK_TAIL) ) return -1; - t->maptrack_head = maptrack_entry(t, h).ref; - return h; + + v->maptrack_head = next; + + return head; } static inline void put_maptrack_handle( struct grant_table *t, int handle) { - spin_lock(&t->maptrack_lock); - maptrack_entry(t, handle).ref = t->maptrack_head; - t->maptrack_head = handle; - spin_unlock(&t->maptrack_lock); + struct domain *currd = current->domain; + struct vcpu *v; + unsigned int prev_tail, cur_tail; + + /* 1. Set entry to be a tail. */ + maptrack_entry(t, handle).ref = MAPTRACK_TAIL; + + /* 2. Add entry to the tail of the list on the original VCPU. */ + v = currd->vcpu[maptrack_entry(t, handle).vcpu]; + + cur_tail = read_atomic(&v->maptrack_tail); + do { + prev_tail = cur_tail; + cur_tail = cmpxchg(&v->maptrack_tail, prev_tail, handle); + } while ( cur_tail != prev_tail ); + + /* 3. Update the old tail entry to point to the new entry. */ + write_atomic(&maptrack_entry(t, prev_tail).ref, handle); } static inline int get_maptrack_handle( struct grant_table *lgt) { + struct vcpu *curr = current; int i; grant_handle_t handle; struct grant_mapping *new_mt; - unsigned int new_mt_limit, nr_frames; + + handle = __get_maptrack_handle(lgt, curr); + if ( likely(handle != -1) ) + return handle; spin_lock(&lgt->maptrack_lock); - while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) ) + if ( nr_maptrack_frames(lgt) >= max_maptrack_frames ) { - nr_frames = nr_maptrack_frames(lgt); - if ( nr_frames >= max_maptrack_frames ) - break; + spin_unlock(&lgt->maptrack_lock); + return -1; + } - new_mt = alloc_xenheap_page(); - if ( !new_mt ) - break; + new_mt = alloc_xenheap_page(); + if ( !new_mt ) + { + spin_unlock(&lgt->maptrack_lock); + return -1; + } + clear_page(new_mt); - clear_page(new_mt); + /* + * Use the first new entry and add the remaining entries to the + * head of the free list. + */ + handle = lgt->maptrack_limit; - new_mt_limit = lgt->maptrack_limit + MAPTRACK_PER_PAGE; + for ( i = 0; i < MAPTRACK_PER_PAGE; i++ ) + { + new_mt[i].ref = handle + i + 1; + new_mt[i].vcpu = curr->vcpu_id; + } + new_mt[i - 1].ref = curr->maptrack_head; - for ( i = 1; i < MAPTRACK_PER_PAGE; i++ ) - new_mt[i - 1].ref = lgt->maptrack_limit + i; - new_mt[i - 1].ref = lgt->maptrack_head; - lgt->maptrack_head = lgt->maptrack_limit; + /* Set tail directly if this is the first page for this VCPU. */ + if ( curr->maptrack_tail == MAPTRACK_TAIL ) + curr->maptrack_tail = handle + MAPTRACK_PER_PAGE - 1; - lgt->maptrack[nr_frames] = new_mt; - smp_wmb(); - lgt->maptrack_limit = new_mt_limit; + curr->maptrack_head = handle + 1; - gdprintk(XENLOG_INFO, "Increased maptrack size to %u frames\n", - nr_frames + 1); - } + lgt->maptrack[nr_maptrack_frames(lgt)] = new_mt; + lgt->maptrack_limit += MAPTRACK_PER_PAGE; spin_unlock(&lgt->maptrack_lock); @@ -3048,16 +3092,9 @@ grant_table_create( } /* Tracking of mapped foreign frames table */ - if ( (t->maptrack = xzalloc_array(struct grant_mapping *, - max_maptrack_frames)) == NULL ) + t->maptrack = vzalloc(max_maptrack_frames * sizeof(*t->maptrack)); + if ( t->maptrack == NULL ) goto no_mem_2; - if ( (t->maptrack[0] = alloc_xenheap_page()) == NULL ) - goto no_mem_3; - clear_page(t->maptrack[0]); - t->maptrack_limit = MAPTRACK_PER_PAGE; - for ( i = 1; i < MAPTRACK_PER_PAGE; i++ ) - t->maptrack[0][i - 1].ref = i; - t->maptrack[0][i - 1].ref = MAPTRACK_TAIL; /* Shared grant table. */ if ( (t->shared_raw = xzalloc_array(void *, max_grant_frames)) == NULL ) @@ -3089,8 +3126,7 @@ grant_table_create( free_xenheap_page(t->shared_raw[i]); xfree(t->shared_raw); no_mem_3: - free_xenheap_page(t->maptrack[0]); - xfree(t->maptrack); + vfree(t->maptrack); no_mem_2: for ( i = 0; i < num_act_frames_from_sha_frames(INITIAL_NR_GRANT_FRAMES); i++ ) @@ -3225,7 +3261,7 @@ grant_table_destroy( for ( i = 0; i < nr_maptrack_frames(t); i++ ) free_xenheap_page(t->maptrack[i]); - xfree(t->maptrack); + vfree(t->maptrack); for ( i = 0; i < nr_active_grant_frames(t); i++ ) free_xenheap_page(t->active[i]); @@ -3239,6 +3275,12 @@ grant_table_destroy( d->grant_table = NULL; } +void grant_table_init_vcpu(struct vcpu *v) +{ + v->maptrack_head = MAPTRACK_TAIL; + v->maptrack_tail = MAPTRACK_TAIL; +} + static void gnttab_usage_print(struct domain *rd) { int first = 1; diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 9536331..9c7b5a3 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -73,9 +73,8 @@ struct grant_table { grant_status_t **status; /* Active grant table. */ struct active_grant_entry **active; - /* Mapping tracking table. */ + /* Mapping tracking table per vcpu. */ struct grant_mapping **maptrack; - unsigned int maptrack_head; unsigned int maptrack_limit; /* Lock protecting the maptrack page list, head, and limit */ spinlock_t maptrack_lock; @@ -89,6 +88,7 @@ int grant_table_create( struct domain *d); void grant_table_destroy( struct domain *d); +void grant_table_init_vcpu(struct vcpu *v); /* Domain death release of granted mappings of other domains' memory. */ void diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 604d047..d810e1c 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -219,6 +219,10 @@ struct vcpu /* VCPU paused by system controller. */ int controller_pause_count; + /* Maptrack */ + unsigned int maptrack_head; + unsigned int maptrack_tail; + /* 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 Sat Jun 20 23:25:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8t-0003l2-J9; Sat, 20 Jun 2015 23:25:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8r-0003kl-SG for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:42 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id B6/08-31650-576F5855; Sat, 20 Jun 2015 23:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434842739!19073885!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30338 invoked from network); 20 Jun 2015 23:25:40 -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; 20 Jun 2015 23:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8o-0005bg-Rd for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8o-0003EN-QA for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:38 +0000 Date: Sat, 20 Jun 2015 23:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: steal maptrack entries from other VCPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e76ff6c156906b515c2a4300a81c95886ece5d5f Author: David Vrabel AuthorDate: Fri Jun 19 11:02:04 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 11:02:04 2015 +0200 gnttab: steal maptrack entries from other VCPUs If a guest is not evenly grant mapping across its VCPUs one of the VCPUs may run out of free maptrack entries even though other VCPUs have many free. If this happens, "steal" free entries from other VCPUs. We want to steal entries such that: a) We avoid ping-ponging stolen entries between VCPUs. b) The number of free entries owned by each VCPUs tends (over time) to the number it uses. So when stealing, we select a VCPU at random (reducing (a)) and we transfer the stolen entries to the thief VCPU (aiming for (b)). Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/grant_table.c | 97 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 81 insertions(+), 16 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 7056b96..db5e5db 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -295,26 +295,70 @@ __get_maptrack_handle( struct grant_table *t, struct vcpu *v) { - unsigned int head, next; + unsigned int head, next, prev_head; - /* No maptrack pages allocated for this VCPU yet? */ - head = v->maptrack_head; - if ( unlikely(head == MAPTRACK_TAIL) ) - return -1; + do { + /* No maptrack pages allocated for this VCPU yet? */ + head = read_atomic(&v->maptrack_head); + if ( unlikely(head == MAPTRACK_TAIL) ) + return -1; - /* - * Always keep one entry in the free list to make it easier to add - * free entries to the tail. - */ - next = read_atomic(&maptrack_entry(t, head).ref); - if ( unlikely(next == MAPTRACK_TAIL) ) - return -1; + /* + * Always keep one entry in the free list to make it easier to + * add free entries to the tail. + */ + next = read_atomic(&maptrack_entry(t, head).ref); + if ( unlikely(next == MAPTRACK_TAIL) ) + return -1; - v->maptrack_head = next; + prev_head = head; + head = cmpxchg(&v->maptrack_head, prev_head, next); + } while ( head != prev_head ); return head; } +/* + * Try to "steal" a free maptrack entry from another VCPU. + * + * A stolen entry is transferred to the thief, so the number of + * entries for each VCPU should tend to the usage pattern. + * + * To avoid having to atomically count the number of free entries on + * each VCPU and to avoid two VCPU repeatedly stealing entries from + * each other, the initial victim VCPU is selected randomly. + */ +static int steal_maptrack_handle(struct grant_table *t, + const struct vcpu *curr) +{ + const struct domain *currd = curr->domain; + unsigned int first, i; + + /* Find an initial victim. */ + first = i = get_random() % currd->max_vcpus; + + do { + if ( currd->vcpu[i] ) + { + int handle; + + handle = __get_maptrack_handle(t, currd->vcpu[i]); + if ( handle != -1 ) + { + maptrack_entry(t, handle).vcpu = curr->vcpu_id; + return handle; + } + } + + i++; + if ( i == currd->max_vcpus ) + i = 0; + } while ( i != first ); + + /* No free handles on any VCPU. */ + return -1; +} + static inline void put_maptrack_handle( struct grant_table *t, int handle) @@ -354,10 +398,31 @@ get_maptrack_handle( spin_lock(&lgt->maptrack_lock); + /* + * If we've run out of frames, try stealing an entry from another + * VCPU (in case the guest isn't mapping across its VCPUs evenly). + */ if ( nr_maptrack_frames(lgt) >= max_maptrack_frames ) { + /* + * Can drop the lock since no other VCPU can be adding a new + * frame once they've run out. + */ spin_unlock(&lgt->maptrack_lock); - return -1; + + /* + * Uninitialized free list? Steal an extra entry for the tail + * sentinel. + */ + if ( curr->maptrack_tail == MAPTRACK_TAIL ) + { + handle = steal_maptrack_handle(lgt, curr); + if ( handle == -1 ) + return -1; + curr->maptrack_tail = handle; + write_atomic(&curr->maptrack_head, handle); + } + return steal_maptrack_handle(lgt, curr); } new_mt = alloc_xenheap_page(); @@ -385,7 +450,7 @@ get_maptrack_handle( if ( curr->maptrack_tail == MAPTRACK_TAIL ) curr->maptrack_tail = handle + MAPTRACK_PER_PAGE - 1; - curr->maptrack_head = handle + 1; + write_atomic(&curr->maptrack_head, handle + 1); lgt->maptrack[nr_maptrack_frames(lgt)] = new_mt; lgt->maptrack_limit += MAPTRACK_PER_PAGE; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 20 23:25:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 20 Jun 2015 23:25: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 1Z6S8t-0003l2-J9; Sat, 20 Jun 2015 23:25:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8r-0003kl-SG for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:42 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id B6/08-31650-576F5855; Sat, 20 Jun 2015 23:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1434842739!19073885!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30338 invoked from network); 20 Jun 2015 23:25:40 -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; 20 Jun 2015 23:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6S8o-0005bg-Rd for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6S8o-0003EN-QA for xen-changelog@lists.xensource.com; Sat, 20 Jun 2015 23:25:38 +0000 Date: Sat, 20 Jun 2015 23:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: steal maptrack entries from other VCPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e76ff6c156906b515c2a4300a81c95886ece5d5f Author: David Vrabel AuthorDate: Fri Jun 19 11:02:04 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 19 11:02:04 2015 +0200 gnttab: steal maptrack entries from other VCPUs If a guest is not evenly grant mapping across its VCPUs one of the VCPUs may run out of free maptrack entries even though other VCPUs have many free. If this happens, "steal" free entries from other VCPUs. We want to steal entries such that: a) We avoid ping-ponging stolen entries between VCPUs. b) The number of free entries owned by each VCPUs tends (over time) to the number it uses. So when stealing, we select a VCPU at random (reducing (a)) and we transfer the stolen entries to the thief VCPU (aiming for (b)). Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/grant_table.c | 97 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 81 insertions(+), 16 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 7056b96..db5e5db 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -295,26 +295,70 @@ __get_maptrack_handle( struct grant_table *t, struct vcpu *v) { - unsigned int head, next; + unsigned int head, next, prev_head; - /* No maptrack pages allocated for this VCPU yet? */ - head = v->maptrack_head; - if ( unlikely(head == MAPTRACK_TAIL) ) - return -1; + do { + /* No maptrack pages allocated for this VCPU yet? */ + head = read_atomic(&v->maptrack_head); + if ( unlikely(head == MAPTRACK_TAIL) ) + return -1; - /* - * Always keep one entry in the free list to make it easier to add - * free entries to the tail. - */ - next = read_atomic(&maptrack_entry(t, head).ref); - if ( unlikely(next == MAPTRACK_TAIL) ) - return -1; + /* + * Always keep one entry in the free list to make it easier to + * add free entries to the tail. + */ + next = read_atomic(&maptrack_entry(t, head).ref); + if ( unlikely(next == MAPTRACK_TAIL) ) + return -1; - v->maptrack_head = next; + prev_head = head; + head = cmpxchg(&v->maptrack_head, prev_head, next); + } while ( head != prev_head ); return head; } +/* + * Try to "steal" a free maptrack entry from another VCPU. + * + * A stolen entry is transferred to the thief, so the number of + * entries for each VCPU should tend to the usage pattern. + * + * To avoid having to atomically count the number of free entries on + * each VCPU and to avoid two VCPU repeatedly stealing entries from + * each other, the initial victim VCPU is selected randomly. + */ +static int steal_maptrack_handle(struct grant_table *t, + const struct vcpu *curr) +{ + const struct domain *currd = curr->domain; + unsigned int first, i; + + /* Find an initial victim. */ + first = i = get_random() % currd->max_vcpus; + + do { + if ( currd->vcpu[i] ) + { + int handle; + + handle = __get_maptrack_handle(t, currd->vcpu[i]); + if ( handle != -1 ) + { + maptrack_entry(t, handle).vcpu = curr->vcpu_id; + return handle; + } + } + + i++; + if ( i == currd->max_vcpus ) + i = 0; + } while ( i != first ); + + /* No free handles on any VCPU. */ + return -1; +} + static inline void put_maptrack_handle( struct grant_table *t, int handle) @@ -354,10 +398,31 @@ get_maptrack_handle( spin_lock(&lgt->maptrack_lock); + /* + * If we've run out of frames, try stealing an entry from another + * VCPU (in case the guest isn't mapping across its VCPUs evenly). + */ if ( nr_maptrack_frames(lgt) >= max_maptrack_frames ) { + /* + * Can drop the lock since no other VCPU can be adding a new + * frame once they've run out. + */ spin_unlock(&lgt->maptrack_lock); - return -1; + + /* + * Uninitialized free list? Steal an extra entry for the tail + * sentinel. + */ + if ( curr->maptrack_tail == MAPTRACK_TAIL ) + { + handle = steal_maptrack_handle(lgt, curr); + if ( handle == -1 ) + return -1; + curr->maptrack_tail = handle; + write_atomic(&curr->maptrack_head, handle); + } + return steal_maptrack_handle(lgt, curr); } new_mt = alloc_xenheap_page(); @@ -385,7 +450,7 @@ get_maptrack_handle( if ( curr->maptrack_tail == MAPTRACK_TAIL ) curr->maptrack_tail = handle + MAPTRACK_PER_PAGE - 1; - curr->maptrack_head = handle + 1; + write_atomic(&curr->maptrack_head, handle + 1); lgt->maptrack[nr_maptrack_frames(lgt)] = new_mt; lgt->maptrack_limit += MAPTRACK_PER_PAGE; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 21 01:22:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6TxX-0005fR-3y; Sun, 21 Jun 2015 01:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TxV-0005fL-J9 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:05 +0000 Content-Length: 2061 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id A3/BA-30658-DB116855; Sun, 21 Jun 2015 01:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1434849723!25215819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26660 invoked from network); 21 Jun 2015 01:22:04 -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; 21 Jun 2015 01:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TxT-0005M0-8x for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TxT-0008HU-0c for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:03 +0000 Date: Sun, 21 Jun 2015 01:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/pvh: disable posted interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0831681910318160976==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0831681910318160976== Content-Length: 1647 Content-Transfer-Encoding: quoted-printable commit fbd26f2e9ef2e1393c4e69bc9df1171409803c6e Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 08:47:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:47:40 2015 +0200 x86/pvh: disable posted interrupts Enabling posted interrupts requires the virtual interrupt delivery feature, which is disabled for PVH guests, so make sure posted interrupts are also disabled or else vmlaunch will fail. Signed-off-by: Roger Pau Monn=C3=A9 Reported-and-Tested-by: Lars Eggert Acked-by: Kevin Tian master commit: cf6b3ccf28faee01a078311fcfe671148c81ea75 master date: 2015-05-28 10:56:08 +0200 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 9d8033e..39b9479 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -930,6 +930,10 @@ static int construct_vmcs(struct vcpu *v) | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); v->arch.hvm_vmx.exec_control &=3D ~CPU_BASED_TPR_SHADOW; + /* In turn, disable posted interrupts. */ + __vmwrite(PIN_BASED_VM_EXEC_CONTROL, + vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============0831681910318160976== 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 --===============0831681910318160976==-- From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6TxX-0005fR-3y; Sun, 21 Jun 2015 01:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TxV-0005fL-J9 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:05 +0000 Content-Length: 2061 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id A3/BA-30658-DB116855; Sun, 21 Jun 2015 01:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1434849723!25215819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26660 invoked from network); 21 Jun 2015 01:22:04 -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; 21 Jun 2015 01:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TxT-0005M0-8x for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TxT-0008HU-0c for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:03 +0000 Date: Sun, 21 Jun 2015 01:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/pvh: disable posted interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0831681910318160976==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0831681910318160976== Content-Length: 1647 Content-Transfer-Encoding: quoted-printable commit fbd26f2e9ef2e1393c4e69bc9df1171409803c6e Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 08:47:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:47:40 2015 +0200 x86/pvh: disable posted interrupts Enabling posted interrupts requires the virtual interrupt delivery feature, which is disabled for PVH guests, so make sure posted interrupts are also disabled or else vmlaunch will fail. Signed-off-by: Roger Pau Monn=C3=A9 Reported-and-Tested-by: Lars Eggert Acked-by: Kevin Tian master commit: cf6b3ccf28faee01a078311fcfe671148c81ea75 master date: 2015-05-28 10:56:08 +0200 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 9d8033e..39b9479 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -930,6 +930,10 @@ static int construct_vmcs(struct vcpu *v) | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); v->arch.hvm_vmx.exec_control &=3D ~CPU_BASED_TPR_SHADOW; + /* In turn, disable posted interrupts. */ + __vmwrite(PIN_BASED_VM_EXEC_CONTROL, + vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============0831681910318160976== 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 --===============0831681910318160976==-- From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01: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 1Z6Txi-0005gT-6g; Sun, 21 Jun 2015 01: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 1Z6Txg-0005gH-8f for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:16 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 7F/59-23832-7C116855; Sun, 21 Jun 2015 01:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1434849733!18140790!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23136 invoked from network); 21 Jun 2015 01:22:14 -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; 21 Jun 2015 01:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txd-0005M8-EA for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Txd-0008Hs-CI for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:13 +0000 Date: Sun, 21 Jun 2015 01:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't crash when mapping a page using EFI runtime 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 6fb34833db68fabca3002e221f0157db2a55c610 Author: Ross Lagerwall AuthorDate: Thu Jun 18 08:48:13 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:48:13 2015 +0200 x86: don't crash when mapping a page using EFI runtime page tables When an interrupt is received during an EFI runtime service call, Xen may call map_domain_page() while using the EFI runtime page tables. This fails because, although the EFI runtime page tables are a copy of the idle domain's page tables, current points at a different domain's vCPU. To fix this, return NULL from mapcache_current_vcpu() when using the EFI runtime page tables which is treated equivalently to running in an idle vCPU. This issue can be reproduced by repeatedly calling GetVariable() from dom0 while using VT-d, since VT-d frequently maps a page from interrupt context. Example call trace: [] __find_next_zero_bit+0x28/0x60 [] map_domain_page+0x4c6/0x4eb [] map_vtd_domain_page+0xd/0xf [] msi_msg_read_remap_rte+0xe3/0x1d8 [] iommu_read_msi_from_ire+0x31/0x34 [] set_msi_affinity+0x134/0x17a [] move_masked_irq+0x5c/0x98 [] move_native_irq+0x25/0x36 [] ack_nonmaskable_msi_irq+0x19/0x20 [] ack_maskable_msi_irq+0x9/0x37 [] do_IRQ+0x251/0x635 [] common_interrupt+0x62/0x70 [<00000000df7ed2be>] 00000000df7ed2be Signed-off-by: Ross Lagerwall master commit: 591e1e357c29589e9d6121d8faadc4f4d3b9013e master date: 2015-06-01 11:59:14 +0200 --- xen/arch/x86/domain_page.c | 13 +++++++++---- xen/arch/x86/efi/stub.c | 2 +- xen/common/efi/runtime.c | 10 ++++++++-- xen/include/xen/efi.h | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 158a164..9bdab61 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -32,20 +32,25 @@ static inline struct vcpu *mapcache_current_vcpu(void) return NULL; /* + * When using efi runtime page tables, we have the equivalent of the idle + * domain's page tables but current may point at another domain's VCPU. + * Return NULL as though current is not properly set up yet. + */ + if ( efi_enabled && efi_rs_using_pgtables() ) + return NULL; + + /* * If guest_table is NULL, and we are running a paravirtualised guest, * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { - unsigned long cr3; - /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || - (efi_enabled && cr3 == efi_rs_page_table())); + ASSERT(read_cr3() == __pa(idle_pg_table)); } return v; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 627009f..07c2bd0 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -12,7 +12,7 @@ void __init efi_init_memory(void) { } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { BUG(); return 0; diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index f5df51e..088f0cb 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -30,6 +30,7 @@ const CHAR16 *__read_mostly efi_fw_vendor; const EFI_RUNTIME_SERVICES *__read_mostly efi_rs; #ifndef CONFIG_ARM /* TODO - disabled until implemented on ARM */ static DEFINE_SPINLOCK(efi_rs_lock); +static unsigned int efi_rs_on_cpu = NR_CPUS; #endif UINTN __read_mostly efi_memmap_size; @@ -65,6 +66,8 @@ unsigned long efi_rs_enter(void) spin_lock(&efi_rs_lock); + efi_rs_on_cpu = smp_processor_id(); + /* prevent fixup_page_fault() from doing anything */ irq_enter(); @@ -99,13 +102,16 @@ void efi_rs_leave(unsigned long cr3) asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } irq_exit(); + efi_rs_on_cpu = NR_CPUS; spin_unlock(&efi_rs_lock); stts(); } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { - return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; + return efi_l4_pgtable && + (smp_processor_id() == efi_rs_on_cpu) && + (read_cr3() == virt_to_maddr(efi_l4_pgtable)); } unsigned long efi_get_time(void) diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 5e02724..f2782ce 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,7 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); -paddr_t efi_rs_page_table(void); +bool_t efi_rs_using_pgtables(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01: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 1Z6Txi-0005gT-6g; Sun, 21 Jun 2015 01: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 1Z6Txg-0005gH-8f for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:16 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 7F/59-23832-7C116855; Sun, 21 Jun 2015 01:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1434849733!18140790!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23136 invoked from network); 21 Jun 2015 01:22:14 -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; 21 Jun 2015 01:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txd-0005M8-EA for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Txd-0008Hs-CI for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:13 +0000 Date: Sun, 21 Jun 2015 01:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't crash when mapping a page using EFI runtime 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 6fb34833db68fabca3002e221f0157db2a55c610 Author: Ross Lagerwall AuthorDate: Thu Jun 18 08:48:13 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:48:13 2015 +0200 x86: don't crash when mapping a page using EFI runtime page tables When an interrupt is received during an EFI runtime service call, Xen may call map_domain_page() while using the EFI runtime page tables. This fails because, although the EFI runtime page tables are a copy of the idle domain's page tables, current points at a different domain's vCPU. To fix this, return NULL from mapcache_current_vcpu() when using the EFI runtime page tables which is treated equivalently to running in an idle vCPU. This issue can be reproduced by repeatedly calling GetVariable() from dom0 while using VT-d, since VT-d frequently maps a page from interrupt context. Example call trace: [] __find_next_zero_bit+0x28/0x60 [] map_domain_page+0x4c6/0x4eb [] map_vtd_domain_page+0xd/0xf [] msi_msg_read_remap_rte+0xe3/0x1d8 [] iommu_read_msi_from_ire+0x31/0x34 [] set_msi_affinity+0x134/0x17a [] move_masked_irq+0x5c/0x98 [] move_native_irq+0x25/0x36 [] ack_nonmaskable_msi_irq+0x19/0x20 [] ack_maskable_msi_irq+0x9/0x37 [] do_IRQ+0x251/0x635 [] common_interrupt+0x62/0x70 [<00000000df7ed2be>] 00000000df7ed2be Signed-off-by: Ross Lagerwall master commit: 591e1e357c29589e9d6121d8faadc4f4d3b9013e master date: 2015-06-01 11:59:14 +0200 --- xen/arch/x86/domain_page.c | 13 +++++++++---- xen/arch/x86/efi/stub.c | 2 +- xen/common/efi/runtime.c | 10 ++++++++-- xen/include/xen/efi.h | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 158a164..9bdab61 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -32,20 +32,25 @@ static inline struct vcpu *mapcache_current_vcpu(void) return NULL; /* + * When using efi runtime page tables, we have the equivalent of the idle + * domain's page tables but current may point at another domain's VCPU. + * Return NULL as though current is not properly set up yet. + */ + if ( efi_enabled && efi_rs_using_pgtables() ) + return NULL; + + /* * If guest_table is NULL, and we are running a paravirtualised guest, * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { - unsigned long cr3; - /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || - (efi_enabled && cr3 == efi_rs_page_table())); + ASSERT(read_cr3() == __pa(idle_pg_table)); } return v; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 627009f..07c2bd0 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -12,7 +12,7 @@ void __init efi_init_memory(void) { } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { BUG(); return 0; diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index f5df51e..088f0cb 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -30,6 +30,7 @@ const CHAR16 *__read_mostly efi_fw_vendor; const EFI_RUNTIME_SERVICES *__read_mostly efi_rs; #ifndef CONFIG_ARM /* TODO - disabled until implemented on ARM */ static DEFINE_SPINLOCK(efi_rs_lock); +static unsigned int efi_rs_on_cpu = NR_CPUS; #endif UINTN __read_mostly efi_memmap_size; @@ -65,6 +66,8 @@ unsigned long efi_rs_enter(void) spin_lock(&efi_rs_lock); + efi_rs_on_cpu = smp_processor_id(); + /* prevent fixup_page_fault() from doing anything */ irq_enter(); @@ -99,13 +102,16 @@ void efi_rs_leave(unsigned long cr3) asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } irq_exit(); + efi_rs_on_cpu = NR_CPUS; spin_unlock(&efi_rs_lock); stts(); } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { - return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; + return efi_l4_pgtable && + (smp_processor_id() == efi_rs_on_cpu) && + (read_cr3() == virt_to_maddr(efi_l4_pgtable)); } unsigned long efi_get_time(void) diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 5e02724..f2782ce 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,7 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); -paddr_t efi_rs_page_table(void); +bool_t efi_rs_using_pgtables(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6Txr-0005hZ-93; Sun, 21 Jun 2015 01:22:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txq-0005hK-4Q for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:26 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 25/85-01469-1D116855; Sun, 21 Jun 2015 01:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434849743!25193275!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25272 invoked from network); 21 Jun 2015 01:22:24 -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; 21 Jun 2015 01:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txn-0005MG-NE for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Txn-0008IM-Hw for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:23 +0000 Date: Sun, 21 Jun 2015 01:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] efi: fix allocation problems if ExitBootServices() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0dca512a13d4038aa2b369012ed7b053991a055 Author: Ross Lagerwall AuthorDate: Thu Jun 18 08:48:59 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:48:59 2015 +0200 efi: fix allocation problems if ExitBootServices() fails If calling ExitBootServices() fails, the required memory map size may have increased. When initially allocating the memory map, allocate a slightly larger buffer (by an arbitrary 8 entries) to fix this. The ARM code path was already allocating a larger buffer than required, so this moves the code to be common for all architectures. This was seen on the following machine when using the iscsidxe UEFI driver. The machine would consistently fail the first call to ExitBootServices(). System Information Manufacturer: Supermicro Product Name: X10SLE-F/HF BIOS Information Vendor: American Megatrends Inc. Version: 2.00 Release Date: 04/24/2014 Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich Reviewed-by: Roy Franz Acked-by: Ian Campbell EFI: map allocation size must be set to zero Commit 8a753b3f1c ("efi: fix allocation problems if ExitBootServices() fails") replaced the use of a static (and hence zero-initialized) variable by an automatic (and hence uninitialized) one. Also drop the variable introduced by that commit in favor of re-using another available and suitable one. Signed-off-by: Jan Beulich Acked-by: Ross Lagerwall Acked-by: Ian Campbell master commit: 8a753b3f1cf5e4714974196df9517849bf174324 master date: 2015-06-02 13:44:24 +0200 master commit: 4c94684bb7c20ff01d03fb1f22c03cc0c2fc417b master date: 2015-06-11 14:47:54 +0200 --- xen/arch/arm/efi/efi-boot.h | 6 ++---- xen/arch/x86/efi/efi-boot.h | 4 ++-- xen/common/efi/boot.c | 7 +++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 639942d..0bde0a1 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -370,16 +370,14 @@ static void __init efi_arch_cfg_file_late(EFI_FILE_HANDLE dir_handle, char *sect { } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { void *ptr; EFI_STATUS status; - UINTN map_size_alloc = *map_size + EFI_PAGE_SIZE; - status = efi_bs->AllocatePool(EfiLoaderData, map_size_alloc, &ptr); + status = efi_bs->AllocatePool(EfiLoaderData, map_size, &ptr); if ( status != EFI_SUCCESS ) return NULL; - *map_size = map_size_alloc; return ptr; } diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 3a3b4fe..cd14c19 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -190,10 +190,10 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { place_string(&mbi.mem_upper, NULL); - mbi.mem_upper -= *map_size; + mbi.mem_upper -= map_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) return NULL; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index ac6881e..9f3e075 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1046,14 +1046,17 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_video_init(gop, info_size, mode_info); } - efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key, + info_size = 0; + efi_bs->GetMemoryMap(&info_size, NULL, &map_key, &efi_mdesc_size, &mdesc_ver); - efi_memmap = efi_arch_allocate_mmap_buffer(&efi_memmap_size); + info_size += 8 * efi_mdesc_size; + efi_memmap = efi_arch_allocate_mmap_buffer(info_size); if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); for ( retry = 0; ; retry = 1 ) { + efi_memmap_size = info_size; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(status) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6Txr-0005hZ-93; Sun, 21 Jun 2015 01:22:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txq-0005hK-4Q for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:26 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 25/85-01469-1D116855; Sun, 21 Jun 2015 01:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1434849743!25193275!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25272 invoked from network); 21 Jun 2015 01:22:24 -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; 21 Jun 2015 01:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txn-0005MG-NE for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Txn-0008IM-Hw for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:23 +0000 Date: Sun, 21 Jun 2015 01:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] efi: fix allocation problems if ExitBootServices() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0dca512a13d4038aa2b369012ed7b053991a055 Author: Ross Lagerwall AuthorDate: Thu Jun 18 08:48:59 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:48:59 2015 +0200 efi: fix allocation problems if ExitBootServices() fails If calling ExitBootServices() fails, the required memory map size may have increased. When initially allocating the memory map, allocate a slightly larger buffer (by an arbitrary 8 entries) to fix this. The ARM code path was already allocating a larger buffer than required, so this moves the code to be common for all architectures. This was seen on the following machine when using the iscsidxe UEFI driver. The machine would consistently fail the first call to ExitBootServices(). System Information Manufacturer: Supermicro Product Name: X10SLE-F/HF BIOS Information Vendor: American Megatrends Inc. Version: 2.00 Release Date: 04/24/2014 Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich Reviewed-by: Roy Franz Acked-by: Ian Campbell EFI: map allocation size must be set to zero Commit 8a753b3f1c ("efi: fix allocation problems if ExitBootServices() fails") replaced the use of a static (and hence zero-initialized) variable by an automatic (and hence uninitialized) one. Also drop the variable introduced by that commit in favor of re-using another available and suitable one. Signed-off-by: Jan Beulich Acked-by: Ross Lagerwall Acked-by: Ian Campbell master commit: 8a753b3f1cf5e4714974196df9517849bf174324 master date: 2015-06-02 13:44:24 +0200 master commit: 4c94684bb7c20ff01d03fb1f22c03cc0c2fc417b master date: 2015-06-11 14:47:54 +0200 --- xen/arch/arm/efi/efi-boot.h | 6 ++---- xen/arch/x86/efi/efi-boot.h | 4 ++-- xen/common/efi/boot.c | 7 +++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 639942d..0bde0a1 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -370,16 +370,14 @@ static void __init efi_arch_cfg_file_late(EFI_FILE_HANDLE dir_handle, char *sect { } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { void *ptr; EFI_STATUS status; - UINTN map_size_alloc = *map_size + EFI_PAGE_SIZE; - status = efi_bs->AllocatePool(EfiLoaderData, map_size_alloc, &ptr); + status = efi_bs->AllocatePool(EfiLoaderData, map_size, &ptr); if ( status != EFI_SUCCESS ) return NULL; - *map_size = map_size_alloc; return ptr; } diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 3a3b4fe..cd14c19 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -190,10 +190,10 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, } -static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size) +static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { place_string(&mbi.mem_upper, NULL); - mbi.mem_upper -= *map_size; + mbi.mem_upper -= map_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) return NULL; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index ac6881e..9f3e075 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1046,14 +1046,17 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_video_init(gop, info_size, mode_info); } - efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key, + info_size = 0; + efi_bs->GetMemoryMap(&info_size, NULL, &map_key, &efi_mdesc_size, &mdesc_ver); - efi_memmap = efi_arch_allocate_mmap_buffer(&efi_memmap_size); + info_size += 8 * efi_mdesc_size; + efi_memmap = efi_arch_allocate_mmap_buffer(info_size); if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); for ( retry = 0; ; retry = 1 ) { + efi_memmap_size = info_size; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(status) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01: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 1Z6Ty4-0005jK-Bi; Sun, 21 Jun 2015 01:22:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Ty3-0005jA-6H for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:39 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 45/76-21074-ED116855; Sun, 21 Jun 2015 01:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1434849754!10410394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31650 invoked from network); 21 Jun 2015 01:22:34 -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; 21 Jun 2015 01:22:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txx-0005MQ-S7 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Txx-0008Iq-Qk for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:33 +0000 Date: Sun, 21 Jun 2015 01:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/apic: Disable the LAPIC later in smp_send_stop() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8791a307be2f312b9c41eab1e68c7e79e266b922 Author: Andrew Cooper AuthorDate: Thu Jun 18 08:51:00 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:51:00 2015 +0200 x86/apic: Disable the LAPIC later in smp_send_stop() __stop_this_cpu() may reset the LAPIC mode back from x2apic to xapic, but will leave x2apic_enabled alone. This may cause disconnect_bsp_APIC() in disable_IO_APIC() to suffer a #GP fault. Disabling the LAPIC can safely be deferred to being the last action. Signed-off-by: Andrew Cooper master commit: d639bdd9bbed8d003ad9be0b13535aca636b9d18 master date: 2015-06-03 09:25:43 +0200 --- xen/arch/x86/smp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 06a833e..8caa0bc 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -311,9 +311,9 @@ void smp_send_stop(void) mdelay(1); local_irq_disable(); - __stop_this_cpu(); disable_IO_APIC(); hpet_disable(); + __stop_this_cpu(); local_irq_enable(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01: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 1Z6Ty4-0005jK-Bi; Sun, 21 Jun 2015 01:22:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Ty3-0005jA-6H for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:39 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 45/76-21074-ED116855; Sun, 21 Jun 2015 01:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1434849754!10410394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31650 invoked from network); 21 Jun 2015 01:22:34 -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; 21 Jun 2015 01:22:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Txx-0005MQ-S7 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Txx-0008Iq-Qk for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:33 +0000 Date: Sun, 21 Jun 2015 01:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/apic: Disable the LAPIC later in smp_send_stop() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8791a307be2f312b9c41eab1e68c7e79e266b922 Author: Andrew Cooper AuthorDate: Thu Jun 18 08:51:00 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:51:00 2015 +0200 x86/apic: Disable the LAPIC later in smp_send_stop() __stop_this_cpu() may reset the LAPIC mode back from x2apic to xapic, but will leave x2apic_enabled alone. This may cause disconnect_bsp_APIC() in disable_IO_APIC() to suffer a #GP fault. Disabling the LAPIC can safely be deferred to being the last action. Signed-off-by: Andrew Cooper master commit: d639bdd9bbed8d003ad9be0b13535aca636b9d18 master date: 2015-06-03 09:25:43 +0200 --- xen/arch/x86/smp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 06a833e..8caa0bc 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -311,9 +311,9 @@ void smp_send_stop(void) mdelay(1); local_irq_disable(); - __stop_this_cpu(); disable_IO_APIC(); hpet_disable(); + __stop_this_cpu(); local_irq_enable(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6TyB-0005kf-E2; Sun, 21 Jun 2015 01:22:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyA-0005kR-Ee for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:46 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 46/79-23832-5E116855; Sun, 21 Jun 2015 01:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1434849764!18074872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6218 invoked from network); 21 Jun 2015 01:22:45 -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; 21 Jun 2015 01:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Ty8-0005MY-0X for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Ty7-0008JC-VY for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:43 +0000 Date: Sun, 21 Jun 2015 01:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/crash: don't use set_fixmap() in the crash path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 131889ce69538617d6973955bcb185f5b70f4977 Author: Andrew Cooper AuthorDate: Thu Jun 18 08:51:31 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:51:31 2015 +0200 x86/crash: don't use set_fixmap() in the crash path Experimentally, this can result in memory allocation, and in particular a failed assertion that interrupts are enabled when performing a TLB flush. (XEN) Assertion 'local_irq_is_enabled()' failed at smp.c:223 (XEN) [] flush_area_mask+0x7/0x134 (XEN) [] alloc_domheap_pages+0xa9/0x12a (XEN) [] alloc_xenheap_pages+0x64/0xdb (XEN) [] alloc_xen_pagetable+0x1c/0xa0 (XEN) [] virt_to_xen_l1e+0x38/0x1be (XEN) [] map_pages_to_xen+0x80e/0xfd9 (XEN) [] __set_fixmap+0x2c/0x2e (XEN) [] machine_crash_shutdown+0x186/0x2b2 (XEN) [] kexec_crash+0x3f/0x5b (XEN) [] panic+0x100/0x118 (XEN) [] set_guest_machinecheck_trapbounce+0/0x6d (XEN) [] do_page_fault+0x40b/0x541 (XEN) [] handle_exception_saved+0x2e/0x6c Instead, use the directmap mapping which are writable and involve far less complexity than set_fixmap() Signed-off-by: Andrew Cooper master commit: 8228055568ef195df5e0c205972a4a4c278e186b master date: 2015-06-03 09:26:13 +0200 --- xen/arch/x86/crash.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index eb7be9c..888a214 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -140,13 +140,10 @@ static void nmi_shootdown_cpus(void) * Ideally would be: * exception_table[TRAP_nmi] = &do_nmi_crash; * - * but the exception_table is read only. Borrow an unused fixmap entry - * to construct a writable mapping. + * but the exception_table is read only. Access it via its directmap + * mappings. */ - set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); - write_atomic((unsigned long *) - (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + - ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + write_atomic((unsigned long *)__va(__pa(&exception_table[TRAP_nmi])), (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6TyB-0005kf-E2; Sun, 21 Jun 2015 01:22:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyA-0005kR-Ee for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:46 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 46/79-23832-5E116855; Sun, 21 Jun 2015 01:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1434849764!18074872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6218 invoked from network); 21 Jun 2015 01:22:45 -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; 21 Jun 2015 01:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Ty8-0005MY-0X for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Ty7-0008JC-VY for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:43 +0000 Date: Sun, 21 Jun 2015 01:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/crash: don't use set_fixmap() in the crash path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 131889ce69538617d6973955bcb185f5b70f4977 Author: Andrew Cooper AuthorDate: Thu Jun 18 08:51:31 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:51:31 2015 +0200 x86/crash: don't use set_fixmap() in the crash path Experimentally, this can result in memory allocation, and in particular a failed assertion that interrupts are enabled when performing a TLB flush. (XEN) Assertion 'local_irq_is_enabled()' failed at smp.c:223 (XEN) [] flush_area_mask+0x7/0x134 (XEN) [] alloc_domheap_pages+0xa9/0x12a (XEN) [] alloc_xenheap_pages+0x64/0xdb (XEN) [] alloc_xen_pagetable+0x1c/0xa0 (XEN) [] virt_to_xen_l1e+0x38/0x1be (XEN) [] map_pages_to_xen+0x80e/0xfd9 (XEN) [] __set_fixmap+0x2c/0x2e (XEN) [] machine_crash_shutdown+0x186/0x2b2 (XEN) [] kexec_crash+0x3f/0x5b (XEN) [] panic+0x100/0x118 (XEN) [] set_guest_machinecheck_trapbounce+0/0x6d (XEN) [] do_page_fault+0x40b/0x541 (XEN) [] handle_exception_saved+0x2e/0x6c Instead, use the directmap mapping which are writable and involve far less complexity than set_fixmap() Signed-off-by: Andrew Cooper master commit: 8228055568ef195df5e0c205972a4a4c278e186b master date: 2015-06-03 09:26:13 +0200 --- xen/arch/x86/crash.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index eb7be9c..888a214 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -140,13 +140,10 @@ static void nmi_shootdown_cpus(void) * Ideally would be: * exception_table[TRAP_nmi] = &do_nmi_crash; * - * but the exception_table is read only. Borrow an unused fixmap entry - * to construct a writable mapping. + * but the exception_table is read only. Access it via its directmap + * mappings. */ - set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); - write_atomic((unsigned long *) - (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + - ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + write_atomic((unsigned long *)__va(__pa(&exception_table[TRAP_nmi])), (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6TyL-0005mQ-If; Sun, 21 Jun 2015 01:22:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyK-0005mF-I5 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:56 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 65/19-10593-FE116855; Sun, 21 Jun 2015 01:22:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1434849774!18074890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6841 invoked from network); 21 Jun 2015 01:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Jun 2015 01:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyI-0005Mj-5M for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TyI-0008KA-46 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:54 +0000 Date: Sun, 21 Jun 2015 01:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/VPMU: add lost Intel processor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24fcf173792b600a19cb703dd8fc61595b10f775 Author: Alan Robinson AuthorDate: Thu Jun 18 08:52:43 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:52:43 2015 +0200 x86/VPMU: add lost Intel processor commit 6d112f2b50 ("x86/vPMU: change Intel model numbers from decimal to hex") translated 47 to 0x27, now corrected to 0x2f. Signed-off-by: Alan Robinson Signed-off-by: Dietmar Hahn Reviewed-by: Jan Beulich master commit: 0fcc6f3c2f7bc57d8ea7f263274296929f5162ef master date: 2015-06-08 14:17:06 +0200 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 590c2a9..dc1836e 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -913,7 +913,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* Westmere: */ case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x27: /* 32 nm Westmere-EX */ + case 0x2f: /* 32 nm Westmere-EX */ case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:22:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:22: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 1Z6TyL-0005mQ-If; Sun, 21 Jun 2015 01:22:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyK-0005mF-I5 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:56 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 65/19-10593-FE116855; Sun, 21 Jun 2015 01:22:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1434849774!18074890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6841 invoked from network); 21 Jun 2015 01:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Jun 2015 01:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyI-0005Mj-5M for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TyI-0008KA-46 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:22:54 +0000 Date: Sun, 21 Jun 2015 01:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/VPMU: add lost Intel processor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24fcf173792b600a19cb703dd8fc61595b10f775 Author: Alan Robinson AuthorDate: Thu Jun 18 08:52:43 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:52:43 2015 +0200 x86/VPMU: add lost Intel processor commit 6d112f2b50 ("x86/vPMU: change Intel model numbers from decimal to hex") translated 47 to 0x27, now corrected to 0x2f. Signed-off-by: Alan Robinson Signed-off-by: Dietmar Hahn Reviewed-by: Jan Beulich master commit: 0fcc6f3c2f7bc57d8ea7f263274296929f5162ef master date: 2015-06-08 14:17:06 +0200 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 590c2a9..dc1836e 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -913,7 +913,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* Westmere: */ case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x27: /* 32 nm Westmere-EX */ + case 0x2f: /* 32 nm Westmere-EX */ case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tyb-0005oM-LX; Sun, 21 Jun 2015 01:23:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tya-0005oC-TQ for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:13 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id DF/F2-19215-00216855; Sun, 21 Jun 2015 01:23:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1434849789!12825396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6651 invoked from network); 21 Jun 2015 01:23: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; 21 Jun 2015 01:23:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyX-0005NJ-BO for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TyS-0008Kj-9D for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:04 +0000 Date: Sun, 21 Jun 2015 01:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] efi: avoid calling boot services after ExitBootServices() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6971bb6b222e9fa1d3faf7ce98d4dd9b4a224feb Author: Ross Lagerwall AuthorDate: Thu Jun 18 08:54:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:54:08 2015 +0200 efi: avoid calling boot services after ExitBootServices() After the first call to ExitBootServices(), avoid calling any boot services (except GetMemoryMap() and ExitBootServices()) by setting setting efi_bs to NULL and halting in blexit(). Only GetMemoryMap() and ExitBootServices() are explicitly allowed to be called after the first call to ExitBootServices() and so are are called via SystemTable->BootServices. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: d4300db3a03a0cd999745135d7879fc4b6b5aa61 master date: 2015-06-10 12:00:10 +0200 --- xen/arch/arm/efi/efi-boot.h | 6 ++++++ xen/arch/x86/efi/efi-boot.h | 7 +++++++ xen/common/efi/boot.c | 13 ++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 0bde0a1..cf9c3c6 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -6,6 +6,7 @@ #include #include #include +#include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); @@ -522,6 +523,11 @@ static void __init efi_arch_blexit(void) efi_bs->FreePool(memmap); } +static void __init efi_arch_halt(void) +{ + stop_cpu(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { if ( (unsigned long)loaded_image->ImageBase & ((1 << 12) - 1) ) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index cd14c19..9f41793 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -614,6 +614,13 @@ static void __init efi_arch_blexit(void) efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size)); } +static void __init efi_arch_halt(void) +{ + local_irq_disable(); + for ( ; ; ) + halt(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { xen_phys_start = (UINTN)loaded_image->ImageBase; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 9f3e075..3b87f7e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -214,6 +214,9 @@ static void __init noreturn blexit(const CHAR16 *str) PrintStr((CHAR16 *)str); PrintStr(newline); + if ( !efi_bs ) + efi_arch_halt(); + if ( cfg.addr ) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); if ( kernel.addr ) @@ -1057,8 +1060,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for ( retry = 0; ; retry = 1 ) { efi_memmap_size = info_size; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); + status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, + efi_memmap, &map_key, + &efi_mdesc_size, + &mdesc_ver); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot obtain memory map", status); @@ -1067,7 +1072,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_pre_exit_boot(); - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = SystemTable->BootServices->ExitBootServices(ImageHandle, + map_key); + efi_bs = NULL; if ( status != EFI_INVALID_PARAMETER || retry ) break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tyb-0005oM-LX; Sun, 21 Jun 2015 01:23:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tya-0005oC-TQ for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:13 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id DF/F2-19215-00216855; Sun, 21 Jun 2015 01:23:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1434849789!12825396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6651 invoked from network); 21 Jun 2015 01:23: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; 21 Jun 2015 01:23:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TyX-0005NJ-BO for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TyS-0008Kj-9D for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:04 +0000 Date: Sun, 21 Jun 2015 01:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] efi: avoid calling boot services after ExitBootServices() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6971bb6b222e9fa1d3faf7ce98d4dd9b4a224feb Author: Ross Lagerwall AuthorDate: Thu Jun 18 08:54:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:54:08 2015 +0200 efi: avoid calling boot services after ExitBootServices() After the first call to ExitBootServices(), avoid calling any boot services (except GetMemoryMap() and ExitBootServices()) by setting setting efi_bs to NULL and halting in blexit(). Only GetMemoryMap() and ExitBootServices() are explicitly allowed to be called after the first call to ExitBootServices() and so are are called via SystemTable->BootServices. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: d4300db3a03a0cd999745135d7879fc4b6b5aa61 master date: 2015-06-10 12:00:10 +0200 --- xen/arch/arm/efi/efi-boot.h | 6 ++++++ xen/arch/x86/efi/efi-boot.h | 7 +++++++ xen/common/efi/boot.c | 13 ++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 0bde0a1..cf9c3c6 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -6,6 +6,7 @@ #include #include #include +#include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); @@ -522,6 +523,11 @@ static void __init efi_arch_blexit(void) efi_bs->FreePool(memmap); } +static void __init efi_arch_halt(void) +{ + stop_cpu(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { if ( (unsigned long)loaded_image->ImageBase & ((1 << 12) - 1) ) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index cd14c19..9f41793 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -614,6 +614,13 @@ static void __init efi_arch_blexit(void) efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size)); } +static void __init efi_arch_halt(void) +{ + local_irq_disable(); + for ( ; ; ) + halt(); +} + static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) { xen_phys_start = (UINTN)loaded_image->ImageBase; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 9f3e075..3b87f7e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -214,6 +214,9 @@ static void __init noreturn blexit(const CHAR16 *str) PrintStr((CHAR16 *)str); PrintStr(newline); + if ( !efi_bs ) + efi_arch_halt(); + if ( cfg.addr ) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); if ( kernel.addr ) @@ -1057,8 +1060,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for ( retry = 0; ; retry = 1 ) { efi_memmap_size = info_size; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); + status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, + efi_memmap, &map_key, + &efi_mdesc_size, + &mdesc_ver); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot obtain memory map", status); @@ -1067,7 +1072,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_pre_exit_boot(); - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = SystemTable->BootServices->ExitBootServices(ImageHandle, + map_key); + efi_bs = NULL; if ( status != EFI_INVALID_PARAMETER || retry ) break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tyk-0005pa-Nw; Sun, 21 Jun 2015 01:23:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyk-0005pR-0T for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:22 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 34/C8-16518-90216855; Sun, 21 Jun 2015 01:23:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1434849799!18220805!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22397 invoked from network); 21 Jun 2015 01:23:20 -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; 21 Jun 2015 01:23:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyh-0005NR-HB for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Tyh-0008LA-FV for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:19 +0000 Date: Sun, 21 Jun 2015 01:23:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/EFI: fix EFI_MEMORY_WP handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37bca10a9226959aba160ffb1843042d0c05904e Author: Jan Beulich AuthorDate: Thu Jun 18 08:54:57 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:54:57 2015 +0200 x86/EFI: fix EFI_MEMORY_WP handling Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Backport: Also fix EFI_MEMORY_XP handling (along the lines of what master commit abcf15fa8f ["x86: switch default mapping attributes to non-executable"] does): We must not set the NX bit when the CPU doesn't support it, as the bit being set may trigger Reserved Bit faults in that case. Signed-off-by: Jan Beulich master commit: af23e79f46583abc18e8cffdec0b69297cfbdff0 master date: 2015-06-10 12:01:35 +0200 --- xen/common/efi/boot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3b87f7e..d64a647 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1196,8 +1196,8 @@ void __init efi_init_memory(void) } if ( desc->Attribute & EFI_MEMORY_WP ) - prot &= _PAGE_RW; - if ( desc->Attribute & EFI_MEMORY_XP ) + prot &= ~_PAGE_RW; + if ( (desc->Attribute & EFI_MEMORY_XP) && cpu_has_nx ) prot |= _PAGE_NX_BIT; if ( pfn_to_pdx(emfn - 1) < (DIRECTMAP_SIZE >> PAGE_SHIFT) && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tyk-0005pa-Nw; Sun, 21 Jun 2015 01:23:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyk-0005pR-0T for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:22 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 34/C8-16518-90216855; Sun, 21 Jun 2015 01:23:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1434849799!18220805!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22397 invoked from network); 21 Jun 2015 01:23:20 -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; 21 Jun 2015 01:23:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyh-0005NR-HB for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Tyh-0008LA-FV for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:19 +0000 Date: Sun, 21 Jun 2015 01:23:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/EFI: fix EFI_MEMORY_WP handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37bca10a9226959aba160ffb1843042d0c05904e Author: Jan Beulich AuthorDate: Thu Jun 18 08:54:57 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:54:57 2015 +0200 x86/EFI: fix EFI_MEMORY_WP handling Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Backport: Also fix EFI_MEMORY_XP handling (along the lines of what master commit abcf15fa8f ["x86: switch default mapping attributes to non-executable"] does): We must not set the NX bit when the CPU doesn't support it, as the bit being set may trigger Reserved Bit faults in that case. Signed-off-by: Jan Beulich master commit: af23e79f46583abc18e8cffdec0b69297cfbdff0 master date: 2015-06-10 12:01:35 +0200 --- xen/common/efi/boot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3b87f7e..d64a647 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1196,8 +1196,8 @@ void __init efi_init_memory(void) } if ( desc->Attribute & EFI_MEMORY_WP ) - prot &= _PAGE_RW; - if ( desc->Attribute & EFI_MEMORY_XP ) + prot &= ~_PAGE_RW; + if ( (desc->Attribute & EFI_MEMORY_XP) && cpu_has_nx ) prot |= _PAGE_NX_BIT; if ( pfn_to_pdx(emfn - 1) < (DIRECTMAP_SIZE >> PAGE_SHIFT) && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tyw-0005r3-QZ; Sun, 21 Jun 2015 01:23:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyv-0005qq-6F for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:33 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 7B/EC-23096-41216855; Sun, 21 Jun 2015 01:23:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1434849809!10294915!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11553 invoked from network); 21 Jun 2015 01:23:30 -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; 21 Jun 2015 01:23:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyr-0005Nb-Mb for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Tyr-0008LW-Kx for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:29 +0000 Date: Sun, 21 Jun 2015 01:23:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI/early: add /mapbs to map EfiBootServices{Code, Data} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbf41e0514389b65f545e1b1cbb290b0dcec3a45 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 08:55:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:55:26 2015 +0200 EFI/early: add /mapbs to map EfiBootServices{Code,Data} From: Konrad Rzeszutek Wilk To help on certain platforms to run. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich master commit: f36886bdf48ca2968379e3a0aa607044537ecf76 master date: 2015-06-10 12:02:43 +0200 --- xen/arch/x86/efi/efi-boot.h | 12 ++++++++---- xen/common/efi/boot.c | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 9f41793..2dd69f6 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -148,12 +148,16 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, switch ( desc->Type ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: case EfiBootServicesCode: case EfiBootServicesData: + if ( map_bs ) + { + default: + type = E820_RESERVED; + break; + } + /* fall through */ + case EfiConventionalMemory: if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index d64a647..a8d8715 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -82,6 +82,7 @@ static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; +static bool_t __initdata map_bs; static struct file __initdata cfg; static struct file __initdata kernel; @@ -754,6 +755,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) base_video = 1; + else if ( wstrcmp(ptr + 1, L"mapbs") == 0 ) + map_bs = 1; else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) cfg_file_name = ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) @@ -763,6 +766,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { PrintStr(L"Xen EFI Loader options:\r\n"); PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-mapbs map EfiBootServices{Code,Data}\r\n"); PrintStr(L"-cfg= specify configuration file\r\n"); PrintStr(L"-help, -? display this help\r\n"); blexit(NULL); @@ -1159,7 +1163,8 @@ void __init efi_init_memory(void) } *extra, *extra_head = NULL; #endif - printk(XENLOG_INFO "EFI memory map:\n"); + printk(XENLOG_INFO "EFI memory map:%s\n", + map_bs ? " (mapping BootServices)" : ""); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; @@ -1172,7 +1177,11 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || + (!(desc->Attribute & EFI_MEMORY_RUNTIME) && + (!map_bs || + (desc->Type != EfiBootServicesCode && + desc->Type != EfiBootServicesData))) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1258,7 +1267,10 @@ void __init efi_init_memory(void) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + if ( ((desc->Attribute & EFI_MEMORY_RUNTIME) || + (map_bs && + (desc->Type == EfiBootServicesCode || + desc->Type == EfiBootServicesData))) && desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && desc->VirtualStart != desc->PhysicalStart ) copy_mapping(PFN_DOWN(desc->PhysicalStart), -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tyw-0005r3-QZ; Sun, 21 Jun 2015 01:23:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyv-0005qq-6F for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:33 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 7B/EC-23096-41216855; Sun, 21 Jun 2015 01:23:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1434849809!10294915!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11553 invoked from network); 21 Jun 2015 01:23:30 -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; 21 Jun 2015 01:23:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tyr-0005Nb-Mb for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Tyr-0008LW-Kx for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:29 +0000 Date: Sun, 21 Jun 2015 01:23:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI/early: add /mapbs to map EfiBootServices{Code, Data} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbf41e0514389b65f545e1b1cbb290b0dcec3a45 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 08:55:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:55:26 2015 +0200 EFI/early: add /mapbs to map EfiBootServices{Code,Data} From: Konrad Rzeszutek Wilk To help on certain platforms to run. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich master commit: f36886bdf48ca2968379e3a0aa607044537ecf76 master date: 2015-06-10 12:02:43 +0200 --- xen/arch/x86/efi/efi-boot.h | 12 ++++++++---- xen/common/efi/boot.c | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 9f41793..2dd69f6 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -148,12 +148,16 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, switch ( desc->Type ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: case EfiBootServicesCode: case EfiBootServicesData: + if ( map_bs ) + { + default: + type = E820_RESERVED; + break; + } + /* fall through */ + case EfiConventionalMemory: if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index d64a647..a8d8715 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -82,6 +82,7 @@ static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; +static bool_t __initdata map_bs; static struct file __initdata cfg; static struct file __initdata kernel; @@ -754,6 +755,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) base_video = 1; + else if ( wstrcmp(ptr + 1, L"mapbs") == 0 ) + map_bs = 1; else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) cfg_file_name = ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) @@ -763,6 +766,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { PrintStr(L"Xen EFI Loader options:\r\n"); PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-mapbs map EfiBootServices{Code,Data}\r\n"); PrintStr(L"-cfg= specify configuration file\r\n"); PrintStr(L"-help, -? display this help\r\n"); blexit(NULL); @@ -1159,7 +1163,8 @@ void __init efi_init_memory(void) } *extra, *extra_head = NULL; #endif - printk(XENLOG_INFO "EFI memory map:\n"); + printk(XENLOG_INFO "EFI memory map:%s\n", + map_bs ? " (mapping BootServices)" : ""); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; @@ -1172,7 +1177,11 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || + (!(desc->Attribute & EFI_MEMORY_RUNTIME) && + (!map_bs || + (desc->Type != EfiBootServicesCode && + desc->Type != EfiBootServicesData))) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1258,7 +1267,10 @@ void __init efi_init_memory(void) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + if ( ((desc->Attribute & EFI_MEMORY_RUNTIME) || + (map_bs && + (desc->Type == EfiBootServicesCode || + desc->Type == EfiBootServicesData))) && desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && desc->VirtualStart != desc->PhysicalStart ) copy_mapping(PFN_DOWN(desc->PhysicalStart), -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tz5-0005sL-T0; Sun, 21 Jun 2015 01:23:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tz4-0005s7-Iq for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:42 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D5/C4-08467-D1216855; Sun, 21 Jun 2015 01:23:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434849820!15699735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5952 invoked from network); 21 Jun 2015 01:23:40 -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; 21 Jun 2015 01:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tz1-0005Nj-R3 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Tz1-0008Lw-Q2 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:39 +0000 Date: Sun, 21 Jun 2015 01:23:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI: support default attributes to map Runtime service areas with none given X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e254b1900eb2dbf700fac9d52055705fbb497fca Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 08:55:54 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:55:54 2015 +0200 EFI: support default attributes to map Runtime service areas with none given From: Konrad Rzeszutek Wilk For example on Dell machines we see: (XEN) 00000fed18000-00000fed19fff type=11 attr=8000000000000000 (XEN) Unknown cachability for MFNs 0xfed18-0xfed19 Let's allow them to be mapped as UC. We also alter the 'efi-rs' to be 'efi=rs' or 'efi=no-rs'. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell master commit: 74cdad5dae72c78af4f6b343f38fd55e6a526ab1 master date: 2015-06-10 12:04:07 +0200 --- docs/misc/xen-command-line.markdown | 18 +++++++++++++++--- xen/common/efi/boot.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 1d877f9..13f03ad 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -597,12 +597,24 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. -### efi-rs -> `= ` +### efi +> `= List of [ rs | attr ]` + +All options are of boolean kind and can be prefixed with `no-` to +effect the inverse meaning. + +> `rs` > Default: `true` -Force or disable use of EFI runtime services. +>> Force or disable use of EFI runtime services. + +> `attr=uc` + +> Default: `off` + +>> Allows mapping of RuntimeServices which have no cachability attribute +>> set as UC. ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index a8d8715..58787a6 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1101,7 +1101,31 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) #ifndef CONFIG_ARM /* TODO - runtime service support */ static bool_t __initdata efi_rs_enable = 1; -boolean_param("efi-rs", efi_rs_enable); +static bool_t __initdata efi_map_uc; + +static void __init parse_efi_param(char *s) +{ + char *ss; + + do { + bool_t val = !!strncmp(s, "no-", 3); + + if ( !val ) + s += 3; + + ss = strchr(s, ','); + if ( ss ) + *ss = '\0'; + + if ( !strcmp(s, "rs") ) + efi_rs_enable = val; + else if ( !strcmp(s, "attr=uc") ) + efi_map_uc = val; + + s = ss + 1; + } while ( ss ); +} +custom_param("efi", parse_efi_param); #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, @@ -1199,9 +1223,11 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; else { - printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx\n", - smfn, emfn - 1); - continue; + printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", + smfn, emfn - 1, efi_map_uc ? ", assuming UC" : ""); + if ( !efi_map_uc ) + continue; + prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } if ( desc->Attribute & EFI_MEMORY_WP ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6Tz5-0005sL-T0; Sun, 21 Jun 2015 01:23:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tz4-0005s7-Iq for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:42 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D5/C4-08467-D1216855; Sun, 21 Jun 2015 01:23:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1434849820!15699735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5952 invoked from network); 21 Jun 2015 01:23:40 -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; 21 Jun 2015 01:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6Tz1-0005Nj-R3 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6Tz1-0008Lw-Q2 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:39 +0000 Date: Sun, 21 Jun 2015 01:23:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI: support default attributes to map Runtime service areas with none given X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e254b1900eb2dbf700fac9d52055705fbb497fca Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 08:55:54 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:55:54 2015 +0200 EFI: support default attributes to map Runtime service areas with none given From: Konrad Rzeszutek Wilk For example on Dell machines we see: (XEN) 00000fed18000-00000fed19fff type=11 attr=8000000000000000 (XEN) Unknown cachability for MFNs 0xfed18-0xfed19 Let's allow them to be mapped as UC. We also alter the 'efi-rs' to be 'efi=rs' or 'efi=no-rs'. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell master commit: 74cdad5dae72c78af4f6b343f38fd55e6a526ab1 master date: 2015-06-10 12:04:07 +0200 --- docs/misc/xen-command-line.markdown | 18 +++++++++++++++--- xen/common/efi/boot.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 1d877f9..13f03ad 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -597,12 +597,24 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. -### efi-rs -> `= ` +### efi +> `= List of [ rs | attr ]` + +All options are of boolean kind and can be prefixed with `no-` to +effect the inverse meaning. + +> `rs` > Default: `true` -Force or disable use of EFI runtime services. +>> Force or disable use of EFI runtime services. + +> `attr=uc` + +> Default: `off` + +>> Allows mapping of RuntimeServices which have no cachability attribute +>> set as UC. ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index a8d8715..58787a6 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1101,7 +1101,31 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) #ifndef CONFIG_ARM /* TODO - runtime service support */ static bool_t __initdata efi_rs_enable = 1; -boolean_param("efi-rs", efi_rs_enable); +static bool_t __initdata efi_map_uc; + +static void __init parse_efi_param(char *s) +{ + char *ss; + + do { + bool_t val = !!strncmp(s, "no-", 3); + + if ( !val ) + s += 3; + + ss = strchr(s, ','); + if ( ss ) + *ss = '\0'; + + if ( !strcmp(s, "rs") ) + efi_rs_enable = val; + else if ( !strcmp(s, "attr=uc") ) + efi_map_uc = val; + + s = ss + 1; + } while ( ss ); +} +custom_param("efi", parse_efi_param); #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, @@ -1199,9 +1223,11 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; else { - printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx\n", - smfn, emfn - 1); - continue; + printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", + smfn, emfn - 1, efi_map_uc ? ", assuming UC" : ""); + if ( !efi_map_uc ) + continue; + prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } if ( desc->Attribute & EFI_MEMORY_WP ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6TzF-0005tp-W6; Sun, 21 Jun 2015 01:23:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzE-0005tZ-Gh for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:52 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 8E/13-19215-72216855; Sun, 21 Jun 2015 01:23:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1434849830!15722262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24759 invoked from network); 21 Jun 2015 01:23:51 -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; 21 Jun 2015 01:23:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzB-0005Nr-VV for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TzB-0008NQ-Ti for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:49 +0000 Date: Sun, 21 Jun 2015 01:23:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: extend quirks to newer desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8faef245cf22569ccf07a02422652e1264c913de Author: Jan Beulich AuthorDate: Thu Jun 18 08:57:03 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:57:03 2015 +0200 VT-d: extend quirks to newer desktop chipsets We're being told that while on the server side the issue we're trying to work around is fixed starting with IvyBridge (another round of double checking is going on before we're going to remove the one IvyBridge ID that we're currently applying the workaround for), on the desktop side even Skylake still requires the workaround. Hence we need to add a whole bunch of desktop IDs. Signed-off-by: Jan Beulich Acked-by: Don Dugger master commit: cdc6204b7749a53e6a4d95fac4440601c35a539d master date: 2015-06-11 11:55:05 +0200 --- xen/drivers/passthrough/vtd/quirks.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index b24fb12..69d29ab 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -503,9 +503,13 @@ void pci_vtd_quirk(const struct pci_dev *pdev) case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ - case 0x0a04: /* Haswell ULT */ - case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ - case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ + case 0x0a00: case 0x0a04: case 0x0a08: case 0x0a0f: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: case 0x0c0f: /* Haswell */ + case 0x0d00: case 0x0d04: case 0x0d08: case 0x0d0f: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: case 0x160f: /* Broadwell */ + case 0x1610: case 0x1614: case 0x1618: /* Broadwell */ + case 0x1900: case 0x1904: case 0x1908: case 0x190c: case 0x190f: /* Skylake */ + case 0x1910: case 0x1918: case 0x191f: /* Skylake */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:23:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:23: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 1Z6TzF-0005tp-W6; Sun, 21 Jun 2015 01:23:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzE-0005tZ-Gh for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:52 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 8E/13-19215-72216855; Sun, 21 Jun 2015 01:23:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1434849830!15722262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24759 invoked from network); 21 Jun 2015 01:23:51 -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; 21 Jun 2015 01:23:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzB-0005Nr-VV for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TzB-0008NQ-Ti for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:23:49 +0000 Date: Sun, 21 Jun 2015 01:23:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: extend quirks to newer desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8faef245cf22569ccf07a02422652e1264c913de Author: Jan Beulich AuthorDate: Thu Jun 18 08:57:03 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:57:03 2015 +0200 VT-d: extend quirks to newer desktop chipsets We're being told that while on the server side the issue we're trying to work around is fixed starting with IvyBridge (another round of double checking is going on before we're going to remove the one IvyBridge ID that we're currently applying the workaround for), on the desktop side even Skylake still requires the workaround. Hence we need to add a whole bunch of desktop IDs. Signed-off-by: Jan Beulich Acked-by: Don Dugger master commit: cdc6204b7749a53e6a4d95fac4440601c35a539d master date: 2015-06-11 11:55:05 +0200 --- xen/drivers/passthrough/vtd/quirks.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index b24fb12..69d29ab 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -503,9 +503,13 @@ void pci_vtd_quirk(const struct pci_dev *pdev) case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ - case 0x0a04: /* Haswell ULT */ - case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ - case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ + case 0x0a00: case 0x0a04: case 0x0a08: case 0x0a0f: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: case 0x0c0f: /* Haswell */ + case 0x0d00: case 0x0d04: case 0x0d08: case 0x0d0f: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: case 0x160f: /* Broadwell */ + case 0x1610: case 0x1614: case 0x1618: /* Broadwell */ + case 0x1900: case 0x1904: case 0x1908: case 0x190c: case 0x190f: /* Skylake */ + case 0x1910: case 0x1918: case 0x191f: /* Skylake */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:24:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:24: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 1Z6TzQ-0005vW-4F; Sun, 21 Jun 2015 01:24:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzO-0005vG-HO for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:02 +0000 Content-Length: 1715 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 5B/FB-11060-13216855; Sun, 21 Jun 2015 01:24:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1434849840!18074995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9597 invoked from network); 21 Jun 2015 01:24:01 -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; 21 Jun 2015 01:24:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzM-0005O2-7n for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TzM-0008Nn-2P for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:00 +0000 Date: Sun, 21 Jun 2015 01:24:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libelf: fix elf_parse_bsdsyms 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: multipart/mixed; boundary="===============0054738871988322177==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0054738871988322177== Content-Length: 1296 Content-Transfer-Encoding: quoted-printable commit 5b2f480b1d804833949cfaec157191ea3d4a4870 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 08:57:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:57:47 2015 +0200 libelf: fix elf_parse_bsdsyms call elf_parse_bsdsyms expects the second paramater to be a physical address, not a virtual one. Signed-off-by: Roger Pau Monn=C3=A9 master commit: 90b18f1666a89e7829912456ee32099c7669cb10 master date: 2015-06-12 12:05:54 +0200 --- xen/common/libelf/libelf-dominfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 6120dd4..86403b9 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -438,7 +438,7 @@ static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, if ( parms->bsd_symtab ) { - elf_parse_bsdsyms(elf, parms->virt_kend); + elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) parms->virt_kend =3D elf->bsd_symtab_pend + parms->virt_offset; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============0054738871988322177== 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 --===============0054738871988322177==-- From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:24:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:24: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 1Z6TzQ-0005vW-4F; Sun, 21 Jun 2015 01:24:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzO-0005vG-HO for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:02 +0000 Content-Length: 1715 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 5B/FB-11060-13216855; Sun, 21 Jun 2015 01:24:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1434849840!18074995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9597 invoked from network); 21 Jun 2015 01:24:01 -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; 21 Jun 2015 01:24:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzM-0005O2-7n for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TzM-0008Nn-2P for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:00 +0000 Date: Sun, 21 Jun 2015 01:24:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libelf: fix elf_parse_bsdsyms 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: multipart/mixed; boundary="===============0054738871988322177==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0054738871988322177== Content-Length: 1296 Content-Transfer-Encoding: quoted-printable commit 5b2f480b1d804833949cfaec157191ea3d4a4870 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 08:57:47 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:57:47 2015 +0200 libelf: fix elf_parse_bsdsyms call elf_parse_bsdsyms expects the second paramater to be a physical address, not a virtual one. Signed-off-by: Roger Pau Monn=C3=A9 master commit: 90b18f1666a89e7829912456ee32099c7669cb10 master date: 2015-06-12 12:05:54 +0200 --- xen/common/libelf/libelf-dominfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 6120dd4..86403b9 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -438,7 +438,7 @@ static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, if ( parms->bsd_symtab ) { - elf_parse_bsdsyms(elf, parms->virt_kend); + elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) parms->virt_kend =3D elf->bsd_symtab_pend + parms->virt_offset; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============0054738871988322177== 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 --===============0054738871988322177==-- From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:24:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:24: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 1Z6Tzb-0005x4-6t; Sun, 21 Jun 2015 01:24:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzZ-0005wo-Dt for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:13 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id C8/91-32406-C3216855; Sun, 21 Jun 2015 01:24:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1434849850!18215596!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18119 invoked from network); 21 Jun 2015 01:24:11 -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; 21 Jun 2015 01:24:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzW-0005Od-G2 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TzW-0008OQ-BZ for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:10 +0000 Date: Sun, 21 Jun 2015 01:24:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] cpupool: fix shutdown with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a24672752214b07661db594921ba70c0ee3066c5 Author: Dario Faggioli AuthorDate: Thu Jun 18 08:58:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:58:08 2015 +0200 cpupool: fix shutdown with cpupools with different schedulers trying to shutdown the host when a cpupool exists, has pCPUs, and has a scheduler different than the Xen's default one, produces this: root@Zhaman:~# xl cpupool-cpu-remove Pool-0 8 root@Zhaman:~# xl cpupool-create name=\"Pool-1\" sched=\"credit2\" Using config file "command line" cpupool name: Pool-1 scheduler: credit2 number of cpus: 0 root@Zhaman:~# xl cpupool-cpu-add Pool-1 8 root@Zhaman:~# shutdown -h now (XEN) ----[ Xen-4.6-unstable x86_64 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] kill_timer+0x56/0x298 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor ... ... ... (XEN) Xen call trace: (XEN) [] kill_timer+0x56/0x298 (XEN) [] csched_free_pdata+0x9b/0xcf (XEN) [] cpu_schedule_callback+0x64/0x8b (XEN) [] notifier_call_chain+0x67/0x87 (XEN) [] cpu_down+0xd9/0x12c (XEN) [] disable_nonboot_cpus+0x93/0x138 (XEN) [] enter_state_helper+0xbd/0x365 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b ... ... ... (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000041 (XEN) **************************************** The fix is, when tearing down a pCPU, call the free_pdata() hook from the scheduler of the cpupool the pCPU belongs to, not always the one from the default scheduler. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Acked-by: George Dunlap master commit: 98c51d0c7eb188745f564813443adcb5fd5db00b master date: 2015-06-12 12:06:24 +0200 --- xen/common/schedule.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 6285a6e..86dc73b 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1339,9 +1339,10 @@ static int cpu_schedule_up(unsigned int cpu) static void cpu_schedule_down(unsigned int cpu) { struct schedule_data *sd = &per_cpu(schedule_data, cpu); + struct scheduler *sched = per_cpu(scheduler, cpu); if ( sd->sched_priv != NULL ) - SCHED_OP(&ops, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jun 21 01:24:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Jun 2015 01:24: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 1Z6Tzb-0005x4-6t; Sun, 21 Jun 2015 01:24:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzZ-0005wo-Dt for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:13 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id C8/91-32406-C3216855; Sun, 21 Jun 2015 01:24:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1434849850!18215596!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18119 invoked from network); 21 Jun 2015 01:24:11 -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; 21 Jun 2015 01:24:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z6TzW-0005Od-G2 for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z6TzW-0008OQ-BZ for xen-changelog@lists.xensource.com; Sun, 21 Jun 2015 01:24:10 +0000 Date: Sun, 21 Jun 2015 01:24:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] cpupool: fix shutdown with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a24672752214b07661db594921ba70c0ee3066c5 Author: Dario Faggioli AuthorDate: Thu Jun 18 08:58:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 08:58:08 2015 +0200 cpupool: fix shutdown with cpupools with different schedulers trying to shutdown the host when a cpupool exists, has pCPUs, and has a scheduler different than the Xen's default one, produces this: root@Zhaman:~# xl cpupool-cpu-remove Pool-0 8 root@Zhaman:~# xl cpupool-create name=\"Pool-1\" sched=\"credit2\" Using config file "command line" cpupool name: Pool-1 scheduler: credit2 number of cpus: 0 root@Zhaman:~# xl cpupool-cpu-add Pool-1 8 root@Zhaman:~# shutdown -h now (XEN) ----[ Xen-4.6-unstable x86_64 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] kill_timer+0x56/0x298 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor ... ... ... (XEN) Xen call trace: (XEN) [] kill_timer+0x56/0x298 (XEN) [] csched_free_pdata+0x9b/0xcf (XEN) [] cpu_schedule_callback+0x64/0x8b (XEN) [] notifier_call_chain+0x67/0x87 (XEN) [] cpu_down+0xd9/0x12c (XEN) [] disable_nonboot_cpus+0x93/0x138 (XEN) [] enter_state_helper+0xbd/0x365 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b ... ... ... (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000041 (XEN) **************************************** The fix is, when tearing down a pCPU, call the free_pdata() hook from the scheduler of the cpupool the pCPU belongs to, not always the one from the default scheduler. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Acked-by: George Dunlap master commit: 98c51d0c7eb188745f564813443adcb5fd5db00b master date: 2015-06-12 12:06:24 +0200 --- xen/common/schedule.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 6285a6e..86dc73b 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1339,9 +1339,10 @@ static int cpu_schedule_up(unsigned int cpu) static void cpu_schedule_down(unsigned int cpu) { struct schedule_data *sd = &per_cpu(schedule_data, cpu); + struct scheduler *sched = per_cpu(scheduler, cpu); if ( sd->sched_priv != NULL ) - SCHED_OP(&ops, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:44: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 1Z7LgV-0002QT-DF; Tue, 23 Jun 2015 10: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 1Z7LgU-0002Q2-1u for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:06 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id B5/45-10593-57839855; Tue, 23 Jun 2015 10:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435056243!14457249!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5878 invoked from network); 23 Jun 2015 10:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jun 2015 10:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LgR-0003gO-Gp for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LgR-0008Pr-4r for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:03 +0000 Date: Tue, 23 Jun 2015 10:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2b999d45587de154d198891185cff47151e8418 Author: Gonglei AuthorDate: Tue Jun 23 11:42:13 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:13 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 23 10:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:44: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 1Z7LgV-0002QT-DF; Tue, 23 Jun 2015 10: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 1Z7LgU-0002Q2-1u for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:06 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id B5/45-10593-57839855; Tue, 23 Jun 2015 10:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435056243!14457249!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5878 invoked from network); 23 Jun 2015 10:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jun 2015 10:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LgR-0003gO-Gp for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LgR-0008Pr-4r for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:03 +0000 Date: Tue, 23 Jun 2015 10:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2b999d45587de154d198891185cff47151e8418 Author: Gonglei AuthorDate: Tue Jun 23 11:42:13 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:13 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 23 10:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10: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 1Z7Lgg-0002SM-G2; Tue, 23 Jun 2015 10:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgf-0002SC-SI for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:17 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 8D/28-31304-18839855; Tue, 23 Jun 2015 10:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435056254!10930218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28136 invoked from network); 23 Jun 2015 10:44:16 -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; 23 Jun 2015 10:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgb-0003gT-Qi for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lgb-0008Qe-Lk for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:13 +0000 Date: Tue, 23 Jun 2015 10:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e2e51ecc1120bd59537ed19b6bc7066511c7e2e Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:15 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 23 10:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10: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 1Z7Lgg-0002SM-G2; Tue, 23 Jun 2015 10:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgf-0002SC-SI for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:17 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 8D/28-31304-18839855; Tue, 23 Jun 2015 10:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435056254!10930218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28136 invoked from network); 23 Jun 2015 10:44:16 -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; 23 Jun 2015 10:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgb-0003gT-Qi for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lgb-0008Qe-Lk for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:13 +0000 Date: Tue, 23 Jun 2015 10:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e2e51ecc1120bd59537ed19b6bc7066511c7e2e Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:15 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-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 Jun 23 10:44:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:44: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 1Z7Lgy-0002UZ-Is; Tue, 23 Jun 2015 10:44:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgx-0002UH-Aw for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:35 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C3/C9-21325-29839855; Tue, 23 Jun 2015 10:44:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435056273!10930321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30971 invoked from network); 23 Jun 2015 10:44:34 -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; 23 Jun 2015 10:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgu-0003gh-Vw for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lgu-0008SL-TB for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:32 +0000 Date: Tue, 23 Jun 2015 10:44:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ba285a22e34a1beb2f922d6e862e0575e8d020c Author: Gonglei AuthorDate: Tue Jun 23 11:43:58 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:58 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:44:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:44: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 1Z7Lgy-0002UZ-Is; Tue, 23 Jun 2015 10:44:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgx-0002UH-Aw for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:35 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C3/C9-21325-29839855; Tue, 23 Jun 2015 10:44:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435056273!10930321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30971 invoked from network); 23 Jun 2015 10:44:34 -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; 23 Jun 2015 10:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lgu-0003gh-Vw for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lgu-0008SL-TB for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:32 +0000 Date: Tue, 23 Jun 2015 10:44:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ba285a22e34a1beb2f922d6e862e0575e8d020c Author: Gonglei AuthorDate: Tue Jun 23 11:43:58 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:58 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:44:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:44: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 1Z7Lh8-0002WM-Lc; Tue, 23 Jun 2015 10:44:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lh7-0002W3-KG for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:45 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 33/AE-17050-C9839855; Tue, 23 Jun 2015 10:44:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435056283!18827419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8468 invoked from network); 23 Jun 2015 10:44:44 -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; 23 Jun 2015 10:44:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lh5-0003gp-9d for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lh5-0008T9-4j for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:43 +0000 Date: Tue, 23 Jun 2015 10:44:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b5c19892fd76d1c5b6b2a0b4fee6a35513b4999 Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:59 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:44:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:44: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 1Z7Lh8-0002WM-Lc; Tue, 23 Jun 2015 10:44:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lh7-0002W3-KG for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:45 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 33/AE-17050-C9839855; Tue, 23 Jun 2015 10:44:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435056283!18827419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8468 invoked from network); 23 Jun 2015 10:44:44 -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; 23 Jun 2015 10:44:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lh5-0003gp-9d for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lh5-0008T9-4j for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:43 +0000 Date: Tue, 23 Jun 2015 10:44:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b5c19892fd76d1c5b6b2a0b4fee6a35513b4999 Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:59 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:45:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10: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 1Z7LhL-0002Z8-QF; Tue, 23 Jun 2015 10:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhK-0002Yu-Ap for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:58 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 48/3F-00727-9A839855; Tue, 23 Jun 2015 10:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435056295!18888128!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26959 invoked from network); 23 Jun 2015 10:44:56 -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; 23 Jun 2015 10:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhH-0003h0-MT for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LhH-0008Uk-H5 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:55 +0000 Date: Tue, 23 Jun 2015 10:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13cb33af28dfd3a1b4d681509fc5348899a03b15 Author: Gonglei AuthorDate: Tue Jun 23 11:43:34 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:34 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- 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 Tue Jun 23 10:45:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10: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 1Z7LhL-0002Z8-QF; Tue, 23 Jun 2015 10:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhK-0002Yu-Ap for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:58 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 48/3F-00727-9A839855; Tue, 23 Jun 2015 10:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435056295!18888128!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26959 invoked from network); 23 Jun 2015 10:44:56 -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; 23 Jun 2015 10:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhH-0003h0-MT for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LhH-0008Uk-H5 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:44:55 +0000 Date: Tue, 23 Jun 2015 10:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13cb33af28dfd3a1b4d681509fc5348899a03b15 Author: Gonglei AuthorDate: Tue Jun 23 11:43:34 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:34 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- 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 Tue Jun 23 10:45:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7LhZ-0002bJ-Sv; Tue, 23 Jun 2015 10:45:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhY-0002b6-D3 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:12 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 22/00-25881-7B839855; Tue, 23 Jun 2015 10:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1435056310!13346121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21240 invoked from network); 23 Jun 2015 10:45: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; 23 Jun 2015 10:45:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhT-0003i7-3j for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LhR-0008VW-QU for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:06 +0000 Date: Tue, 23 Jun 2015 10:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d882026216a2b9afe74d4b1ef99433620e0ba0a Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:35 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- 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 Tue Jun 23 10:45:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7LhZ-0002bJ-Sv; Tue, 23 Jun 2015 10:45:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhY-0002b6-D3 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:12 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 22/00-25881-7B839855; Tue, 23 Jun 2015 10:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1435056310!13346121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21240 invoked from network); 23 Jun 2015 10:45: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; 23 Jun 2015 10:45:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LhT-0003i7-3j for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LhR-0008VW-QU for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:06 +0000 Date: Tue, 23 Jun 2015 10:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d882026216a2b9afe74d4b1ef99433620e0ba0a Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:35 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- 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 Tue Jun 23 10:45:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7Lhm-0002cy-Ai; Tue, 23 Jun 2015 10:45:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhl-0002cj-1f for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:25 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id DA/D3-32733-4C839855; Tue, 23 Jun 2015 10:45:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1435056322!18277576!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11298 invoked from network); 23 Jun 2015 10:45:23 -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; 23 Jun 2015 10:45:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhi-0003iQ-H7 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lhi-00005V-D7 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:22 +0000 Date: Tue, 23 Jun 2015 10:45:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d15b64fbc7fc7f6062ece4c9acd174c95accfb3 Author: Gonglei AuthorDate: Tue Jun 23 11:42:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:43 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- 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 Tue Jun 23 10:45:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7Lhm-0002cy-Ai; Tue, 23 Jun 2015 10:45:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhl-0002cj-1f for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:25 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id DA/D3-32733-4C839855; Tue, 23 Jun 2015 10:45:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1435056322!18277576!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11298 invoked from network); 23 Jun 2015 10:45:23 -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; 23 Jun 2015 10:45:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhi-0003iQ-H7 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lhi-00005V-D7 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:22 +0000 Date: Tue, 23 Jun 2015 10:45:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d15b64fbc7fc7f6062ece4c9acd174c95accfb3 Author: Gonglei AuthorDate: Tue Jun 23 11:42:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:43 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- 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 Tue Jun 23 10:45:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7Lhw-0002hZ-8K; Tue, 23 Jun 2015 10:45:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhv-0002gY-G0 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:35 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 68/70-30151-EC839855; Tue, 23 Jun 2015 10:45:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435056332!25880583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5238 invoked from network); 23 Jun 2015 10:45:33 -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; 23 Jun 2015 10:45:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhs-0003ih-La for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lhs-000061-Kf for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:32 +0000 Date: Tue, 23 Jun 2015 10:45:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd5c04144e204539f04e2f7994b12eef7724c31a Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:45 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- 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 Tue Jun 23 10:45:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7Lhw-0002hZ-8K; Tue, 23 Jun 2015 10:45:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhv-0002gY-G0 for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:35 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 68/70-30151-EC839855; Tue, 23 Jun 2015 10:45:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435056332!25880583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5238 invoked from network); 23 Jun 2015 10:45:33 -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; 23 Jun 2015 10:45:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Lhs-0003ih-La for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Lhs-000061-Kf for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:32 +0000 Date: Tue, 23 Jun 2015 10:45:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd5c04144e204539f04e2f7994b12eef7724c31a Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:45 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- 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 Tue Jun 23 10:45:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7Li7-0002qF-Lv; Tue, 23 Jun 2015 10:45:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Li6-0002ov-MI for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:46 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id B7/08-10437-9D839855; Tue, 23 Jun 2015 10:45:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435056344!18901492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29644 invoked from network); 23 Jun 2015 10:45:45 -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; 23 Jun 2015 10:45:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Li4-0003j7-1J for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Li3-00007N-Pb for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:43 +0000 Date: Tue, 23 Jun 2015 10:45:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bb4240750536d6d71c0ed77e1f031dc28debd271 Author: Gonglei AuthorDate: Tue Jun 23 11:21:49 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:21:49 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:45:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7Li7-0002qF-Lv; Tue, 23 Jun 2015 10:45:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Li6-0002ov-MI for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:46 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id B7/08-10437-9D839855; Tue, 23 Jun 2015 10:45:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435056344!18901492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29644 invoked from network); 23 Jun 2015 10:45:45 -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; 23 Jun 2015 10:45:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7Li4-0003j7-1J for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7Li3-00007N-Pb for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:43 +0000 Date: Tue, 23 Jun 2015 10:45:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bb4240750536d6d71c0ed77e1f031dc28debd271 Author: Gonglei AuthorDate: Tue Jun 23 11:21:49 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:21:49 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:45:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7LiI-0002zQ-E1; Tue, 23 Jun 2015 10:45:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LiG-0002x4-UE for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:57 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 10/B8-31650-4E839855; Tue, 23 Jun 2015 10:45:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435056354!19748897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13141 invoked from network); 23 Jun 2015 10:45:55 -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; 23 Jun 2015 10:45:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LiE-0003jV-9G for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LiE-00007j-5H for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:54 +0000 Date: Tue, 23 Jun 2015 10:45:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f9441988e7a3cd7a59fc613e1975c802b2d60d0 Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:21:51 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:45:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:45: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 1Z7LiI-0002zQ-E1; Tue, 23 Jun 2015 10:45:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LiG-0002x4-UE for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:57 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 10/B8-31650-4E839855; Tue, 23 Jun 2015 10:45:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435056354!19748897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13141 invoked from network); 23 Jun 2015 10:45:55 -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; 23 Jun 2015 10:45:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LiE-0003jV-9G for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LiE-00007j-5H for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:45:54 +0000 Date: Tue, 23 Jun 2015 10:45:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f9441988e7a3cd7a59fc613e1975c802b2d60d0 Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:21:51 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:55: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 1Z7LrJ-0004gK-RG; Tue, 23 Jun 2015 10:55:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LrI-0004g3-5L for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:16 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 8F/25-11060-31B39855; Tue, 23 Jun 2015 10:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1435056914!18864615!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5960 invoked from network); 23 Jun 2015 10:55:14 -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; 23 Jun 2015 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 1Z7LrA-0003so-SJ for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LrA-0000eq-IM for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:08 +0000 Date: Tue, 23 Jun 2015 10:55:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbf2cd02b3d199ae16608fc3fcf53543b4771a10 Author: Gonglei AuthorDate: Tue Jun 23 11:44:28 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:28 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:55: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 1Z7LrJ-0004gK-RG; Tue, 23 Jun 2015 10:55:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LrI-0004g3-5L for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:16 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 8F/25-11060-31B39855; Tue, 23 Jun 2015 10:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1435056914!18864615!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5960 invoked from network); 23 Jun 2015 10:55:14 -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; 23 Jun 2015 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 1Z7LrA-0003so-SJ for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LrA-0000eq-IM for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:08 +0000 Date: Tue, 23 Jun 2015 10:55:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] pcnet: fix Negative array index read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbf2cd02b3d199ae16608fc3fcf53543b4771a10 Author: Gonglei AuthorDate: Tue Jun 23 11:44:28 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:28 2015 +0100 pcnet: fix Negative array index read s->xmit_pos maybe assigned to a negative value (-1), but in this branch variable s->xmit_pos as an index to array s->buffer. Let's add a check for s->xmit_pos. upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b Signed-off-by: Gonglei Signed-off-by: Paolo Bonzini Reviewed-by: Jason Wang Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- hw/pcnet.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 7cc0637..9f3e1cc 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1250,7 +1250,7 @@ static void pcnet_transmit(PCNetState *s) target_phys_addr_t xmit_cxda = 0; int count = CSR_XMTRL(s)-1; int add_crc = 0; - + int bcnt; s->xmit_pos = -1; if (!CSR_TXON(s)) { @@ -1276,34 +1276,39 @@ static void pcnet_transmit(PCNetState *s) if (BCR_SWSTYLE(s) != 1) add_crc = GET_FIELD(tmd.status, TMDS, ADDFCS); } + + if (s->xmit_pos < 0) { + goto txdone; + } + + bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), + s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); + s->xmit_pos += bcnt; + if (!GET_FIELD(tmd.status, TMDS, ENP)) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; - } else if (s->xmit_pos >= 0) { - int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; + goto txdone; + } #ifdef PCNET_DEBUG - printf("pcnet_transmit size=%d\n", s->xmit_pos); + printf("pcnet_transmit size=%d\n", s->xmit_pos); #endif - if (CSR_LOOP(s)) { - if (BCR_SWSTYLE(s) == 1) - add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); - s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; - pcnet_receive(s, s->buffer, s->xmit_pos); - s->looptest = 0; - } else - if (s->vc) - qemu_send_packet(s->vc, s->buffer, s->xmit_pos); - - s->csr[0] &= ~0x0008; /* clear TDMD */ - s->csr[4] |= 0x0004; /* set TXSTRT */ - s->xmit_pos = -1; + if (CSR_LOOP(s)) { + if (BCR_SWSTYLE(s) == 1) + add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); + s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; + pcnet_receive(s, s->buffer, s->xmit_pos); + s->looptest = 0; + } else { + if (s->vc) { + qemu_send_packet(s->vc, s->buffer, s->xmit_pos); + } } + s->csr[0] &= ~0x0008; /* clear TDMD */ + s->csr[4] |= 0x0004; /* set TXSTRT */ + s->xmit_pos = -1; + + txdone: SET_FIELD(&tmd.status, TMDS, OWN, 0); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:55: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 1Z7LrO-0004iF-Eh; Tue, 23 Jun 2015 10:55:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LrN-0004hT-Rh for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:21 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 45/62-08244-91B39855; Tue, 23 Jun 2015 10:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1435056919!16250626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3785 invoked from network); 23 Jun 2015 10:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jun 2015 10:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LrL-0003to-8Z for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LrL-0000fE-0v for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:19 +0000 Date: Tue, 23 Jun 2015 10:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77d9bdb27c4237a007ba93a6f159791eed317abc Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:30 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 10:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 10:55: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 1Z7LrO-0004iF-Eh; Tue, 23 Jun 2015 10:55:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LrN-0004hT-Rh for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:21 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 45/62-08244-91B39855; Tue, 23 Jun 2015 10:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1435056919!16250626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3785 invoked from network); 23 Jun 2015 10:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jun 2015 10:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7LrL-0003to-8Z for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7LrL-0000fE-0v for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 10:55:19 +0000 Date: Tue, 23 Jun 2015 10:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] pcnet: force the buffer access to be in bounds during tx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77d9bdb27c4237a007ba93a6f159791eed317abc Author: Petr Matousek AuthorDate: Sun May 24 10:53:44 2015 +0200 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:30 2015 +0100 pcnet: force the buffer access to be in bounds during tx 4096 is the maximum length per TMD and it is also currently the size of the relay buffer pcnet driver uses for sending the packet data to QEMU for further processing. With packet spanning multiple TMDs it can happen that the overall packet size will be bigger than sizeof(buffer), which results in memory corruption. Fix this by only allowing to queue maximum sizeof(buffer) bytes. This is CVE-2015-3209. Signed-off-by: Petr Matousek Reported-by: Matt Tait Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/pcnet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 9f3e1cc..4e81267 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1282,6 +1282,14 @@ static void pcnet_transmit(PCNetState *s) } bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); + + /* if multi-tmd packet outsizes s->buffer then skip it silently. + Note: this is not what real hw does */ + if (s->xmit_pos + bcnt > sizeof(s->buffer)) { + s->xmit_pos = -1; + goto txdone; + } + s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 16:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 16:00: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 1Z7QcK-0006p8-U5; Tue, 23 Jun 2015 16:00:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7QcJ-0006mC-UX for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 16:00:08 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 04/0B-29123-78289855; Tue, 23 Jun 2015 16:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435075205!19871255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26419 invoked from network); 23 Jun 2015 16:00:06 -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; 23 Jun 2015 16:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7QcF-0007gQ-5b for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 16:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7QcE-00047r-Uz for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 16:00:03 +0000 Date: Tue, 23 Jun 2015 16:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] 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 97134c441d6d81ba0d7cdcfdc4d8315115b99dce Author: Ian Jackson AuthorDate: Thu Jun 11 16:49:25 2015 +0100 Commit: Ian Jackson CommitDate: Thu Jun 11 16:49:25 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index abf72ad..f9d1718 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 63a2748f7a97462c9d967daaabaeb5749aee24ea -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TAG ?= 1259e092ee27f444f683f0d76a13a8a72d3f26cb +# Wed Jun 10 14:17:55 2015 +0100 +# xen/pt: unknown PCI config space fields should be read-only # 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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 23 16:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Jun 2015 16:00: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 1Z7QcK-0006p8-U5; Tue, 23 Jun 2015 16:00:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7QcJ-0006mC-UX for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 16:00:08 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 04/0B-29123-78289855; Tue, 23 Jun 2015 16:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435075205!19871255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26419 invoked from network); 23 Jun 2015 16:00:06 -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; 23 Jun 2015 16:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7QcF-0007gQ-5b for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 16:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z7QcE-00047r-Uz for xen-changelog@lists.xensource.com; Tue, 23 Jun 2015 16:00:03 +0000 Date: Tue, 23 Jun 2015 16:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] 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 97134c441d6d81ba0d7cdcfdc4d8315115b99dce Author: Ian Jackson AuthorDate: Thu Jun 11 16:49:25 2015 +0100 Commit: Ian Jackson CommitDate: Thu Jun 11 16:49:25 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index abf72ad..f9d1718 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 63a2748f7a97462c9d967daaabaeb5749aee24ea -# Wed May 6 09:48:59 2015 +0200 -# fdc: force the fifo access to be in bounds of the allocated buffer +QEMU_TAG ?= 1259e092ee27f444f683f0d76a13a8a72d3f26cb +# Wed Jun 10 14:17:55 2015 +0100 +# xen/pt: unknown PCI config space fields should be read-only # 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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 25 11:11:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Jun 2015 11:11:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z853t-0000HR-SG; Thu, 25 Jun 2015 11:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z853s-0000Gt-FP for xen-changelog@lists.xensource.com; Thu, 25 Jun 2015 11:11:16 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 45/5F-31880-3D1EB855; Thu, 25 Jun 2015 11:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1435230665!13939940!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 541 invoked from network); 25 Jun 2015 11: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; 25 Jun 2015 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z853e-0003t9-Jt for xen-changelog@lists.xensource.com; Thu, 25 Jun 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z853e-0007mZ-Dg for xen-changelog@lists.xensource.com; Thu, 25 Jun 2015 11:11:02 +0000 Date: Thu, 25 Jun 2015 11:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: enable compiler check for printk format 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 1855e8b2e884a16fd9afd2b3d72fc7552bbf406d Author: Thomas Leonard AuthorDate: Wed Jun 17 11:08:20 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:42:00 2015 +0100 mini-os: enable compiler check for printk format types Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- arch/x86/mm.c | 22 +++++++++++----------- arch/x86/sched.c | 4 ++-- arch/x86/traps.c | 18 +++++++++--------- blkfront.c | 2 +- include/console.h | 4 ++-- lib/sys.c | 4 ++-- lwip-arch.c | 5 +++-- minios.mk | 2 +- mm.c | 6 +++++- netfront.c | 4 ++-- sched.c | 2 +- test.c | 6 ++++-- tpm_tis.c | 8 ++++---- xenbus/xenbus.c | 4 ++-- 14 files changed, 49 insertions(+), 42 deletions(-) diff --git a/arch/x86/mm.c b/arch/x86/mm.c index 9c6d1b8..186659d 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -94,7 +94,7 @@ static void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, break; #endif default: - printk("new_pt_frame() called with invalid level number %d\n", level); + printk("new_pt_frame() called with invalid level number %lu\n", level); do_exit(); break; } @@ -181,7 +181,7 @@ static int need_pt_frame(unsigned long va, int level) if ( level == L1_FRAME ) return 1; - printk("ERROR: Unknown frame level %d, hypervisor %llx,%llx\n", + printk("ERROR: Unknown frame level %d, hypervisor %lx,%lx\n", level, hyp_virt_start, hyp_virt_end); return -1; } @@ -206,11 +206,11 @@ static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) if ( *max_pfn >= virt_to_pfn(HYPERVISOR_VIRT_START) ) { printk("WARNING: Mini-OS trying to use Xen virtual space. " - "Truncating memory from %dMB to ", + "Truncating memory from %luMB to ", ((unsigned long)pfn_to_virt(*max_pfn) - (unsigned long)&_text)>>20); *max_pfn = virt_to_pfn(HYPERVISOR_VIRT_START - PAGE_SIZE); - printk("%dMB\n", + printk("%luMB\n", ((unsigned long)pfn_to_virt(*max_pfn) - (unsigned long)&_text)>>20); } @@ -326,7 +326,7 @@ static void set_readonly(void *text, void *etext) count++; } else - printk("skipped %p\n", start_address); + printk("skipped %lx\n", start_address); start_address += PAGE_SIZE; @@ -369,21 +369,21 @@ int mem_test(unsigned long *start_va, unsigned long *end_va, int verbose) /* write values and print page walks */ if ( verbose && (((unsigned long)start_va) & 0xfffff) ) { - printk("MemTest Start: 0x%lx\n", start_va); + printk("MemTest Start: 0x%p\n", start_va); page_walk((unsigned long)start_va); } for ( pointer = start_va; pointer < end_va; pointer++ ) { if ( verbose && !(((unsigned long)pointer) & 0xfffff) ) { - printk("Writing to %lx\n", pointer); + printk("Writing to %p\n", pointer); page_walk((unsigned long)pointer); } *pointer = (unsigned long)pointer & ~mask; } if ( verbose && (((unsigned long)end_va) & 0xfffff) ) { - printk("MemTest End: %lx\n", end_va-1); + printk("MemTest End: %p\n", end_va-1); page_walk((unsigned long)end_va-1); } @@ -516,7 +516,7 @@ void arch_init_demand_mapping_area(unsigned long cur_pfn) demand_map_area_start = (unsigned long) pfn_to_virt(cur_pfn); cur_pfn += DEMAND_MAP_PAGES; - printk("Demand map pfns at %lx-%lx.\n", + printk("Demand map pfns at %lx-%p.\n", demand_map_area_start, pfn_to_virt(cur_pfn)); #ifdef HAVE_LIBC @@ -619,7 +619,7 @@ void do_map_frames(unsigned long va, if (err) err[done * stride] = rc; else { - printk("Map %ld (%lx, ...) at %p failed: %d.\n", + printk("Map %ld (%lx, ...) at %lx failed: %d.\n", todo, mfns[done * stride] + done * incr, va, rc); do_exit(); } @@ -793,7 +793,7 @@ unsigned long alloc_contig_pages(int order, unsigned int addr_bits) out_frames = virt_to_pfn(in_va); /* PFNs to populate */ ret = HYPERVISOR_memory_op(XENMEM_exchange, &exchange); if ( ret ) { - printk("mem exchanged order=0x%x failed with rc=%d, nr_exchanged=%d\n", + printk("mem exchanged order=0x%x failed with rc=%d, nr_exchanged=%lu\n", order, ret, exchange.nr_exchanged); /* we still need to return the allocated pages above to the pool * ie. map them back into the 1:1 mapping etc. so we continue but diff --git a/arch/x86/sched.c b/arch/x86/sched.c index e4a3dc2..ec13694 100644 --- a/arch/x86/sched.c +++ b/arch/x86/sched.c @@ -73,7 +73,7 @@ void dump_stack(struct thread *thread) printk("The stack for \"%s\"\n", thread->name); for(count = 0; count < 25 && pointer < bottom; count ++) { - printk("[0x%lx] 0x%lx\n", pointer, *pointer); + printk("[0x%p] 0x%lx\n", pointer, *pointer); pointer++; } @@ -101,7 +101,7 @@ struct thread* arch_create_thread(char *name, void (*function)(void *), /* We can't use lazy allocation here since the trap handler runs on the stack */ thread->stack = (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); thread->name = name; - printk("Thread \"%s\": pointer: 0x%lx, stack: 0x%lx\n", name, thread, + printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, thread->stack); thread->sp = (unsigned long)thread->stack + STACK_SIZE; diff --git a/arch/x86/traps.c b/arch/x86/traps.c index 516d133..6353718 100644 --- a/arch/x86/traps.c +++ b/arch/x86/traps.c @@ -34,14 +34,14 @@ void dump_regs(struct pt_regs *regs) { printk("Thread: %s\n", current->name); #ifdef __i386__ - printk("EIP: %x, EFLAGS %x.\n", regs->eip, regs->eflags); - printk("EBX: %08x ECX: %08x EDX: %08x\n", + printk("EIP: %lx, EFLAGS %lx.\n", regs->eip, regs->eflags); + printk("EBX: %08lx ECX: %08lx EDX: %08lx\n", regs->ebx, regs->ecx, regs->edx); - printk("ESI: %08x EDI: %08x EBP: %08x EAX: %08x\n", + printk("ESI: %08lx EDI: %08lx EBP: %08lx EAX: %08lx\n", regs->esi, regs->edi, regs->ebp, regs->eax); - printk("DS: %04x ES: %04x orig_eax: %08x, eip: %08x\n", + printk("DS: %04x ES: %04x orig_eax: %08lx, eip: %08lx\n", regs->xds, regs->xes, regs->orig_eax, regs->eip); - printk("CS: %04x EFLAGS: %08x esp: %08x ss: %04x\n", + printk("CS: %04x EFLAGS: %08lx esp: %08lx ss: %04x\n", regs->xcs, regs->eflags, regs->esp, regs->xss); #else printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip); @@ -214,10 +214,10 @@ void do_page_fault(struct pt_regs *regs, unsigned long error_code) barrier(); #if defined(__x86_64__) - printk("Page fault at linear address %p, rip %p, regs %p, sp %p, our_sp %p, code %lx\n", + printk("Page fault at linear address %lx, rip %lx, regs %p, sp %lx, our_sp %p, code %lx\n", addr, regs->rip, regs, regs->rsp, &addr, error_code); #else - printk("Page fault at linear address %p, eip %p, regs %p, sp %p, our_sp %p, code %lx\n", + printk("Page fault at linear address %lx, eip %lx, regs %p, sp %lx, our_sp %p, code %lx\n", addr, regs->eip, regs, regs->esp, &addr, error_code); #endif @@ -243,9 +243,9 @@ void do_general_protection(struct pt_regs *regs, long error_code) { struct sched_shutdown sched_shutdown = { .reason = SHUTDOWN_crash }; #ifdef __i386__ - printk("GPF eip: %p, error_code=%lx\n", regs->eip, error_code); + printk("GPF eip: %lx, error_code=%lx\n", regs->eip, error_code); #else - printk("GPF rip: %p, error_code=%lx\n", regs->rip, error_code); + printk("GPF rip: %lx, error_code=%lx\n", regs->rip, error_code); #endif dump_regs(regs); #if defined(__x86_64__) diff --git a/blkfront.c b/blkfront.c index 59e576f..bdb7765 100644 --- a/blkfront.c +++ b/blkfront.c @@ -236,7 +236,7 @@ done: } unmask_evtchn(dev->evtchn); - printk("%u sectors of %u bytes\n", dev->info.sectors, dev->info.sector_size); + printk("%lu sectors of %u bytes\n", (unsigned long) dev->info.sectors, dev->info.sector_size); printk("**************************\n"); return dev; diff --git a/include/console.h b/include/console.h index 3755b66..a77f47f 100644 --- a/include/console.h +++ b/include/console.h @@ -64,8 +64,8 @@ struct consfront_dev { void print(int direct, const char *fmt, va_list args); -void printk(const char *fmt, ...); -void xprintk(const char *fmt, ...); +void printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); +void xprintk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); #define tprintk(_fmt, _args...) printk("[%s] " _fmt, current->name, ##_args) diff --git a/lib/sys.c b/lib/sys.c index 13e7e59..f8d7a7c 100644 --- a/lib/sys.c +++ b/lib/sys.c @@ -1319,7 +1319,7 @@ int clock_gettime(clockid_t clk_id, struct timespec *tp) break; } default: - print_unsupported("clock_gettime(%d)", clk_id); + print_unsupported("clock_gettime(%ld)", (long) clk_id); errno = EINVAL; return -1; } @@ -1421,7 +1421,7 @@ void sparse(unsigned long data, size_t size) mfns[i] = virtual_to_mfn(data + i * PAGE_SIZE); } - printk("sparsing %ldMB at %lx\n", size >> 20, data); + printk("sparsing %ldMB at %lx\n", ((long) size) >> 20, data); munmap((void *) data, size); free_physical_pages(mfns, n); diff --git a/lwip-arch.c b/lwip-arch.c index e634ef4..154617b 100644 --- a/lwip-arch.c +++ b/lwip-arch.c @@ -236,8 +236,9 @@ sys_thread_t sys_thread_new(char *name, void (* thread)(void *arg), void *arg, i { struct thread *t; if (stacksize > STACK_SIZE) { - printk("Can't start lwIP thread: stack size %d is too large for our %d\n", stacksize, STACK_SIZE); - do_exit(); + printk("Can't start lwIP thread: stack size %d is too large for our %lu\n", + stacksize, (unsigned long) STACK_SIZE); + do_exit(); } lwip_thread = t = create_thread(name, thread, arg); return t; diff --git a/minios.mk b/minios.mk index b0d9f71..e042027 100644 --- a/minios.mk +++ b/minios.mk @@ -6,7 +6,7 @@ debug = y # Define some default flags. # NB. '-Wcast-qual' is nasty, so I omitted it. -DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls +DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls -Wformat DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline diff --git a/mm.c b/mm.c index 64b3292..31aaf83 100644 --- a/mm.c +++ b/mm.c @@ -379,7 +379,11 @@ void *sbrk(ptrdiff_t increment) unsigned long new_brk = old_brk + increment; if (new_brk > heap_end) { - printk("Heap exhausted: %p + %lx = %p > %p\n", old_brk, increment, new_brk, heap_end); + printk("Heap exhausted: %lx + %lx = %p > %p\n", + old_brk, + (unsigned long) increment, + (void *) new_brk, + (void *) heap_end); return NULL; } diff --git a/netfront.c b/netfront.c index 42bb103..0eca5b5 100644 --- a/netfront.c +++ b/netfront.c @@ -325,8 +325,8 @@ struct netfront_dev *init_netfront(char *_nodename, void (*thenetif_rx)(unsigned dev->fd = -1; #endif - printk("net TX ring size %d\n", NET_TX_RING_SIZE); - printk("net RX ring size %d\n", NET_RX_RING_SIZE); + printk("net TX ring size %lu\n", (unsigned long) NET_TX_RING_SIZE); + printk("net RX ring size %lu\n", (unsigned long) NET_RX_RING_SIZE); init_SEMAPHORE(&dev->tx_sem, NET_TX_RING_SIZE); for(i=0;idata; if (ret) - printk("got error code %d when reading at offset %ld\n", ret, aiocb->aio_offset); + printk("got error code %d when reading at offset %ld\n", ret, (long) aiocb->aio_offset); else blk_size_read += blk_info.sector_size; free(aiocb->aio_buf); @@ -250,7 +250,9 @@ static void blkfront_thread(void *p) blkfront_aio_poll(blk_dev); gettimeofday(&tv, NULL); if (tv.tv_sec > lasttime + 10) { - printk("%llu read, %llu write\n", blk_size_read, blk_size_write); + printk("%llu read, %llu write\n", + (unsigned long long) blk_size_read, + (unsigned long long) blk_size_write); lasttime = tv.tv_sec; } diff --git a/tpm_tis.c b/tpm_tis.c index debcc43..98fe837 100644 --- a/tpm_tis.c +++ b/tpm_tis.c @@ -912,7 +912,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const uint8_t *buf, //down(&chip->tpm_mutex); if ((rc = tpm_tis_send(chip, (uint8_t *) buf, count)) < 0) { - printk("tpm_transmit: tpm_send: error %ld\n", rc); + printk("tpm_transmit: tpm_send: error %ld\n", (long) rc); goto out; } @@ -944,7 +944,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const uint8_t *buf, out_recv: if((rc = tpm_tis_recv(chip, (uint8_t *) buf, bufsiz)) < 0) { - printk("tpm_transmit: tpm_recv: error %d\n", rc); + printk("tpm_transmit: tpm_recv: error %d\n", (int) rc); } out: //up(&chip->tpm_mutex); @@ -983,7 +983,7 @@ int tpm_get_timeouts(struct tpm_chip *chip) if((rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, "attempting to determine the timeouts")) != 0) { - printk("transmit failed %d\n", rc); + printk("transmit failed %d\n", (int) rc); goto duration; } @@ -1145,7 +1145,7 @@ struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned i if(locality_enabled(tpm, i)) { /* Map the page in now */ if((tpm->pages[i] = ioremap_nocache(addr, PAGE_SIZE)) == NULL) { - printk("Unable to map iomem page a address %p\n", addr); + printk("Unable to map iomem page a address %lx\n", addr); goto abort_egress; } diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c index 934f23b..4613ed6 100644 --- a/xenbus/xenbus.c +++ b/xenbus/xenbus.c @@ -337,8 +337,8 @@ void init_xenbus(void) xenbus_evtchn_handler, NULL); unmask_evtchn(start_info.store_evtchn); - printk("xenbus initialised on irq %d mfn %#lx\n", - err, start_info.store_mfn); + printk("xenbus initialised on irq %d mfn %#llx\n", + err, (unsigned long long) start_info.store_mfn); } void fini_xenbus(void) -- generated by git-patchbot for /home/xen/git/mini-os.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 Jun 25 11:11:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Jun 2015 11:11:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z853t-0000HR-SG; Thu, 25 Jun 2015 11:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z853s-0000Gt-FP for xen-changelog@lists.xensource.com; Thu, 25 Jun 2015 11:11:16 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 45/5F-31880-3D1EB855; Thu, 25 Jun 2015 11:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1435230665!13939940!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 541 invoked from network); 25 Jun 2015 11: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; 25 Jun 2015 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z853e-0003t9-Jt for xen-changelog@lists.xensource.com; Thu, 25 Jun 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z853e-0007mZ-Dg for xen-changelog@lists.xensource.com; Thu, 25 Jun 2015 11:11:02 +0000 Date: Thu, 25 Jun 2015 11:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: enable compiler check for printk format 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 1855e8b2e884a16fd9afd2b3d72fc7552bbf406d Author: Thomas Leonard AuthorDate: Wed Jun 17 11:08:20 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:42:00 2015 +0100 mini-os: enable compiler check for printk format types Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- arch/x86/mm.c | 22 +++++++++++----------- arch/x86/sched.c | 4 ++-- arch/x86/traps.c | 18 +++++++++--------- blkfront.c | 2 +- include/console.h | 4 ++-- lib/sys.c | 4 ++-- lwip-arch.c | 5 +++-- minios.mk | 2 +- mm.c | 6 +++++- netfront.c | 4 ++-- sched.c | 2 +- test.c | 6 ++++-- tpm_tis.c | 8 ++++---- xenbus/xenbus.c | 4 ++-- 14 files changed, 49 insertions(+), 42 deletions(-) diff --git a/arch/x86/mm.c b/arch/x86/mm.c index 9c6d1b8..186659d 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -94,7 +94,7 @@ static void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, break; #endif default: - printk("new_pt_frame() called with invalid level number %d\n", level); + printk("new_pt_frame() called with invalid level number %lu\n", level); do_exit(); break; } @@ -181,7 +181,7 @@ static int need_pt_frame(unsigned long va, int level) if ( level == L1_FRAME ) return 1; - printk("ERROR: Unknown frame level %d, hypervisor %llx,%llx\n", + printk("ERROR: Unknown frame level %d, hypervisor %lx,%lx\n", level, hyp_virt_start, hyp_virt_end); return -1; } @@ -206,11 +206,11 @@ static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) if ( *max_pfn >= virt_to_pfn(HYPERVISOR_VIRT_START) ) { printk("WARNING: Mini-OS trying to use Xen virtual space. " - "Truncating memory from %dMB to ", + "Truncating memory from %luMB to ", ((unsigned long)pfn_to_virt(*max_pfn) - (unsigned long)&_text)>>20); *max_pfn = virt_to_pfn(HYPERVISOR_VIRT_START - PAGE_SIZE); - printk("%dMB\n", + printk("%luMB\n", ((unsigned long)pfn_to_virt(*max_pfn) - (unsigned long)&_text)>>20); } @@ -326,7 +326,7 @@ static void set_readonly(void *text, void *etext) count++; } else - printk("skipped %p\n", start_address); + printk("skipped %lx\n", start_address); start_address += PAGE_SIZE; @@ -369,21 +369,21 @@ int mem_test(unsigned long *start_va, unsigned long *end_va, int verbose) /* write values and print page walks */ if ( verbose && (((unsigned long)start_va) & 0xfffff) ) { - printk("MemTest Start: 0x%lx\n", start_va); + printk("MemTest Start: 0x%p\n", start_va); page_walk((unsigned long)start_va); } for ( pointer = start_va; pointer < end_va; pointer++ ) { if ( verbose && !(((unsigned long)pointer) & 0xfffff) ) { - printk("Writing to %lx\n", pointer); + printk("Writing to %p\n", pointer); page_walk((unsigned long)pointer); } *pointer = (unsigned long)pointer & ~mask; } if ( verbose && (((unsigned long)end_va) & 0xfffff) ) { - printk("MemTest End: %lx\n", end_va-1); + printk("MemTest End: %p\n", end_va-1); page_walk((unsigned long)end_va-1); } @@ -516,7 +516,7 @@ void arch_init_demand_mapping_area(unsigned long cur_pfn) demand_map_area_start = (unsigned long) pfn_to_virt(cur_pfn); cur_pfn += DEMAND_MAP_PAGES; - printk("Demand map pfns at %lx-%lx.\n", + printk("Demand map pfns at %lx-%p.\n", demand_map_area_start, pfn_to_virt(cur_pfn)); #ifdef HAVE_LIBC @@ -619,7 +619,7 @@ void do_map_frames(unsigned long va, if (err) err[done * stride] = rc; else { - printk("Map %ld (%lx, ...) at %p failed: %d.\n", + printk("Map %ld (%lx, ...) at %lx failed: %d.\n", todo, mfns[done * stride] + done * incr, va, rc); do_exit(); } @@ -793,7 +793,7 @@ unsigned long alloc_contig_pages(int order, unsigned int addr_bits) out_frames = virt_to_pfn(in_va); /* PFNs to populate */ ret = HYPERVISOR_memory_op(XENMEM_exchange, &exchange); if ( ret ) { - printk("mem exchanged order=0x%x failed with rc=%d, nr_exchanged=%d\n", + printk("mem exchanged order=0x%x failed with rc=%d, nr_exchanged=%lu\n", order, ret, exchange.nr_exchanged); /* we still need to return the allocated pages above to the pool * ie. map them back into the 1:1 mapping etc. so we continue but diff --git a/arch/x86/sched.c b/arch/x86/sched.c index e4a3dc2..ec13694 100644 --- a/arch/x86/sched.c +++ b/arch/x86/sched.c @@ -73,7 +73,7 @@ void dump_stack(struct thread *thread) printk("The stack for \"%s\"\n", thread->name); for(count = 0; count < 25 && pointer < bottom; count ++) { - printk("[0x%lx] 0x%lx\n", pointer, *pointer); + printk("[0x%p] 0x%lx\n", pointer, *pointer); pointer++; } @@ -101,7 +101,7 @@ struct thread* arch_create_thread(char *name, void (*function)(void *), /* We can't use lazy allocation here since the trap handler runs on the stack */ thread->stack = (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); thread->name = name; - printk("Thread \"%s\": pointer: 0x%lx, stack: 0x%lx\n", name, thread, + printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, thread->stack); thread->sp = (unsigned long)thread->stack + STACK_SIZE; diff --git a/arch/x86/traps.c b/arch/x86/traps.c index 516d133..6353718 100644 --- a/arch/x86/traps.c +++ b/arch/x86/traps.c @@ -34,14 +34,14 @@ void dump_regs(struct pt_regs *regs) { printk("Thread: %s\n", current->name); #ifdef __i386__ - printk("EIP: %x, EFLAGS %x.\n", regs->eip, regs->eflags); - printk("EBX: %08x ECX: %08x EDX: %08x\n", + printk("EIP: %lx, EFLAGS %lx.\n", regs->eip, regs->eflags); + printk("EBX: %08lx ECX: %08lx EDX: %08lx\n", regs->ebx, regs->ecx, regs->edx); - printk("ESI: %08x EDI: %08x EBP: %08x EAX: %08x\n", + printk("ESI: %08lx EDI: %08lx EBP: %08lx EAX: %08lx\n", regs->esi, regs->edi, regs->ebp, regs->eax); - printk("DS: %04x ES: %04x orig_eax: %08x, eip: %08x\n", + printk("DS: %04x ES: %04x orig_eax: %08lx, eip: %08lx\n", regs->xds, regs->xes, regs->orig_eax, regs->eip); - printk("CS: %04x EFLAGS: %08x esp: %08x ss: %04x\n", + printk("CS: %04x EFLAGS: %08lx esp: %08lx ss: %04x\n", regs->xcs, regs->eflags, regs->esp, regs->xss); #else printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip); @@ -214,10 +214,10 @@ void do_page_fault(struct pt_regs *regs, unsigned long error_code) barrier(); #if defined(__x86_64__) - printk("Page fault at linear address %p, rip %p, regs %p, sp %p, our_sp %p, code %lx\n", + printk("Page fault at linear address %lx, rip %lx, regs %p, sp %lx, our_sp %p, code %lx\n", addr, regs->rip, regs, regs->rsp, &addr, error_code); #else - printk("Page fault at linear address %p, eip %p, regs %p, sp %p, our_sp %p, code %lx\n", + printk("Page fault at linear address %lx, eip %lx, regs %p, sp %lx, our_sp %p, code %lx\n", addr, regs->eip, regs, regs->esp, &addr, error_code); #endif @@ -243,9 +243,9 @@ void do_general_protection(struct pt_regs *regs, long error_code) { struct sched_shutdown sched_shutdown = { .reason = SHUTDOWN_crash }; #ifdef __i386__ - printk("GPF eip: %p, error_code=%lx\n", regs->eip, error_code); + printk("GPF eip: %lx, error_code=%lx\n", regs->eip, error_code); #else - printk("GPF rip: %p, error_code=%lx\n", regs->rip, error_code); + printk("GPF rip: %lx, error_code=%lx\n", regs->rip, error_code); #endif dump_regs(regs); #if defined(__x86_64__) diff --git a/blkfront.c b/blkfront.c index 59e576f..bdb7765 100644 --- a/blkfront.c +++ b/blkfront.c @@ -236,7 +236,7 @@ done: } unmask_evtchn(dev->evtchn); - printk("%u sectors of %u bytes\n", dev->info.sectors, dev->info.sector_size); + printk("%lu sectors of %u bytes\n", (unsigned long) dev->info.sectors, dev->info.sector_size); printk("**************************\n"); return dev; diff --git a/include/console.h b/include/console.h index 3755b66..a77f47f 100644 --- a/include/console.h +++ b/include/console.h @@ -64,8 +64,8 @@ struct consfront_dev { void print(int direct, const char *fmt, va_list args); -void printk(const char *fmt, ...); -void xprintk(const char *fmt, ...); +void printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); +void xprintk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); #define tprintk(_fmt, _args...) printk("[%s] " _fmt, current->name, ##_args) diff --git a/lib/sys.c b/lib/sys.c index 13e7e59..f8d7a7c 100644 --- a/lib/sys.c +++ b/lib/sys.c @@ -1319,7 +1319,7 @@ int clock_gettime(clockid_t clk_id, struct timespec *tp) break; } default: - print_unsupported("clock_gettime(%d)", clk_id); + print_unsupported("clock_gettime(%ld)", (long) clk_id); errno = EINVAL; return -1; } @@ -1421,7 +1421,7 @@ void sparse(unsigned long data, size_t size) mfns[i] = virtual_to_mfn(data + i * PAGE_SIZE); } - printk("sparsing %ldMB at %lx\n", size >> 20, data); + printk("sparsing %ldMB at %lx\n", ((long) size) >> 20, data); munmap((void *) data, size); free_physical_pages(mfns, n); diff --git a/lwip-arch.c b/lwip-arch.c index e634ef4..154617b 100644 --- a/lwip-arch.c +++ b/lwip-arch.c @@ -236,8 +236,9 @@ sys_thread_t sys_thread_new(char *name, void (* thread)(void *arg), void *arg, i { struct thread *t; if (stacksize > STACK_SIZE) { - printk("Can't start lwIP thread: stack size %d is too large for our %d\n", stacksize, STACK_SIZE); - do_exit(); + printk("Can't start lwIP thread: stack size %d is too large for our %lu\n", + stacksize, (unsigned long) STACK_SIZE); + do_exit(); } lwip_thread = t = create_thread(name, thread, arg); return t; diff --git a/minios.mk b/minios.mk index b0d9f71..e042027 100644 --- a/minios.mk +++ b/minios.mk @@ -6,7 +6,7 @@ debug = y # Define some default flags. # NB. '-Wcast-qual' is nasty, so I omitted it. -DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls +DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls -Wformat DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline diff --git a/mm.c b/mm.c index 64b3292..31aaf83 100644 --- a/mm.c +++ b/mm.c @@ -379,7 +379,11 @@ void *sbrk(ptrdiff_t increment) unsigned long new_brk = old_brk + increment; if (new_brk > heap_end) { - printk("Heap exhausted: %p + %lx = %p > %p\n", old_brk, increment, new_brk, heap_end); + printk("Heap exhausted: %lx + %lx = %p > %p\n", + old_brk, + (unsigned long) increment, + (void *) new_brk, + (void *) heap_end); return NULL; } diff --git a/netfront.c b/netfront.c index 42bb103..0eca5b5 100644 --- a/netfront.c +++ b/netfront.c @@ -325,8 +325,8 @@ struct netfront_dev *init_netfront(char *_nodename, void (*thenetif_rx)(unsigned dev->fd = -1; #endif - printk("net TX ring size %d\n", NET_TX_RING_SIZE); - printk("net RX ring size %d\n", NET_RX_RING_SIZE); + printk("net TX ring size %lu\n", (unsigned long) NET_TX_RING_SIZE); + printk("net RX ring size %lu\n", (unsigned long) NET_RX_RING_SIZE); init_SEMAPHORE(&dev->tx_sem, NET_TX_RING_SIZE); for(i=0;idata; if (ret) - printk("got error code %d when reading at offset %ld\n", ret, aiocb->aio_offset); + printk("got error code %d when reading at offset %ld\n", ret, (long) aiocb->aio_offset); else blk_size_read += blk_info.sector_size; free(aiocb->aio_buf); @@ -250,7 +250,9 @@ static void blkfront_thread(void *p) blkfront_aio_poll(blk_dev); gettimeofday(&tv, NULL); if (tv.tv_sec > lasttime + 10) { - printk("%llu read, %llu write\n", blk_size_read, blk_size_write); + printk("%llu read, %llu write\n", + (unsigned long long) blk_size_read, + (unsigned long long) blk_size_write); lasttime = tv.tv_sec; } diff --git a/tpm_tis.c b/tpm_tis.c index debcc43..98fe837 100644 --- a/tpm_tis.c +++ b/tpm_tis.c @@ -912,7 +912,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const uint8_t *buf, //down(&chip->tpm_mutex); if ((rc = tpm_tis_send(chip, (uint8_t *) buf, count)) < 0) { - printk("tpm_transmit: tpm_send: error %ld\n", rc); + printk("tpm_transmit: tpm_send: error %ld\n", (long) rc); goto out; } @@ -944,7 +944,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const uint8_t *buf, out_recv: if((rc = tpm_tis_recv(chip, (uint8_t *) buf, bufsiz)) < 0) { - printk("tpm_transmit: tpm_recv: error %d\n", rc); + printk("tpm_transmit: tpm_recv: error %d\n", (int) rc); } out: //up(&chip->tpm_mutex); @@ -983,7 +983,7 @@ int tpm_get_timeouts(struct tpm_chip *chip) if((rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, "attempting to determine the timeouts")) != 0) { - printk("transmit failed %d\n", rc); + printk("transmit failed %d\n", (int) rc); goto duration; } @@ -1145,7 +1145,7 @@ struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned i if(locality_enabled(tpm, i)) { /* Map the page in now */ if((tpm->pages[i] = ioremap_nocache(addr, PAGE_SIZE)) == NULL) { - printk("Unable to map iomem page a address %p\n", addr); + printk("Unable to map iomem page a address %lx\n", addr); goto abort_egress; } diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c index 934f23b..4613ed6 100644 --- a/xenbus/xenbus.c +++ b/xenbus/xenbus.c @@ -337,8 +337,8 @@ void init_xenbus(void) xenbus_evtchn_handler, NULL); unmask_evtchn(start_info.store_evtchn); - printk("xenbus initialised on irq %d mfn %#lx\n", - err, start_info.store_mfn); + printk("xenbus initialised on irq %d mfn %#llx\n", + err, (unsigned long long) start_info.store_mfn); } void fini_xenbus(void) -- generated by git-patchbot for /home/xen/git/mini-os.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 Jun 26 06:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N1c-0004u7-PR; Fri, 26 Jun 2015 06: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 1Z8N1b-0004tz-64 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:07 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 24/9B-18676-E8FEC855; Fri, 26 Jun 2015 06:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1435299725!19237352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2042 invoked from network); 26 Jun 2015 06:22:05 -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; 26 Jun 2015 06:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N1Y-0008PS-SQ for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N1Y-00073X-9n for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:04 +0000 Date: Fri, 26 Jun 2015 06:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: fold host PCI command register 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 ec82a546d2e22729aa3dfa3f1707490dba2ef3a7 Author: Jan Beulich AuthorDate: Fri May 15 13:46:11 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:31:44 2015 +0000 xen/pass-through: fold host PCI command register writes The code introduced to address XSA-126 allows simplification of other code in xen_pt_initfn(): All we need to do is update "cmd" suitably, as it'll be written back to the host register near the end of the function anyway. upstream-commit-id: 950fe0aa3f55ad6bb135fc9cde9ebf4df05f62fc Signed-off-by: Stefano Stabellini Signed-off-by: Jan Beulich --- hw/xen/xen_pt.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 9d2b06b..f91b7cd 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -740,10 +740,7 @@ static int xen_pt_initfn(PCIDevice *d) machine_irq, pirq, rc); /* Disable PCI intx assertion (turn on bit10 of devctl) */ - xen_host_pci_set_word(&s->real_device, - PCI_COMMAND, - pci_get_word(s->dev.config + PCI_COMMAND) - | PCI_COMMAND_INTX_DISABLE); + cmd |= PCI_COMMAND_INTX_DISABLE; machine_irq = 0; s->machine_irq = 0; } else { @@ -765,9 +762,7 @@ static int xen_pt_initfn(PCIDevice *d) e_intx, rc); /* Disable PCI intx assertion (turn on bit10 of devctl) */ - xen_host_pci_set_word(&s->real_device, PCI_COMMAND, - *(uint16_t *)(&s->dev.config[PCI_COMMAND]) - | PCI_COMMAND_INTX_DISABLE); + cmd |= PCI_COMMAND_INTX_DISABLE; xen_pt_mapped_machine_irq[machine_irq]--; if (xen_pt_mapped_machine_irq[machine_irq] == 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 Fri Jun 26 06:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N1c-0004u7-PR; Fri, 26 Jun 2015 06: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 1Z8N1b-0004tz-64 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:07 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 24/9B-18676-E8FEC855; Fri, 26 Jun 2015 06:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1435299725!19237352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2042 invoked from network); 26 Jun 2015 06:22:05 -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; 26 Jun 2015 06:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N1Y-0008PS-SQ for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N1Y-00073X-9n for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:04 +0000 Date: Fri, 26 Jun 2015 06:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: fold host PCI command register 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 ec82a546d2e22729aa3dfa3f1707490dba2ef3a7 Author: Jan Beulich AuthorDate: Fri May 15 13:46:11 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:31:44 2015 +0000 xen/pass-through: fold host PCI command register writes The code introduced to address XSA-126 allows simplification of other code in xen_pt_initfn(): All we need to do is update "cmd" suitably, as it'll be written back to the host register near the end of the function anyway. upstream-commit-id: 950fe0aa3f55ad6bb135fc9cde9ebf4df05f62fc Signed-off-by: Stefano Stabellini Signed-off-by: Jan Beulich --- hw/xen/xen_pt.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 9d2b06b..f91b7cd 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -740,10 +740,7 @@ static int xen_pt_initfn(PCIDevice *d) machine_irq, pirq, rc); /* Disable PCI intx assertion (turn on bit10 of devctl) */ - xen_host_pci_set_word(&s->real_device, - PCI_COMMAND, - pci_get_word(s->dev.config + PCI_COMMAND) - | PCI_COMMAND_INTX_DISABLE); + cmd |= PCI_COMMAND_INTX_DISABLE; machine_irq = 0; s->machine_irq = 0; } else { @@ -765,9 +762,7 @@ static int xen_pt_initfn(PCIDevice *d) e_intx, rc); /* Disable PCI intx assertion (turn on bit10 of devctl) */ - xen_host_pci_set_word(&s->real_device, PCI_COMMAND, - *(uint16_t *)(&s->dev.config[PCI_COMMAND]) - | PCI_COMMAND_INTX_DISABLE); + cmd |= PCI_COMMAND_INTX_DISABLE; xen_pt_mapped_machine_irq[machine_irq]--; if (xen_pt_mapped_machine_irq[machine_irq] == 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 Fri Jun 26 06:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N1m-0004ur-T6; Fri, 26 Jun 2015 06: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 1Z8N1l-0004uh-Ju for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:17 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 13/E8-02952-89FEC855; Fri, 26 Jun 2015 06:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435299735!19982630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26004 invoked from network); 26 Jun 2015 06:22:16 -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; 26 Jun 2015 06:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N1j-0008PW-2D for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N1i-00074R-VI for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:14 +0000 Date: Fri, 26 Jun 2015 06:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: ROM BAR handling adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d57892188f8c003b754688740015d3e02872e21 Author: Jan Beulich AuthorDate: Mon Jun 8 14:11:51 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:10 2015 +0000 xen/pass-through: ROM BAR handling adjustments Expecting the ROM BAR to be written with an all ones value when sizing the region is wrong - the low bit has another meaning (enable/disable) and bits 1..10 are reserved. The PCI spec also mandates writing all ones to just the address portion of the register. Use suitable constants also for initializing the ROM BAR register field description. upstream-commit-id: 69976894c1d91c4b0c985fa05936cb6b8d01382b Signed-off-by: Stefano Stabellini Signed-off-by: Jan Beulich --- hw/xen/xen_pt.c | 16 ++++++++++++---- hw/xen/xen_pt_config_init.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f91b7cd..efb158f 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -249,10 +249,18 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, /* check unused BAR register */ index = xen_pt_bar_offset_to_index(addr); - if ((index >= 0) && (val > 0 && val < XEN_PT_BAR_ALLF) && - (s->bases[index].bar_flag == XEN_PT_BAR_FLAG_UNUSED)) { - XEN_PT_WARN(d, "Guest attempt to set address to unused Base Address " - "Register. (addr: 0x%02x, len: %d)\n", addr, len); + if ((index >= 0) && (val != 0)) { + uint32_t chk = val; + + if (index == PCI_ROM_SLOT) + chk |= (uint32_t)~PCI_ROM_ADDRESS_MASK; + + if ((chk != XEN_PT_BAR_ALLF) && + (s->bases[index].bar_flag == XEN_PT_BAR_FLAG_UNUSED)) { + XEN_PT_WARN(d, "Guest attempt to set address to unused " + "Base Address Register. (addr: 0x%02x, len: %d)\n", + addr, len); + } } /* find register group entry */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 25f53d9..728797e 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -731,8 +731,8 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = { .offset = PCI_ROM_ADDRESS, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x000007FE, - .emu_mask = 0xFFFFF800, + .ro_mask = ~PCI_ROM_ADDRESS_MASK & ~PCI_ROM_ADDRESS_ENABLE, + .emu_mask = (uint32_t)PCI_ROM_ADDRESS_MASK, .init = xen_pt_bar_reg_init, .u.dw.read = xen_pt_long_reg_read, .u.dw.write = xen_pt_exp_rom_bar_reg_write, -- 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 Jun 26 06:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N1m-0004ur-T6; Fri, 26 Jun 2015 06: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 1Z8N1l-0004uh-Ju for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:17 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 13/E8-02952-89FEC855; Fri, 26 Jun 2015 06:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435299735!19982630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26004 invoked from network); 26 Jun 2015 06:22:16 -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; 26 Jun 2015 06:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N1j-0008PW-2D for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N1i-00074R-VI for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:14 +0000 Date: Fri, 26 Jun 2015 06:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: ROM BAR handling adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d57892188f8c003b754688740015d3e02872e21 Author: Jan Beulich AuthorDate: Mon Jun 8 14:11:51 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:10 2015 +0000 xen/pass-through: ROM BAR handling adjustments Expecting the ROM BAR to be written with an all ones value when sizing the region is wrong - the low bit has another meaning (enable/disable) and bits 1..10 are reserved. The PCI spec also mandates writing all ones to just the address portion of the register. Use suitable constants also for initializing the ROM BAR register field description. upstream-commit-id: 69976894c1d91c4b0c985fa05936cb6b8d01382b Signed-off-by: Stefano Stabellini Signed-off-by: Jan Beulich --- hw/xen/xen_pt.c | 16 ++++++++++++---- hw/xen/xen_pt_config_init.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f91b7cd..efb158f 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -249,10 +249,18 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, /* check unused BAR register */ index = xen_pt_bar_offset_to_index(addr); - if ((index >= 0) && (val > 0 && val < XEN_PT_BAR_ALLF) && - (s->bases[index].bar_flag == XEN_PT_BAR_FLAG_UNUSED)) { - XEN_PT_WARN(d, "Guest attempt to set address to unused Base Address " - "Register. (addr: 0x%02x, len: %d)\n", addr, len); + if ((index >= 0) && (val != 0)) { + uint32_t chk = val; + + if (index == PCI_ROM_SLOT) + chk |= (uint32_t)~PCI_ROM_ADDRESS_MASK; + + if ((chk != XEN_PT_BAR_ALLF) && + (s->bases[index].bar_flag == XEN_PT_BAR_FLAG_UNUSED)) { + XEN_PT_WARN(d, "Guest attempt to set address to unused " + "Base Address Register. (addr: 0x%02x, len: %d)\n", + addr, len); + } } /* find register group entry */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 25f53d9..728797e 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -731,8 +731,8 @@ static XenPTRegInfo xen_pt_emu_reg_header0[] = { .offset = PCI_ROM_ADDRESS, .size = 4, .init_val = 0x00000000, - .ro_mask = 0x000007FE, - .emu_mask = 0xFFFFF800, + .ro_mask = ~PCI_ROM_ADDRESS_MASK & ~PCI_ROM_ADDRESS_ENABLE, + .emu_mask = (uint32_t)PCI_ROM_ADDRESS_MASK, .init = xen_pt_bar_reg_init, .u.dw.read = xen_pt_long_reg_read, .u.dw.write = xen_pt_exp_rom_bar_reg_write, -- 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 Jun 26 06:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N1w-0004wQ-BI; Fri, 26 Jun 2015 06: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 1Z8N1v-0004wH-Su for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:28 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 83/8F-13517-3AFEC855; Fri, 26 Jun 2015 06:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435299745!19982679!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28501 invoked from network); 26 Jun 2015 06:22:26 -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; 26 Jun 2015 06:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N1t-0008Pi-9J for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N1t-00074p-4z for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:25 +0000 Date: Fri, 26 Jun 2015 06:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: log errno values rather than function return ones X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76403ddf6f06602787e395070eadaa38063b870f Author: Jan Beulich AuthorDate: Fri Jun 5 13:04:18 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:22 2015 +0000 xen/pass-through: log errno values rather than function return ones Functions setting errno commonly return just -1, which is of no particular use in the log file. upstream-commit-id: 3782f60d2047cb86567889307ce78baacf518635 Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.c | 26 +++++++++++++------------- hw/xen/xen_pt_msi.c | 24 ++++++++++++------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index efb158f..1253635 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -615,8 +615,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s, guest_port, machine_port, size, op); if (rc) { - XEN_PT_ERR(d, "%s ioport mapping failed! (rc: %i)\n", - adding ? "create new" : "remove old", rc); + XEN_PT_ERR(d, "%s ioport mapping failed! (err: %i)\n", + adding ? "create new" : "remove old", errno); } } else { pcibus_t guest_addr = sec->offset_within_address_space; @@ -629,8 +629,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s, XEN_PFN(size + XC_PAGE_SIZE - 1), op); if (rc) { - XEN_PT_ERR(d, "%s mem mapping failed! (rc: %i)\n", - adding ? "create new" : "remove old", rc); + XEN_PT_ERR(d, "%s mem mapping failed! (err: %i)\n", + adding ? "create new" : "remove old", errno); } } } @@ -744,8 +744,8 @@ static int xen_pt_initfn(PCIDevice *d) rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq); if (rc < 0) { - XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (rc: %d)\n", - machine_irq, pirq, rc); + XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (err: %d)\n", + machine_irq, pirq, errno); /* Disable PCI intx assertion (turn on bit10 of devctl) */ cmd |= PCI_COMMAND_INTX_DISABLE; @@ -766,8 +766,8 @@ static int xen_pt_initfn(PCIDevice *d) PCI_SLOT(d->devfn), e_intx); if (rc < 0) { - XEN_PT_ERR(d, "Binding of interrupt %i failed! (rc: %d)\n", - e_intx, rc); + XEN_PT_ERR(d, "Binding of interrupt %i failed! (err: %d)\n", + e_intx, errno); /* Disable PCI intx assertion (turn on bit10 of devctl) */ cmd |= PCI_COMMAND_INTX_DISABLE; @@ -776,7 +776,7 @@ static int xen_pt_initfn(PCIDevice *d) if (xen_pt_mapped_machine_irq[machine_irq] == 0) { if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) { XEN_PT_ERR(d, "Unmapping of machine interrupt %i failed!" - " (rc: %d)\n", machine_irq, rc); + " (err: %d)\n", machine_irq, errno); } } s->machine_irq = 0; @@ -814,9 +814,9 @@ static void xen_pt_unregister_device(PCIDevice *d) 0 /* isa_irq */); if (rc < 0) { XEN_PT_ERR(d, "unbinding of interrupt INT%c failed." - " (machine irq: %i, rc: %d)" + " (machine irq: %i, err: %d)" " But bravely continuing on..\n", - 'a' + intx, machine_irq, rc); + 'a' + intx, machine_irq, errno); } } @@ -834,9 +834,9 @@ static void xen_pt_unregister_device(PCIDevice *d) rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); if (rc < 0) { - XEN_PT_ERR(d, "unmapping of interrupt %i failed. (rc: %d)" + XEN_PT_ERR(d, "unmapping of interrupt %i failed. (err: %d)" " But bravely continuing on..\n", - machine_irq, rc); + machine_irq, errno); } } } diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 68db623..263e051 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -132,8 +132,8 @@ static int msi_msix_setup(XenPCIPassthroughState *s, msix_entry, table_base); if (rc) { XEN_PT_ERR(&s->dev, - "Mapping of MSI%s (rc: %i, vec: %#x, entry %#x)\n", - is_msix ? "-X" : "", rc, gvec, msix_entry); + "Mapping of MSI%s (err: %i, vec: %#x, entry %#x)\n", + is_msix ? "-X" : "", errno, gvec, msix_entry); return rc; } } @@ -166,12 +166,12 @@ static int msi_msix_update(XenPCIPassthroughState *s, pirq, gflags, table_addr); if (rc) { - XEN_PT_ERR(d, "Updating of MSI%s failed. (rc: %d)\n", - is_msix ? "-X" : "", rc); + XEN_PT_ERR(d, "Updating of MSI%s failed. (err: %d)\n", + is_msix ? "-X" : "", errno); if (xc_physdev_unmap_pirq(xen_xc, xen_domid, *old_pirq)) { - XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed.\n", - is_msix ? "-X" : "", *old_pirq); + XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %d)\n", + is_msix ? "-X" : "", *old_pirq, errno); } *old_pirq = XEN_PT_UNASSIGNED_PIRQ; } @@ -199,8 +199,8 @@ static int msi_msix_disable(XenPCIPassthroughState *s, is_msix ? "-X" : "", pirq, gvec); rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags); if (rc) { - XEN_PT_ERR(d, "Unbinding of MSI%s failed. (pirq: %d, gvec: %#x)\n", - is_msix ? "-X" : "", pirq, gvec); + XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, gvec: %#x)\n", + is_msix ? "-X" : "", errno, pirq, gvec); return rc; } } @@ -208,8 +208,8 @@ static int msi_msix_disable(XenPCIPassthroughState *s, XEN_PT_LOG(d, "Unmap MSI%s pirq %d\n", is_msix ? "-X" : "", pirq); rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, pirq); if (rc) { - XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (rc: %i)\n", - is_msix ? "-X" : "", pirq, rc); + XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %i)\n", + is_msix ? "-X" : "", pirq, errno); return rc; } @@ -385,8 +385,8 @@ int xen_pt_msix_update_remap(XenPCIPassthroughState *s, int bar_index) ret = xc_domain_unbind_pt_irq(xen_xc, xen_domid, entry->pirq, PT_IRQ_TYPE_MSI, 0, 0, 0, 0); if (ret) { - XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed\n", - entry->pirq); + XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed (err: %d)\n", + entry->pirq, errno); } entry->updated = true; } -- 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 Jun 26 06:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N1w-0004wQ-BI; Fri, 26 Jun 2015 06: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 1Z8N1v-0004wH-Su for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:28 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 83/8F-13517-3AFEC855; Fri, 26 Jun 2015 06:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435299745!19982679!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28501 invoked from network); 26 Jun 2015 06:22:26 -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; 26 Jun 2015 06:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N1t-0008Pi-9J for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N1t-00074p-4z for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:25 +0000 Date: Fri, 26 Jun 2015 06:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: log errno values rather than function return ones X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76403ddf6f06602787e395070eadaa38063b870f Author: Jan Beulich AuthorDate: Fri Jun 5 13:04:18 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:22 2015 +0000 xen/pass-through: log errno values rather than function return ones Functions setting errno commonly return just -1, which is of no particular use in the log file. upstream-commit-id: 3782f60d2047cb86567889307ce78baacf518635 Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.c | 26 +++++++++++++------------- hw/xen/xen_pt_msi.c | 24 ++++++++++++------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index efb158f..1253635 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -615,8 +615,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s, guest_port, machine_port, size, op); if (rc) { - XEN_PT_ERR(d, "%s ioport mapping failed! (rc: %i)\n", - adding ? "create new" : "remove old", rc); + XEN_PT_ERR(d, "%s ioport mapping failed! (err: %i)\n", + adding ? "create new" : "remove old", errno); } } else { pcibus_t guest_addr = sec->offset_within_address_space; @@ -629,8 +629,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s, XEN_PFN(size + XC_PAGE_SIZE - 1), op); if (rc) { - XEN_PT_ERR(d, "%s mem mapping failed! (rc: %i)\n", - adding ? "create new" : "remove old", rc); + XEN_PT_ERR(d, "%s mem mapping failed! (err: %i)\n", + adding ? "create new" : "remove old", errno); } } } @@ -744,8 +744,8 @@ static int xen_pt_initfn(PCIDevice *d) rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq); if (rc < 0) { - XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (rc: %d)\n", - machine_irq, pirq, rc); + XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (err: %d)\n", + machine_irq, pirq, errno); /* Disable PCI intx assertion (turn on bit10 of devctl) */ cmd |= PCI_COMMAND_INTX_DISABLE; @@ -766,8 +766,8 @@ static int xen_pt_initfn(PCIDevice *d) PCI_SLOT(d->devfn), e_intx); if (rc < 0) { - XEN_PT_ERR(d, "Binding of interrupt %i failed! (rc: %d)\n", - e_intx, rc); + XEN_PT_ERR(d, "Binding of interrupt %i failed! (err: %d)\n", + e_intx, errno); /* Disable PCI intx assertion (turn on bit10 of devctl) */ cmd |= PCI_COMMAND_INTX_DISABLE; @@ -776,7 +776,7 @@ static int xen_pt_initfn(PCIDevice *d) if (xen_pt_mapped_machine_irq[machine_irq] == 0) { if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) { XEN_PT_ERR(d, "Unmapping of machine interrupt %i failed!" - " (rc: %d)\n", machine_irq, rc); + " (err: %d)\n", machine_irq, errno); } } s->machine_irq = 0; @@ -814,9 +814,9 @@ static void xen_pt_unregister_device(PCIDevice *d) 0 /* isa_irq */); if (rc < 0) { XEN_PT_ERR(d, "unbinding of interrupt INT%c failed." - " (machine irq: %i, rc: %d)" + " (machine irq: %i, err: %d)" " But bravely continuing on..\n", - 'a' + intx, machine_irq, rc); + 'a' + intx, machine_irq, errno); } } @@ -834,9 +834,9 @@ static void xen_pt_unregister_device(PCIDevice *d) rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); if (rc < 0) { - XEN_PT_ERR(d, "unmapping of interrupt %i failed. (rc: %d)" + XEN_PT_ERR(d, "unmapping of interrupt %i failed. (err: %d)" " But bravely continuing on..\n", - machine_irq, rc); + machine_irq, errno); } } } diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 68db623..263e051 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -132,8 +132,8 @@ static int msi_msix_setup(XenPCIPassthroughState *s, msix_entry, table_base); if (rc) { XEN_PT_ERR(&s->dev, - "Mapping of MSI%s (rc: %i, vec: %#x, entry %#x)\n", - is_msix ? "-X" : "", rc, gvec, msix_entry); + "Mapping of MSI%s (err: %i, vec: %#x, entry %#x)\n", + is_msix ? "-X" : "", errno, gvec, msix_entry); return rc; } } @@ -166,12 +166,12 @@ static int msi_msix_update(XenPCIPassthroughState *s, pirq, gflags, table_addr); if (rc) { - XEN_PT_ERR(d, "Updating of MSI%s failed. (rc: %d)\n", - is_msix ? "-X" : "", rc); + XEN_PT_ERR(d, "Updating of MSI%s failed. (err: %d)\n", + is_msix ? "-X" : "", errno); if (xc_physdev_unmap_pirq(xen_xc, xen_domid, *old_pirq)) { - XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed.\n", - is_msix ? "-X" : "", *old_pirq); + XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %d)\n", + is_msix ? "-X" : "", *old_pirq, errno); } *old_pirq = XEN_PT_UNASSIGNED_PIRQ; } @@ -199,8 +199,8 @@ static int msi_msix_disable(XenPCIPassthroughState *s, is_msix ? "-X" : "", pirq, gvec); rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags); if (rc) { - XEN_PT_ERR(d, "Unbinding of MSI%s failed. (pirq: %d, gvec: %#x)\n", - is_msix ? "-X" : "", pirq, gvec); + XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, gvec: %#x)\n", + is_msix ? "-X" : "", errno, pirq, gvec); return rc; } } @@ -208,8 +208,8 @@ static int msi_msix_disable(XenPCIPassthroughState *s, XEN_PT_LOG(d, "Unmap MSI%s pirq %d\n", is_msix ? "-X" : "", pirq); rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, pirq); if (rc) { - XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (rc: %i)\n", - is_msix ? "-X" : "", pirq, rc); + XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %i)\n", + is_msix ? "-X" : "", pirq, errno); return rc; } @@ -385,8 +385,8 @@ int xen_pt_msix_update_remap(XenPCIPassthroughState *s, int bar_index) ret = xc_domain_unbind_pt_irq(xen_xc, xen_domid, entry->pirq, PT_IRQ_TYPE_MSI, 0, 0, 0, 0); if (ret) { - XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed\n", - entry->pirq); + XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed (err: %d)\n", + entry->pirq, errno); } entry->updated = true; } -- 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 Jun 26 06:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N26-0004yd-Dp; Fri, 26 Jun 2015 06: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 1Z8N25-0004yT-Vm for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:38 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 2F/30-13047-DAFEC855; Fri, 26 Jun 2015 06:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1435299755!26852657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18764 invoked from network); 26 Jun 2015 06: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; 26 Jun 2015 06:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N23-0008Ps-Cp for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N23-00075u-Bi for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:35 +0000 Date: Fri, 26 Jun 2015 06:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: constify some static data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f0e7abf7120d997c28a0729fe71e0db7194c9199 Author: Jan Beulich AuthorDate: Fri Jun 5 13:04:55 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:30 2015 +0000 xen/pass-through: constify some static data This is done indirectly by adjusting two typedefs and helps emphasizing that the respective tables aren't supposed to be modified at runtime (as they may be shared between devices). upstream-commit-id: 74526eb01886ca45774c1e9c736f61536fa2bda1 Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.h | 8 ++++---- hw/xen/xen_pt_config_init.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 4bba559..232165a 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -31,7 +31,7 @@ void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3); /* Helper */ #define XEN_PFN(x) ((x) >> XC_PAGE_SHIFT) -typedef struct XenPTRegInfo XenPTRegInfo; +typedef const struct XenPTRegInfo XenPTRegInfo; typedef struct XenPTReg XenPTReg; typedef struct XenPCIPassthroughState XenPCIPassthroughState; @@ -133,11 +133,11 @@ struct XenPTReg { uint32_t data; /* emulated value */ }; -typedef struct XenPTRegGroupInfo XenPTRegGroupInfo; +typedef const struct XenPTRegGroupInfo XenPTRegGroupInfo; /* emul reg group size initialize method */ typedef int (*xen_pt_reg_size_init_fn) - (XenPCIPassthroughState *, const XenPTRegGroupInfo *, + (XenPCIPassthroughState *, XenPTRegGroupInfo *, uint32_t base_offset, uint8_t *size); /* emulated register group information */ @@ -152,7 +152,7 @@ struct XenPTRegGroupInfo { /* emul register group management table */ typedef struct XenPTRegGroup { QLIST_ENTRY(XenPTRegGroup) entries; - const XenPTRegGroupInfo *reg_grp; + XenPTRegGroupInfo *reg_grp; uint32_t base_offset; uint8_t size; QLIST_HEAD(, XenPTReg) reg_tbl_list; diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 728797e..67a59cb 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -96,8 +96,7 @@ XenPTReg *xen_pt_find_reg(XenPTRegGroup *reg_grp, uint32_t address) } static uint32_t get_throughable_mask(const XenPCIPassthroughState *s, - const XenPTRegInfo *reg, - uint32_t valid_mask) + XenPTRegInfo *reg, uint32_t valid_mask) { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); -- 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 Jun 26 06:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N26-0004yd-Dp; Fri, 26 Jun 2015 06: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 1Z8N25-0004yT-Vm for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:38 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 2F/30-13047-DAFEC855; Fri, 26 Jun 2015 06:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1435299755!26852657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18764 invoked from network); 26 Jun 2015 06: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; 26 Jun 2015 06:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N23-0008Ps-Cp for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N23-00075u-Bi for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:35 +0000 Date: Fri, 26 Jun 2015 06:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/pass-through: constify some static data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f0e7abf7120d997c28a0729fe71e0db7194c9199 Author: Jan Beulich AuthorDate: Fri Jun 5 13:04:55 2015 +0100 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:30 2015 +0000 xen/pass-through: constify some static data This is done indirectly by adjusting two typedefs and helps emphasizing that the respective tables aren't supposed to be modified at runtime (as they may be shared between devices). upstream-commit-id: 74526eb01886ca45774c1e9c736f61536fa2bda1 Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- hw/xen/xen_pt.h | 8 ++++---- hw/xen/xen_pt_config_init.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 4bba559..232165a 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -31,7 +31,7 @@ void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3); /* Helper */ #define XEN_PFN(x) ((x) >> XC_PAGE_SHIFT) -typedef struct XenPTRegInfo XenPTRegInfo; +typedef const struct XenPTRegInfo XenPTRegInfo; typedef struct XenPTReg XenPTReg; typedef struct XenPCIPassthroughState XenPCIPassthroughState; @@ -133,11 +133,11 @@ struct XenPTReg { uint32_t data; /* emulated value */ }; -typedef struct XenPTRegGroupInfo XenPTRegGroupInfo; +typedef const struct XenPTRegGroupInfo XenPTRegGroupInfo; /* emul reg group size initialize method */ typedef int (*xen_pt_reg_size_init_fn) - (XenPCIPassthroughState *, const XenPTRegGroupInfo *, + (XenPCIPassthroughState *, XenPTRegGroupInfo *, uint32_t base_offset, uint8_t *size); /* emulated register group information */ @@ -152,7 +152,7 @@ struct XenPTRegGroupInfo { /* emul register group management table */ typedef struct XenPTRegGroup { QLIST_ENTRY(XenPTRegGroup) entries; - const XenPTRegGroupInfo *reg_grp; + XenPTRegGroupInfo *reg_grp; uint32_t base_offset; uint8_t size; QLIST_HEAD(, XenPTReg) reg_tbl_list; diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 728797e..67a59cb 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -96,8 +96,7 @@ XenPTReg *xen_pt_find_reg(XenPTRegGroup *reg_grp, uint32_t address) } static uint32_t get_throughable_mask(const XenPCIPassthroughState *s, - const XenPTRegInfo *reg, - uint32_t valid_mask) + XenPTRegInfo *reg, uint32_t valid_mask) { uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); -- 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 Jun 26 06:22:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N2G-00050t-GX; Fri, 26 Jun 2015 06:22:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N2F-00050l-Ra for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:47 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id E4/FF-13517-7BFEC855; Fri, 26 Jun 2015 06:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1435299765!19957932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6353 invoked from network); 26 Jun 2015 06:22:46 -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; 26 Jun 2015 06:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N2D-0008Q0-GK for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N2D-00076J-FC for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:45 +0000 Date: Fri, 26 Jun 2015 06:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "xen-hvm: increase maxmem before calling xc_domain_populate_physmap" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4a962ec0c61aa9b860a3635c8424472e6c2cc2c Author: Stefano Stabellini AuthorDate: Mon Jun 22 13:00:42 2015 +0000 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:37 2015 +0000 Revert "xen-hvm: increase maxmem before calling xc_domain_populate_physmap" This reverts commit c1d322e6048796296555dd36fdd102d7fa2f50bf. The original commit fixes a bug when assigning a large number of devices which require option roms to a guest. (One known configuration that needs extra memory is having more than 4 emulated NICs assigned. Three or fewer NICs seems to work without this functionality.) However, by unilaterally increasing maxmem, it introduces two problems. First, now libxl's calculation of the required maxmem during migration is broken -- any guest which exercised this functionality will fail on migration. (Guests which have the default number of devices are not affected.) Secondly, it makes it impossible for a higher-level toolstack or administer to predict how much memory a VM will actually use, making it much more difficult to effectively use all of the memory on a machine. Signed-off-by: George Dunlap Signed-off-by: Stefano Stabellini --- xen-hvm.c | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 315864c..31cb3ca 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -87,12 +87,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) #endif #define BUFFER_IO_MAX_DELAY 100 -/* Leave some slack so that hvmloader does not complain about lack of - * memory at boot time ("Could not allocate order=0 extent"). - * Once hvmloader is modified to cope with that situation without - * printing warning messages, QEMU_SPARE_PAGES can be removed. - */ -#define QEMU_SPARE_PAGES 16 typedef struct XenPhysmap { hwaddr start_addr; @@ -250,8 +244,6 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) unsigned long nr_pfn; xen_pfn_t *pfn_list; int i; - xc_domaininfo_t info; - unsigned long free_pages; if (runstate_check(RUN_STATE_INMIGRATE)) { /* RAM already populated in Xen */ @@ -274,22 +266,6 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; } - if ((xc_domain_getinfolist(xen_xc, xen_domid, 1, &info) != 1) || - (info.domain != xen_domid)) { - hw_error("xc_domain_getinfolist failed"); - } - free_pages = info.max_pages - info.tot_pages; - if (free_pages > QEMU_SPARE_PAGES) { - free_pages -= QEMU_SPARE_PAGES; - } else { - free_pages = 0; - } - if ((free_pages < nr_pfn) && - (xc_domain_setmaxmem(xen_xc, xen_domid, - ((info.max_pages + nr_pfn - free_pages) - << (XC_PAGE_SHIFT - 10))) < 0)) { - hw_error("xc_domain_setmaxmem failed"); - } if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr); } -- 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 Jun 26 06:22:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 06: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 1Z8N2G-00050t-GX; Fri, 26 Jun 2015 06:22:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N2F-00050l-Ra for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:47 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id E4/FF-13517-7BFEC855; Fri, 26 Jun 2015 06:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1435299765!19957932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6353 invoked from network); 26 Jun 2015 06:22:46 -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; 26 Jun 2015 06:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8N2D-0008Q0-GK for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8N2D-00076J-FC for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 06:22:45 +0000 Date: Fri, 26 Jun 2015 06:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "xen-hvm: increase maxmem before calling xc_domain_populate_physmap" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4a962ec0c61aa9b860a3635c8424472e6c2cc2c Author: Stefano Stabellini AuthorDate: Mon Jun 22 13:00:42 2015 +0000 Commit: Stefano Stabellini CommitDate: Wed Jun 24 13:32:37 2015 +0000 Revert "xen-hvm: increase maxmem before calling xc_domain_populate_physmap" This reverts commit c1d322e6048796296555dd36fdd102d7fa2f50bf. The original commit fixes a bug when assigning a large number of devices which require option roms to a guest. (One known configuration that needs extra memory is having more than 4 emulated NICs assigned. Three or fewer NICs seems to work without this functionality.) However, by unilaterally increasing maxmem, it introduces two problems. First, now libxl's calculation of the required maxmem during migration is broken -- any guest which exercised this functionality will fail on migration. (Guests which have the default number of devices are not affected.) Secondly, it makes it impossible for a higher-level toolstack or administer to predict how much memory a VM will actually use, making it much more difficult to effectively use all of the memory on a machine. Signed-off-by: George Dunlap Signed-off-by: Stefano Stabellini --- xen-hvm.c | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 315864c..31cb3ca 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -87,12 +87,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) #endif #define BUFFER_IO_MAX_DELAY 100 -/* Leave some slack so that hvmloader does not complain about lack of - * memory at boot time ("Could not allocate order=0 extent"). - * Once hvmloader is modified to cope with that situation without - * printing warning messages, QEMU_SPARE_PAGES can be removed. - */ -#define QEMU_SPARE_PAGES 16 typedef struct XenPhysmap { hwaddr start_addr; @@ -250,8 +244,6 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) unsigned long nr_pfn; xen_pfn_t *pfn_list; int i; - xc_domaininfo_t info; - unsigned long free_pages; if (runstate_check(RUN_STATE_INMIGRATE)) { /* RAM already populated in Xen */ @@ -274,22 +266,6 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; } - if ((xc_domain_getinfolist(xen_xc, xen_domid, 1, &info) != 1) || - (info.domain != xen_domid)) { - hw_error("xc_domain_getinfolist failed"); - } - free_pages = info.max_pages - info.tot_pages; - if (free_pages > QEMU_SPARE_PAGES) { - free_pages -= QEMU_SPARE_PAGES; - } else { - free_pages = 0; - } - if ((free_pages < nr_pfn) && - (xc_domain_setmaxmem(xen_xc, xen_domid, - ((info.max_pages + nr_pfn - free_pages) - << (XC_PAGE_SHIFT - 10))) < 0)) { - hw_error("xc_domain_setmaxmem failed"); - } if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr); } -- 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 Jun 26 09:00:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 09:00: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 1Z8PUU-0001nv-Cb; Fri, 26 Jun 2015 09:00:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8PUT-0001no-Ir for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 09:00:05 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id C9/4E-32733-4941D855; Fri, 26 Jun 2015 09:00:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435309203!26803812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1831 invoked from network); 26 Jun 2015 09:00: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; 26 Jun 2015 09:00:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8PUQ-0002Cp-Ve for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 09:00:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8PUQ-0004jN-En for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 09:00:02 +0000 Date: Fri, 26 Jun 2015 09:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] 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 40feff8733e2ac27561a27e7c009a61ba3b320fe Author: Ian Jackson AuthorDate: Tue Jun 23 11:44:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:43 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 42012c7..c736d39 100644 --- a/Config.mk +++ b/Config.mk @@ -180,9 +180,9 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 2d4fa397ba0fbae0c62282de619e1f088a320b33 -# Mon Nov 11 13:42:56 2013 -0500 -# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. +QEMU_TAG ?= 77d9bdb27c4237a007ba93a6f159791eed317abc +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # Optional components XENSTAT_XENTOP ?= y -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 09:00:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 09:00: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 1Z8PUU-0001nv-Cb; Fri, 26 Jun 2015 09:00:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8PUT-0001no-Ir for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 09:00:05 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id C9/4E-32733-4941D855; Fri, 26 Jun 2015 09:00:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435309203!26803812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1831 invoked from network); 26 Jun 2015 09:00: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; 26 Jun 2015 09:00:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8PUQ-0002Cp-Ve for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 09:00:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8PUQ-0004jN-En for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 09:00:02 +0000 Date: Fri, 26 Jun 2015 09:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] 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 40feff8733e2ac27561a27e7c009a61ba3b320fe Author: Ian Jackson AuthorDate: Tue Jun 23 11:44:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:43 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 42012c7..c736d39 100644 --- a/Config.mk +++ b/Config.mk @@ -180,9 +180,9 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 2d4fa397ba0fbae0c62282de619e1f088a320b33 -# Mon Nov 11 13:42:56 2013 -0500 -# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. +QEMU_TAG ?= 77d9bdb27c4237a007ba93a6f159791eed317abc +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # Optional components XENSTAT_XENTOP ?= y -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 11:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 11:11: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 1Z8RXJ-0001cK-Ev; Fri, 26 Jun 2015 11:11:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8RXI-0001cC-9k for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 11:11:08 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 73/2F-18676-B433D855; Fri, 26 Jun 2015 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1435317065!26061930!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14531 invoked from network); 26 Jun 2015 11:11:06 -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; 26 Jun 2015 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8RXC-0003o7-Rw for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8RXC-0002CL-F7 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 11:11:02 +0000 Date: Fri, 26 Jun 2015 11:11:02 +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 e7c022977eb83822edb52919a3748ebfa5705b5d Author: Ian Jackson AuthorDate: Tue Jun 23 11:43:50 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:50 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 4debb6d..5e5d453 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 ?= 8fcecdca2dd1e6b4e78114977388ff0ddb85db20 -# Wed Jun 10 14:14:25 2015 +0100 -# xen/pt: unknown PCI config space fields should be read-only +QEMU_TAG ?= 8d882026216a2b9afe74d4b1ef99433620e0ba0a +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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 Fri Jun 26 11:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 11:11: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 1Z8RXJ-0001cK-Ev; Fri, 26 Jun 2015 11:11:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8RXI-0001cC-9k for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 11:11:08 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 73/2F-18676-B433D855; Fri, 26 Jun 2015 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1435317065!26061930!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14531 invoked from network); 26 Jun 2015 11:11:06 -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; 26 Jun 2015 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8RXC-0003o7-Rw for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8RXC-0002CL-F7 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 11:11:02 +0000 Date: Fri, 26 Jun 2015 11:11:02 +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 e7c022977eb83822edb52919a3748ebfa5705b5d Author: Ian Jackson AuthorDate: Tue Jun 23 11:43:50 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:50 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 4debb6d..5e5d453 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 ?= 8fcecdca2dd1e6b4e78114977388ff0ddb85db20 -# Wed Jun 10 14:14:25 2015 +0100 -# xen/pt: unknown PCI config space fields should be read-only +QEMU_TAG ?= 8d882026216a2b9afe74d4b1ef99433620e0ba0a +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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 Fri Jun 26 15:55:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8Vy8-0002H4-1x; Fri, 26 Jun 2015 15:55:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vy6-0002GW-M5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 8A/4A-19853-AD57D855; Fri, 26 Jun 2015 15:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1435334104!13829851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22014 invoked from network); 26 Jun 2015 15:55:05 -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; 26 Jun 2015 15:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vy4-0007DH-5L for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vy3-0004Hl-Mi for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:03 +0000 Date: Fri, 26 Jun 2015 15:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: EOI handling function adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e722f1de2c82af870ba1caeb4fa9db45de53f4c7 Author: Jan Beulich AuthorDate: Mon Jun 22 11:34:57 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:34:57 2015 +0200 x86/HVM: EOI handling function adjustments The vector parameters are more usefully u8 right away. This is particularly important for the vioapic_update_EOI() invocation from vioapic_write() (which luckily is only a latent issue, as VIOAPIC_VERSION_ID is still hard coded to 0x11 right now). But it at once allows simplifying VMX's EXIT_REASON_EOI_INDUCED handling (the kind of pointless helper function should have been static anyway; not being use for anything else, it gets removed altogether). Plus vlapic_handle_EOI() (now renamed for that purpose) can be used as the tail of vlapic_EOI_set() instead of duplicating that code. Finally replace a stray current->domain use in vlapic_handle_EOI(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vlapic.c | 13 ++++++------- xen/arch/x86/hvm/vmx/vmx.c | 20 +++----------------- xen/include/asm-x86/hvm/vioapic.h | 2 +- xen/include/asm-x86/hvm/vlapic.h | 2 +- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 1e48110..f903420 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -386,7 +386,7 @@ void vioapic_irq_positive_edge(struct domain *d, unsigned int irq) } } -void vioapic_update_EOI(struct domain *d, int vector) +void vioapic_update_EOI(struct domain *d, u8 vector) { struct hvm_hw_vioapic *vioapic = domain_vioapic(d); struct hvm_irq *hvm_irq = &d->arch.hvm_domain.irq; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 92b0fa8..fbc51d1 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -421,18 +421,17 @@ void vlapic_EOI_set(struct vlapic *vlapic) if ( hvm_funcs.handle_eoi ) hvm_funcs.handle_eoi(vector); - if ( vlapic_test_and_clear_vector(vector, &vlapic->regs->data[APIC_TMR]) ) - vioapic_update_EOI(vlapic_domain(vlapic), vector); - - hvm_dpci_msi_eoi(current->domain, vector); + vlapic_handle_EOI(vlapic, vector); } -void vlapic_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) +void vlapic_handle_EOI(struct vlapic *vlapic, u8 vector) { + struct domain *d = vlapic_domain(vlapic); + if ( vlapic_test_and_clear_vector(vector, &vlapic->regs->data[APIC_TMR]) ) - vioapic_update_EOI(vlapic_domain(vlapic), vector); + vioapic_update_EOI(d, vector); - hvm_dpci_msi_eoi(current->domain, vector); + hvm_dpci_msi_eoi(d, vector); } static bool_t is_multicast_dest(struct vlapic *vlapic, unsigned int short_hand, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0837627..fc29b89 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2683,17 +2683,6 @@ static int vmx_handle_apic_write(void) return vlapic_apicv_write(current, exit_qualification & 0xfff); } -/* - * When "Virtual Interrupt Delivery" is enabled, this function is used - * to handle EOI-induced VM exit - */ -void vmx_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) -{ - ASSERT(cpu_has_vmx_virtual_intr_delivery); - - vlapic_handle_EOI_induced_exit(vlapic, vector); -} - void vmx_vmexit_handler(struct cpu_user_regs *regs) { unsigned long exit_qualification, exit_reason, idtv_info, intr_info = 0; @@ -3127,15 +3116,12 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; case EXIT_REASON_EOI_INDUCED: - { - int vector; - __vmread(EXIT_QUALIFICATION, &exit_qualification); - vector = exit_qualification & 0xff; - vmx_handle_EOI_induced_exit(vcpu_vlapic(v), vector); + ASSERT(cpu_has_vmx_virtual_intr_delivery); + + vlapic_handle_EOI(vcpu_vlapic(v), exit_qualification); break; - } case EXIT_REASON_IO_INSTRUCTION: __vmread(EXIT_QUALIFICATION, &exit_qualification); diff --git a/xen/include/asm-x86/hvm/vioapic.h b/xen/include/asm-x86/hvm/vioapic.h index a18ffd0..6bf21e8 100644 --- a/xen/include/asm-x86/hvm/vioapic.h +++ b/xen/include/asm-x86/hvm/vioapic.h @@ -62,6 +62,6 @@ int vioapic_init(struct domain *d); void vioapic_deinit(struct domain *d); void vioapic_reset(struct domain *d); void vioapic_irq_positive_edge(struct domain *d, unsigned int irq); -void vioapic_update_EOI(struct domain *d, int vector); +void vioapic_update_EOI(struct domain *d, u8 vector); #endif /* __ASM_X86_HVM_VIOAPIC_H__ */ diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index cfe9bdb..bbcd196 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -127,7 +127,7 @@ uint32_t vlapic_set_ppr(struct vlapic *vlapic); void vlapic_adjust_i8259_target(struct domain *d); void vlapic_EOI_set(struct vlapic *vlapic); -void vlapic_handle_EOI_induced_exit(struct vlapic *vlapic, int vector); +void vlapic_handle_EOI(struct vlapic *vlapic, u8 vector); void vlapic_ipi(struct vlapic *vlapic, uint32_t icr_low, uint32_t icr_high); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:55:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8Vy8-0002H4-1x; Fri, 26 Jun 2015 15:55:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vy6-0002GW-M5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 8A/4A-19853-AD57D855; Fri, 26 Jun 2015 15:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1435334104!13829851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22014 invoked from network); 26 Jun 2015 15:55:05 -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; 26 Jun 2015 15:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vy4-0007DH-5L for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vy3-0004Hl-Mi for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:03 +0000 Date: Fri, 26 Jun 2015 15:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: EOI handling function adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e722f1de2c82af870ba1caeb4fa9db45de53f4c7 Author: Jan Beulich AuthorDate: Mon Jun 22 11:34:57 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:34:57 2015 +0200 x86/HVM: EOI handling function adjustments The vector parameters are more usefully u8 right away. This is particularly important for the vioapic_update_EOI() invocation from vioapic_write() (which luckily is only a latent issue, as VIOAPIC_VERSION_ID is still hard coded to 0x11 right now). But it at once allows simplifying VMX's EXIT_REASON_EOI_INDUCED handling (the kind of pointless helper function should have been static anyway; not being use for anything else, it gets removed altogether). Plus vlapic_handle_EOI() (now renamed for that purpose) can be used as the tail of vlapic_EOI_set() instead of duplicating that code. Finally replace a stray current->domain use in vlapic_handle_EOI(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vlapic.c | 13 ++++++------- xen/arch/x86/hvm/vmx/vmx.c | 20 +++----------------- xen/include/asm-x86/hvm/vioapic.h | 2 +- xen/include/asm-x86/hvm/vlapic.h | 2 +- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 1e48110..f903420 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -386,7 +386,7 @@ void vioapic_irq_positive_edge(struct domain *d, unsigned int irq) } } -void vioapic_update_EOI(struct domain *d, int vector) +void vioapic_update_EOI(struct domain *d, u8 vector) { struct hvm_hw_vioapic *vioapic = domain_vioapic(d); struct hvm_irq *hvm_irq = &d->arch.hvm_domain.irq; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 92b0fa8..fbc51d1 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -421,18 +421,17 @@ void vlapic_EOI_set(struct vlapic *vlapic) if ( hvm_funcs.handle_eoi ) hvm_funcs.handle_eoi(vector); - if ( vlapic_test_and_clear_vector(vector, &vlapic->regs->data[APIC_TMR]) ) - vioapic_update_EOI(vlapic_domain(vlapic), vector); - - hvm_dpci_msi_eoi(current->domain, vector); + vlapic_handle_EOI(vlapic, vector); } -void vlapic_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) +void vlapic_handle_EOI(struct vlapic *vlapic, u8 vector) { + struct domain *d = vlapic_domain(vlapic); + if ( vlapic_test_and_clear_vector(vector, &vlapic->regs->data[APIC_TMR]) ) - vioapic_update_EOI(vlapic_domain(vlapic), vector); + vioapic_update_EOI(d, vector); - hvm_dpci_msi_eoi(current->domain, vector); + hvm_dpci_msi_eoi(d, vector); } static bool_t is_multicast_dest(struct vlapic *vlapic, unsigned int short_hand, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0837627..fc29b89 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2683,17 +2683,6 @@ static int vmx_handle_apic_write(void) return vlapic_apicv_write(current, exit_qualification & 0xfff); } -/* - * When "Virtual Interrupt Delivery" is enabled, this function is used - * to handle EOI-induced VM exit - */ -void vmx_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) -{ - ASSERT(cpu_has_vmx_virtual_intr_delivery); - - vlapic_handle_EOI_induced_exit(vlapic, vector); -} - void vmx_vmexit_handler(struct cpu_user_regs *regs) { unsigned long exit_qualification, exit_reason, idtv_info, intr_info = 0; @@ -3127,15 +3116,12 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; case EXIT_REASON_EOI_INDUCED: - { - int vector; - __vmread(EXIT_QUALIFICATION, &exit_qualification); - vector = exit_qualification & 0xff; - vmx_handle_EOI_induced_exit(vcpu_vlapic(v), vector); + ASSERT(cpu_has_vmx_virtual_intr_delivery); + + vlapic_handle_EOI(vcpu_vlapic(v), exit_qualification); break; - } case EXIT_REASON_IO_INSTRUCTION: __vmread(EXIT_QUALIFICATION, &exit_qualification); diff --git a/xen/include/asm-x86/hvm/vioapic.h b/xen/include/asm-x86/hvm/vioapic.h index a18ffd0..6bf21e8 100644 --- a/xen/include/asm-x86/hvm/vioapic.h +++ b/xen/include/asm-x86/hvm/vioapic.h @@ -62,6 +62,6 @@ int vioapic_init(struct domain *d); void vioapic_deinit(struct domain *d); void vioapic_reset(struct domain *d); void vioapic_irq_positive_edge(struct domain *d, unsigned int irq); -void vioapic_update_EOI(struct domain *d, int vector); +void vioapic_update_EOI(struct domain *d, u8 vector); #endif /* __ASM_X86_HVM_VIOAPIC_H__ */ diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index cfe9bdb..bbcd196 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -127,7 +127,7 @@ uint32_t vlapic_set_ppr(struct vlapic *vlapic); void vlapic_adjust_i8259_target(struct domain *d); void vlapic_EOI_set(struct vlapic *vlapic); -void vlapic_handle_EOI_induced_exit(struct vlapic *vlapic, int vector); +void vlapic_handle_EOI(struct vlapic *vlapic, u8 vector); void vlapic_ipi(struct vlapic *vlapic, uint32_t icr_low, uint32_t icr_high); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8VyI-0002K8-4i; Fri, 26 Jun 2015 15:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyH-0002Jl-1n for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:17 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id CC/D7-02952-4E57D855; Fri, 26 Jun 2015 15:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435334114!20142482!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2681 invoked from network); 26 Jun 2015 15:55: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; 26 Jun 2015 15:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyE-0007DP-Ev for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VyE-0004Ix-AL for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:14 +0000 Date: Fri, 26 Jun 2015 15:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: clear xen_consumer when clearing state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b399386bcdb9d458f5647476a06fe86f5968d87e Author: David Vrabel AuthorDate: Mon Jun 22 11:36:17 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:36:17 2015 +0200 evtchn: clear xen_consumer when clearing state Freeing a xen event channel would clear xen_consumer before clearing the channel state, leaving a window where the channel is in a funny state (still bound but no consumer). Move the clear of xen_consumer into free_evtchn() where the state is also cleared. Signed-off-by: David Vrabel Ditch the pointless evtchn_close() wrapper around __evtchn_close() (renaming the latter) as well as some bogus casts of function results to void. Signed-off-by: Jan Beulich --- xen/common/event_channel.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 2208de0..72ba841 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -202,6 +202,7 @@ static void free_evtchn(struct domain *d, struct evtchn *chn) /* Reset binding to vcpu0 when the channel is freed. */ chn->state = ECS_FREE; chn->notify_vcpu_id = 0; + chn->xen_consumer = 0; xsm_evtchn_close_post(chn); } @@ -468,7 +469,7 @@ static long evtchn_bind_pirq(evtchn_bind_pirq_t *bind) } -static long __evtchn_close(struct domain *d1, int port1) +static long evtchn_close(struct domain *d1, int port1, bool_t guest) { struct domain *d2 = NULL; struct vcpu *v; @@ -488,7 +489,7 @@ static long __evtchn_close(struct domain *d1, int port1) chn1 = evtchn_from_port(d1, port1); /* Guest cannot close a Xen-attached event channel. */ - if ( unlikely(consumer_is_xen(chn1)) ) + if ( unlikely(consumer_is_xen(chn1)) && guest ) { rc = -EINVAL; goto out; @@ -597,12 +598,6 @@ static long __evtchn_close(struct domain *d1, int port1) return rc; } - -static long evtchn_close(evtchn_close_t *close) -{ - return __evtchn_close(current->domain, close->port); -} - int evtchn_send(struct domain *ld, unsigned int lport) { struct evtchn *lchn, *rchn; @@ -952,7 +947,7 @@ static long evtchn_reset(evtchn_reset_t *r) goto out; for ( i = 0; port_is_valid(d, i); i++ ) - (void)__evtchn_close(d, i); + evtchn_close(d, i, 1); spin_lock(&d->event_lock); @@ -1059,7 +1054,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_close close; if ( copy_from_guest(&close, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_close(&close); + rc = evtchn_close(current->domain, close.port, 1); break; } @@ -1185,11 +1180,10 @@ void free_xen_event_channel(struct domain *d, int port) BUG_ON(!port_is_valid(d, port)); chn = evtchn_from_port(d, port); BUG_ON(!consumer_is_xen(chn)); - chn->xen_consumer = 0; spin_unlock(&d->event_lock); - (void)__evtchn_close(d, port); + evtchn_close(d, port, 0); } @@ -1286,10 +1280,7 @@ void evtchn_destroy(struct domain *d) /* Close all existing event channels. */ for ( i = 0; port_is_valid(d, i); i++ ) - { - evtchn_from_port(d, i)->xen_consumer = 0; - (void)__evtchn_close(d, i); - } + evtchn_close(d, i, 0); /* Free all event-channel buckets. */ spin_lock(&d->event_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 Fri Jun 26 15:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8VyI-0002K8-4i; Fri, 26 Jun 2015 15:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyH-0002Jl-1n for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:17 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id CC/D7-02952-4E57D855; Fri, 26 Jun 2015 15:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435334114!20142482!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2681 invoked from network); 26 Jun 2015 15:55: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; 26 Jun 2015 15:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyE-0007DP-Ev for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VyE-0004Ix-AL for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:14 +0000 Date: Fri, 26 Jun 2015 15:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: clear xen_consumer when clearing state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b399386bcdb9d458f5647476a06fe86f5968d87e Author: David Vrabel AuthorDate: Mon Jun 22 11:36:17 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:36:17 2015 +0200 evtchn: clear xen_consumer when clearing state Freeing a xen event channel would clear xen_consumer before clearing the channel state, leaving a window where the channel is in a funny state (still bound but no consumer). Move the clear of xen_consumer into free_evtchn() where the state is also cleared. Signed-off-by: David Vrabel Ditch the pointless evtchn_close() wrapper around __evtchn_close() (renaming the latter) as well as some bogus casts of function results to void. Signed-off-by: Jan Beulich --- xen/common/event_channel.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 2208de0..72ba841 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -202,6 +202,7 @@ static void free_evtchn(struct domain *d, struct evtchn *chn) /* Reset binding to vcpu0 when the channel is freed. */ chn->state = ECS_FREE; chn->notify_vcpu_id = 0; + chn->xen_consumer = 0; xsm_evtchn_close_post(chn); } @@ -468,7 +469,7 @@ static long evtchn_bind_pirq(evtchn_bind_pirq_t *bind) } -static long __evtchn_close(struct domain *d1, int port1) +static long evtchn_close(struct domain *d1, int port1, bool_t guest) { struct domain *d2 = NULL; struct vcpu *v; @@ -488,7 +489,7 @@ static long __evtchn_close(struct domain *d1, int port1) chn1 = evtchn_from_port(d1, port1); /* Guest cannot close a Xen-attached event channel. */ - if ( unlikely(consumer_is_xen(chn1)) ) + if ( unlikely(consumer_is_xen(chn1)) && guest ) { rc = -EINVAL; goto out; @@ -597,12 +598,6 @@ static long __evtchn_close(struct domain *d1, int port1) return rc; } - -static long evtchn_close(evtchn_close_t *close) -{ - return __evtchn_close(current->domain, close->port); -} - int evtchn_send(struct domain *ld, unsigned int lport) { struct evtchn *lchn, *rchn; @@ -952,7 +947,7 @@ static long evtchn_reset(evtchn_reset_t *r) goto out; for ( i = 0; port_is_valid(d, i); i++ ) - (void)__evtchn_close(d, i); + evtchn_close(d, i, 1); spin_lock(&d->event_lock); @@ -1059,7 +1054,7 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct evtchn_close close; if ( copy_from_guest(&close, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_close(&close); + rc = evtchn_close(current->domain, close.port, 1); break; } @@ -1185,11 +1180,10 @@ void free_xen_event_channel(struct domain *d, int port) BUG_ON(!port_is_valid(d, port)); chn = evtchn_from_port(d, port); BUG_ON(!consumer_is_xen(chn)); - chn->xen_consumer = 0; spin_unlock(&d->event_lock); - (void)__evtchn_close(d, port); + evtchn_close(d, port, 0); } @@ -1286,10 +1280,7 @@ void evtchn_destroy(struct domain *d) /* Close all existing event channels. */ for ( i = 0; port_is_valid(d, i); i++ ) - { - evtchn_from_port(d, i)->xen_consumer = 0; - (void)__evtchn_close(d, i); - } + evtchn_close(d, i, 0); /* Free all event-channel buckets. */ spin_lock(&d->event_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 Fri Jun 26 15:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8VyT-0002NV-8x; Fri, 26 Jun 2015 15:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyR-0002N1-Pz for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:27 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 1E/69-16276-EE57D855; Fri, 26 Jun 2015 15:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435334125!20203981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16777 invoked from network); 26 Jun 2015 15:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyP-0007EX-7T for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VyO-0004Jf-IR for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:25 +0000 Date: Fri, 26 Jun 2015 15:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: defer freeing struct evtchn's until evtchn_destroy_final() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a753f0e53ff973a8a066e86c1cb3d6dd5c68d59f Author: David Vrabel AuthorDate: Mon Jun 22 11:38:01 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:38:01 2015 +0200 evtchn: defer freeing struct evtchn's until evtchn_destroy_final() notify_via_xen_event_channel() and free_xen_event_channel() had to check if the domain was dying because they may be called while the domain is being destroyed and the struct evtchn's are being freed. By deferring the freeing of the struct evtchn's until all references to the domain are dropped, these functions can rely on the channel state being present and valid. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 46 +++++++++++-------------------------------- 1 files changed, 12 insertions(+), 34 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 72ba841..c469db5 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1167,21 +1167,7 @@ int alloc_unbound_xen_event_channel( void free_xen_event_channel(struct domain *d, int port) { - struct evtchn *chn; - - spin_lock(&d->event_lock); - - if ( unlikely(d->is_dying) ) - { - spin_unlock(&d->event_lock); - return; - } - BUG_ON(!port_is_valid(d, port)); - chn = evtchn_from_port(d, port); - BUG_ON(!consumer_is_xen(chn)); - - spin_unlock(&d->event_lock); evtchn_close(d, port, 0); } @@ -1194,18 +1180,12 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) spin_lock(&ld->event_lock); - if ( unlikely(ld->is_dying) ) - { - spin_unlock(&ld->event_lock); - return; - } - ASSERT(port_is_valid(ld, lport)); lchn = evtchn_from_port(ld, lport); - ASSERT(consumer_is_xen(lchn)); if ( likely(lchn->state == ECS_INTERDOMAIN) ) { + ASSERT(consumer_is_xen(lchn)); rd = lchn->u.interdomain.remote_dom; rchn = evtchn_from_port(rd, lchn->u.interdomain.remote_port); evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); @@ -1272,7 +1252,7 @@ int evtchn_init(struct domain *d) void evtchn_destroy(struct domain *d) { - unsigned int i, j; + unsigned int i; /* After this barrier no new event-channel allocations can occur. */ BUG_ON(!d->is_dying); @@ -1282,8 +1262,17 @@ void evtchn_destroy(struct domain *d) for ( i = 0; port_is_valid(d, i); i++ ) evtchn_close(d, i, 0); + clear_global_virq_handlers(d); + + evtchn_fifo_destroy(d); +} + + +void evtchn_destroy_final(struct domain *d) +{ + unsigned int i, j; + /* Free all event-channel buckets. */ - spin_lock(&d->event_lock); for ( i = 0; i < NR_EVTCHN_GROUPS; i++ ) { if ( !d->evtchn_group[i] ) @@ -1291,20 +1280,9 @@ void evtchn_destroy(struct domain *d) for ( j = 0; j < BUCKETS_PER_GROUP; j++ ) free_evtchn_bucket(d, d->evtchn_group[i][j]); xfree(d->evtchn_group[i]); - d->evtchn_group[i] = NULL; } free_evtchn_bucket(d, d->evtchn); - d->evtchn = NULL; - spin_unlock(&d->event_lock); - - clear_global_virq_handlers(d); - evtchn_fifo_destroy(d); -} - - -void evtchn_destroy_final(struct domain *d) -{ #if MAX_VIRT_CPUS > BITS_PER_LONG xfree(d->poll_mask); d->poll_mask = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8VyT-0002NV-8x; Fri, 26 Jun 2015 15:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyR-0002N1-Pz for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:27 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 1E/69-16276-EE57D855; Fri, 26 Jun 2015 15:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435334125!20203981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16777 invoked from network); 26 Jun 2015 15:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyP-0007EX-7T for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VyO-0004Jf-IR for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:25 +0000 Date: Fri, 26 Jun 2015 15:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: defer freeing struct evtchn's until evtchn_destroy_final() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a753f0e53ff973a8a066e86c1cb3d6dd5c68d59f Author: David Vrabel AuthorDate: Mon Jun 22 11:38:01 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:38:01 2015 +0200 evtchn: defer freeing struct evtchn's until evtchn_destroy_final() notify_via_xen_event_channel() and free_xen_event_channel() had to check if the domain was dying because they may be called while the domain is being destroyed and the struct evtchn's are being freed. By deferring the freeing of the struct evtchn's until all references to the domain are dropped, these functions can rely on the channel state being present and valid. Signed-off-by: David Vrabel --- xen/common/event_channel.c | 46 +++++++++++-------------------------------- 1 files changed, 12 insertions(+), 34 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 72ba841..c469db5 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1167,21 +1167,7 @@ int alloc_unbound_xen_event_channel( void free_xen_event_channel(struct domain *d, int port) { - struct evtchn *chn; - - spin_lock(&d->event_lock); - - if ( unlikely(d->is_dying) ) - { - spin_unlock(&d->event_lock); - return; - } - BUG_ON(!port_is_valid(d, port)); - chn = evtchn_from_port(d, port); - BUG_ON(!consumer_is_xen(chn)); - - spin_unlock(&d->event_lock); evtchn_close(d, port, 0); } @@ -1194,18 +1180,12 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) spin_lock(&ld->event_lock); - if ( unlikely(ld->is_dying) ) - { - spin_unlock(&ld->event_lock); - return; - } - ASSERT(port_is_valid(ld, lport)); lchn = evtchn_from_port(ld, lport); - ASSERT(consumer_is_xen(lchn)); if ( likely(lchn->state == ECS_INTERDOMAIN) ) { + ASSERT(consumer_is_xen(lchn)); rd = lchn->u.interdomain.remote_dom; rchn = evtchn_from_port(rd, lchn->u.interdomain.remote_port); evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); @@ -1272,7 +1252,7 @@ int evtchn_init(struct domain *d) void evtchn_destroy(struct domain *d) { - unsigned int i, j; + unsigned int i; /* After this barrier no new event-channel allocations can occur. */ BUG_ON(!d->is_dying); @@ -1282,8 +1262,17 @@ void evtchn_destroy(struct domain *d) for ( i = 0; port_is_valid(d, i); i++ ) evtchn_close(d, i, 0); + clear_global_virq_handlers(d); + + evtchn_fifo_destroy(d); +} + + +void evtchn_destroy_final(struct domain *d) +{ + unsigned int i, j; + /* Free all event-channel buckets. */ - spin_lock(&d->event_lock); for ( i = 0; i < NR_EVTCHN_GROUPS; i++ ) { if ( !d->evtchn_group[i] ) @@ -1291,20 +1280,9 @@ void evtchn_destroy(struct domain *d) for ( j = 0; j < BUCKETS_PER_GROUP; j++ ) free_evtchn_bucket(d, d->evtchn_group[i][j]); xfree(d->evtchn_group[i]); - d->evtchn_group[i] = NULL; } free_evtchn_bucket(d, d->evtchn); - d->evtchn = NULL; - spin_unlock(&d->event_lock); - - clear_global_virq_handlers(d); - evtchn_fifo_destroy(d); -} - - -void evtchn_destroy_final(struct domain *d) -{ #if MAX_VIRT_CPUS > BITS_PER_LONG xfree(d->poll_mask); d->poll_mask = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:55:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8Vye-0002QV-BZ; Fri, 26 Jun 2015 15:55:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyc-0002Q1-7g for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:38 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 09/6E-10593-9F57D855; Fri, 26 Jun 2015 15:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435334135!17768534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27118 invoked from network); 26 Jun 2015 15:55:36 -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; 26 Jun 2015 15:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyZ-0007Eh-GJ for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VyZ-0004K5-Ag for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:35 +0000 Date: Fri, 26 Jun 2015 15:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: use a per-event channel lock for sending 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 de6acb78bf0e137cbe5b72cee4a35ca018d759cc Author: David Vrabel AuthorDate: Mon Jun 22 11:39:03 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:39:03 2015 +0200 evtchn: use a per-event channel lock for sending events When sending an event, use a new per-event channel lock to safely validate the event channel state. This new lock must be held when changing event channel state. Note that the event channel lock must also be held when changing state from ECS_FREE or it will race with a concurrent get_free_port() call. To avoid having to take the remote event channel locks when sending to an interdomain event channel, the local and remote channel locks are both held when binding or closing an interdomain event channel. This significantly increases the number of events that can be sent from multiple VCPUs. But struct evtchn increases in size, reducing the number that fit into a single page to 64 (instead of 128). Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_channel.c | 81 +++++++++++++++++++++++++++++++++++++------- xen/include/xen/sched.h | 1 + 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index c469db5..09ed5a6 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -139,6 +139,7 @@ static struct evtchn *alloc_evtchn_bucket(struct domain *d, unsigned int port) return NULL; } chn[i].port = port + i; + spin_lock_init(&chn[i].lock); } return chn; } @@ -229,11 +230,15 @@ static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) if ( rc ) goto out; + spin_lock(&chn->lock); + chn->state = ECS_UNBOUND; if ( (chn->u.unbound.remote_domid = alloc->remote_dom) == DOMID_SELF ) chn->u.unbound.remote_domid = current->domain->domain_id; evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + alloc->port = port; out: @@ -244,6 +249,28 @@ static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) } +static void double_evtchn_lock(struct evtchn *lchn, struct evtchn *rchn) +{ + if ( lchn < rchn ) + { + spin_lock(&lchn->lock); + spin_lock(&rchn->lock); + } + else + { + if ( lchn != rchn ) + spin_lock(&rchn->lock); + spin_lock(&lchn->lock); + } +} + +static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn) +{ + spin_unlock(&lchn->lock); + if ( lchn != rchn ) + spin_unlock(&rchn->lock); +} + static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) { struct evtchn *lchn, *rchn; @@ -286,6 +313,8 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) if ( rc ) goto out; + double_evtchn_lock(lchn, rchn); + lchn->u.interdomain.remote_dom = rd; lchn->u.interdomain.remote_port = rport; lchn->state = ECS_INTERDOMAIN; @@ -301,6 +330,8 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) */ evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); + double_evtchn_unlock(lchn, rchn); + bind->local_port = lport; out: @@ -341,11 +372,16 @@ static long evtchn_bind_virq(evtchn_bind_virq_t *bind) ERROR_EXIT(port); chn = evtchn_from_port(d, port); + + spin_lock(&chn->lock); + chn->state = ECS_VIRQ; chn->notify_vcpu_id = vcpu; chn->u.virq = virq; evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + v->virq_to_evtchn[virq] = bind->port = port; out: @@ -372,10 +408,15 @@ static long evtchn_bind_ipi(evtchn_bind_ipi_t *bind) ERROR_EXIT(port); chn = evtchn_from_port(d, port); + + spin_lock(&chn->lock); + chn->state = ECS_IPI; chn->notify_vcpu_id = vcpu; evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + bind->port = port; out: @@ -450,11 +491,15 @@ static long evtchn_bind_pirq(evtchn_bind_pirq_t *bind) goto out; } + spin_lock(&chn->lock); + chn->state = ECS_PIRQ; chn->u.pirq.irq = pirq; link_pirq_port(port, chn, v); evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + bind->port = port; #ifdef CONFIG_X86 @@ -575,15 +620,24 @@ static long evtchn_close(struct domain *d1, int port1, bool_t guest) BUG_ON(chn2->state != ECS_INTERDOMAIN); BUG_ON(chn2->u.interdomain.remote_dom != d1); + double_evtchn_lock(chn1, chn2); + + free_evtchn(d1, chn1); + chn2->state = ECS_UNBOUND; chn2->u.unbound.remote_domid = d1->domain_id; - break; + + double_evtchn_unlock(chn1, chn2); + + goto out; default: BUG(); } + spin_lock(&chn1->lock); free_evtchn(d1, chn1); + spin_unlock(&chn1->lock); out: if ( d2 != NULL ) @@ -604,21 +658,18 @@ int evtchn_send(struct domain *ld, unsigned int lport) struct domain *rd; int rport, ret = 0; - spin_lock(&ld->event_lock); - - if ( unlikely(!port_is_valid(ld, lport)) ) - { - spin_unlock(&ld->event_lock); + if ( !port_is_valid(ld, lport) ) return -EINVAL; - } lchn = evtchn_from_port(ld, lport); + spin_lock(&lchn->lock); + /* Guest cannot send via a Xen-attached event channel. */ if ( unlikely(consumer_is_xen(lchn)) ) { - spin_unlock(&ld->event_lock); - return -EINVAL; + ret = -EINVAL; + goto out; } ret = xsm_evtchn_send(XSM_HOOK, ld, lchn); @@ -647,7 +698,7 @@ int evtchn_send(struct domain *ld, unsigned int lport) } out: - spin_unlock(&ld->event_lock); + spin_unlock(&lchn->lock); return ret; } @@ -1154,11 +1205,15 @@ int alloc_unbound_xen_event_channel( if ( rc ) goto out; + spin_lock(&chn->lock); + chn->state = ECS_UNBOUND; chn->xen_consumer = get_xen_consumer(notification_fn); chn->notify_vcpu_id = lvcpu; chn->u.unbound.remote_domid = remote_domid; + spin_unlock(&chn->lock); + out: spin_unlock(&ld->event_lock); @@ -1178,11 +1233,11 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) struct evtchn *lchn, *rchn; struct domain *rd; - spin_lock(&ld->event_lock); - ASSERT(port_is_valid(ld, lport)); lchn = evtchn_from_port(ld, lport); + spin_lock(&lchn->lock); + if ( likely(lchn->state == ECS_INTERDOMAIN) ) { ASSERT(consumer_is_xen(lchn)); @@ -1191,7 +1246,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); } - spin_unlock(&ld->event_lock); + spin_unlock(&lchn->lock); } void evtchn_check_pollers(struct domain *d, unsigned int port) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index d810e1c..ce10a66 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -79,6 +79,7 @@ extern domid_t hardware_domid; struct evtchn { + spinlock_t lock; #define ECS_FREE 0 /* Channel is available for use. */ #define ECS_RESERVED 1 /* Channel is reserved. */ #define ECS_UNBOUND 2 /* Channel is waiting to bind to a remote domain. */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:55:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8Vye-0002QV-BZ; Fri, 26 Jun 2015 15:55:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyc-0002Q1-7g for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:38 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 09/6E-10593-9F57D855; Fri, 26 Jun 2015 15:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435334135!17768534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27118 invoked from network); 26 Jun 2015 15:55:36 -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; 26 Jun 2015 15:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VyZ-0007Eh-GJ for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VyZ-0004K5-Ag for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:35 +0000 Date: Fri, 26 Jun 2015 15:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: use a per-event channel lock for sending 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 de6acb78bf0e137cbe5b72cee4a35ca018d759cc Author: David Vrabel AuthorDate: Mon Jun 22 11:39:03 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:39:03 2015 +0200 evtchn: use a per-event channel lock for sending events When sending an event, use a new per-event channel lock to safely validate the event channel state. This new lock must be held when changing event channel state. Note that the event channel lock must also be held when changing state from ECS_FREE or it will race with a concurrent get_free_port() call. To avoid having to take the remote event channel locks when sending to an interdomain event channel, the local and remote channel locks are both held when binding or closing an interdomain event channel. This significantly increases the number of events that can be sent from multiple VCPUs. But struct evtchn increases in size, reducing the number that fit into a single page to 64 (instead of 128). Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_channel.c | 81 +++++++++++++++++++++++++++++++++++++------- xen/include/xen/sched.h | 1 + 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index c469db5..09ed5a6 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -139,6 +139,7 @@ static struct evtchn *alloc_evtchn_bucket(struct domain *d, unsigned int port) return NULL; } chn[i].port = port + i; + spin_lock_init(&chn[i].lock); } return chn; } @@ -229,11 +230,15 @@ static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) if ( rc ) goto out; + spin_lock(&chn->lock); + chn->state = ECS_UNBOUND; if ( (chn->u.unbound.remote_domid = alloc->remote_dom) == DOMID_SELF ) chn->u.unbound.remote_domid = current->domain->domain_id; evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + alloc->port = port; out: @@ -244,6 +249,28 @@ static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) } +static void double_evtchn_lock(struct evtchn *lchn, struct evtchn *rchn) +{ + if ( lchn < rchn ) + { + spin_lock(&lchn->lock); + spin_lock(&rchn->lock); + } + else + { + if ( lchn != rchn ) + spin_lock(&rchn->lock); + spin_lock(&lchn->lock); + } +} + +static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn) +{ + spin_unlock(&lchn->lock); + if ( lchn != rchn ) + spin_unlock(&rchn->lock); +} + static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) { struct evtchn *lchn, *rchn; @@ -286,6 +313,8 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) if ( rc ) goto out; + double_evtchn_lock(lchn, rchn); + lchn->u.interdomain.remote_dom = rd; lchn->u.interdomain.remote_port = rport; lchn->state = ECS_INTERDOMAIN; @@ -301,6 +330,8 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) */ evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); + double_evtchn_unlock(lchn, rchn); + bind->local_port = lport; out: @@ -341,11 +372,16 @@ static long evtchn_bind_virq(evtchn_bind_virq_t *bind) ERROR_EXIT(port); chn = evtchn_from_port(d, port); + + spin_lock(&chn->lock); + chn->state = ECS_VIRQ; chn->notify_vcpu_id = vcpu; chn->u.virq = virq; evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + v->virq_to_evtchn[virq] = bind->port = port; out: @@ -372,10 +408,15 @@ static long evtchn_bind_ipi(evtchn_bind_ipi_t *bind) ERROR_EXIT(port); chn = evtchn_from_port(d, port); + + spin_lock(&chn->lock); + chn->state = ECS_IPI; chn->notify_vcpu_id = vcpu; evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + bind->port = port; out: @@ -450,11 +491,15 @@ static long evtchn_bind_pirq(evtchn_bind_pirq_t *bind) goto out; } + spin_lock(&chn->lock); + chn->state = ECS_PIRQ; chn->u.pirq.irq = pirq; link_pirq_port(port, chn, v); evtchn_port_init(d, chn); + spin_unlock(&chn->lock); + bind->port = port; #ifdef CONFIG_X86 @@ -575,15 +620,24 @@ static long evtchn_close(struct domain *d1, int port1, bool_t guest) BUG_ON(chn2->state != ECS_INTERDOMAIN); BUG_ON(chn2->u.interdomain.remote_dom != d1); + double_evtchn_lock(chn1, chn2); + + free_evtchn(d1, chn1); + chn2->state = ECS_UNBOUND; chn2->u.unbound.remote_domid = d1->domain_id; - break; + + double_evtchn_unlock(chn1, chn2); + + goto out; default: BUG(); } + spin_lock(&chn1->lock); free_evtchn(d1, chn1); + spin_unlock(&chn1->lock); out: if ( d2 != NULL ) @@ -604,21 +658,18 @@ int evtchn_send(struct domain *ld, unsigned int lport) struct domain *rd; int rport, ret = 0; - spin_lock(&ld->event_lock); - - if ( unlikely(!port_is_valid(ld, lport)) ) - { - spin_unlock(&ld->event_lock); + if ( !port_is_valid(ld, lport) ) return -EINVAL; - } lchn = evtchn_from_port(ld, lport); + spin_lock(&lchn->lock); + /* Guest cannot send via a Xen-attached event channel. */ if ( unlikely(consumer_is_xen(lchn)) ) { - spin_unlock(&ld->event_lock); - return -EINVAL; + ret = -EINVAL; + goto out; } ret = xsm_evtchn_send(XSM_HOOK, ld, lchn); @@ -647,7 +698,7 @@ int evtchn_send(struct domain *ld, unsigned int lport) } out: - spin_unlock(&ld->event_lock); + spin_unlock(&lchn->lock); return ret; } @@ -1154,11 +1205,15 @@ int alloc_unbound_xen_event_channel( if ( rc ) goto out; + spin_lock(&chn->lock); + chn->state = ECS_UNBOUND; chn->xen_consumer = get_xen_consumer(notification_fn); chn->notify_vcpu_id = lvcpu; chn->u.unbound.remote_domid = remote_domid; + spin_unlock(&chn->lock); + out: spin_unlock(&ld->event_lock); @@ -1178,11 +1233,11 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) struct evtchn *lchn, *rchn; struct domain *rd; - spin_lock(&ld->event_lock); - ASSERT(port_is_valid(ld, lport)); lchn = evtchn_from_port(ld, lport); + spin_lock(&lchn->lock); + if ( likely(lchn->state == ECS_INTERDOMAIN) ) { ASSERT(consumer_is_xen(lchn)); @@ -1191,7 +1246,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); } - spin_unlock(&ld->event_lock); + spin_unlock(&lchn->lock); } void evtchn_check_pollers(struct domain *d, unsigned int port) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index d810e1c..ce10a66 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -79,6 +79,7 @@ extern domid_t hardware_domid; struct evtchn { + spinlock_t lock; #define ECS_FREE 0 /* Channel is available for use. */ #define ECS_RESERVED 1 /* Channel is reserved. */ #define ECS_UNBOUND 2 /* Channel is waiting to bind to a remote domain. */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8Vyn-0002Tn-EZ; Fri, 26 Jun 2015 15:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyl-0002T7-V5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:48 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C8/9E-10593-3067D855; Fri, 26 Jun 2015 15:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435334145!17768586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28474 invoked from network); 26 Jun 2015 15:55:46 -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; 26 Jun 2015 15:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyj-0007Es-Lr for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vyj-0004KX-KY for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:45 +0000 Date: Fri, 26 Jun 2015 15:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: pad struct evtchn to 64 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 b58214a24231a1f2a7e09ae9cc3014eff752918b Author: David Vrabel AuthorDate: Mon Jun 22 11:39:46 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:39:46 2015 +0200 evtchn: pad struct evtchn to 64 bytes The number of struct evtchn in a page must be a power of two. Under some workloads performance is improved slightly by padding struct evtchn to 64 bytes (a typical cache line size), thus putting the fewer per-channel locks into each cache line. This does not decrease the number of struct evtchn's per-page. Signed-off-by: David Vrabel Acked-by: Jan Beulich --- xen/include/xen/sched.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ce10a66..b29d9e7 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -129,7 +129,7 @@ struct evtchn #endif } ssid; #endif -}; +} __attribute__((aligned(64))); int evtchn_init(struct domain *d); /* from domain_create */ void evtchn_destroy(struct domain *d); /* from domain_kill */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55: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 1Z8Vyn-0002Tn-EZ; Fri, 26 Jun 2015 15:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyl-0002T7-V5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:48 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C8/9E-10593-3067D855; Fri, 26 Jun 2015 15:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435334145!17768586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28474 invoked from network); 26 Jun 2015 15:55:46 -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; 26 Jun 2015 15:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyj-0007Es-Lr for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vyj-0004KX-KY for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:45 +0000 Date: Fri, 26 Jun 2015 15:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: pad struct evtchn to 64 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 b58214a24231a1f2a7e09ae9cc3014eff752918b Author: David Vrabel AuthorDate: Mon Jun 22 11:39:46 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:39:46 2015 +0200 evtchn: pad struct evtchn to 64 bytes The number of struct evtchn in a page must be a power of two. Under some workloads performance is improved slightly by padding struct evtchn to 64 bytes (a typical cache line size), thus putting the fewer per-channel locks into each cache line. This does not decrease the number of struct evtchn's per-page. Signed-off-by: David Vrabel Acked-by: Jan Beulich --- xen/include/xen/sched.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ce10a66..b29d9e7 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -129,7 +129,7 @@ struct evtchn #endif } ssid; #endif -}; +} __attribute__((aligned(64))); int evtchn_init(struct domain *d); /* from domain_create */ void evtchn_destroy(struct domain *d); /* from domain_kill */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:55:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyw-0002XB-JY; Fri, 26 Jun 2015 15:55:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyw-0002Wy-5B for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E1/EE-18733-D067D855; Fri, 26 Jun 2015 15:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1435334156!27018619!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20622 invoked from network); 26 Jun 2015 15:55:56 -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; 26 Jun 2015 15:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyt-0007FD-Qv for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vyt-0004LO-Px for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:55 +0000 Date: Fri, 26 Jun 2015 15:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gdbsx_guestmemio: allow it to check domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2abed01bf44e03dac3083e382d8c869ab3c19eb8 Author: Don Slutz AuthorDate: Mon Jun 22 11:40:28 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:40:28 2015 +0200 gdbsx_guestmemio: allow it to check domain gdbsx_guest_mem_io() does not get d passed, it expects to handle the domain lookup itself. Specifically, the caller of XEN_DOMCTL_gdbsx_guestmemio is expected to use DOMID_IDLE to interact with the hypervisor, rather than a domain, which doesn't interact well with with the domain rcu lock. Signed-off-by: Don Slutz Reviewed-by: Andrew Cooper --- xen/common/domctl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index ce517a7..2a2d203 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -443,6 +443,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_createdomain: case XEN_DOMCTL_getdomaininfo: case XEN_DOMCTL_test_assign_device: + case XEN_DOMCTL_gdbsx_guestmemio: d = NULL; 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 Fri Jun 26 15:55:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyw-0002XB-JY; Fri, 26 Jun 2015 15:55:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyw-0002Wy-5B for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E1/EE-18733-D067D855; Fri, 26 Jun 2015 15:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1435334156!27018619!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20622 invoked from network); 26 Jun 2015 15:55:56 -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; 26 Jun 2015 15:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vyt-0007FD-Qv for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vyt-0004LO-Px for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:55:55 +0000 Date: Fri, 26 Jun 2015 15:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gdbsx_guestmemio: allow it to check domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2abed01bf44e03dac3083e382d8c869ab3c19eb8 Author: Don Slutz AuthorDate: Mon Jun 22 11:40:28 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:40:28 2015 +0200 gdbsx_guestmemio: allow it to check domain gdbsx_guest_mem_io() does not get d passed, it expects to handle the domain lookup itself. Specifically, the caller of XEN_DOMCTL_gdbsx_guestmemio is expected to use DOMID_IDLE to interact with the hypervisor, rather than a domain, which doesn't interact well with with the domain rcu lock. Signed-off-by: Don Slutz Reviewed-by: Andrew Cooper --- xen/common/domctl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index ce517a7..2a2d203 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -443,6 +443,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_createdomain: case XEN_DOMCTL_getdomaininfo: case XEN_DOMCTL_test_assign_device: + case XEN_DOMCTL_gdbsx_guestmemio: d = NULL; 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 Fri Jun 26 15:56:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8VzA-0002bg-2A; Fri, 26 Jun 2015 15:56:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vz9-0002bE-90 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 64/EE-29123-A167D855; Fri, 26 Jun 2015 15:56:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435334166!27027084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12070 invoked from network); 26 Jun 2015 15:56:07 -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; 26 Jun 2015 15:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vz4-0007Fs-2D for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vz3-0004M0-VI for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:06 +0000 Date: Fri, 26 Jun 2015 15:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] update comments regarding pv-domain memory layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6501e9cc6a9473561f4b4bf3ee5583cc08f9e86d Author: Juergen Gross AuthorDate: Mon Jun 22 11:41:01 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:41:01 2015 +0200 update comments regarding pv-domain memory layout The comments describing the initial pv-domain memory layout are not complete. They do not mention the pages with console info and xenstore data. Add this information to the comments. Signed-off-by: Juergen Gross --- xen/include/public/xen.h | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 17ecb94..619bb2a 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -718,24 +718,27 @@ typedef struct shared_info shared_info_t; * 3. This the order of bootstrap elements in the initial virtual region: * a. relocated kernel image * b. initial ram disk [mod_start, mod_len] + * (may be omitted) * c. list of allocated page frames [mfn_list, nr_pages] * (unless relocated due to XEN_ELFNOTE_INIT_P2M) * d. start_info_t structure [register ESI (x86)] - * e. bootstrap page tables [pt_base and CR3 (x86)] - * f. bootstrap stack [register ESP (x86)] + * in case of dom0 this page contains the console info, too + * e. unless dom0: xenstore ring page + * f. unless dom0: console ring page + * g. bootstrap page tables [pt_base and CR3 (x86)] + * h. bootstrap stack [register ESP (x86)] * 4. Bootstrap elements are packed together, but each is 4kB-aligned. - * 5. The initial ram disk may be omitted. - * 6. The list of page frames forms a contiguous 'pseudo-physical' memory + * 5. The list of page frames forms a contiguous 'pseudo-physical' memory * layout for the domain. In particular, the bootstrap virtual-memory * region is a 1:1 mapping to the first section of the pseudo-physical map. - * 7. All bootstrap elements are mapped read-writable for the guest OS. The + * 6. All bootstrap elements are mapped read-writable for the guest OS. The * only exception is the bootstrap page table, which is mapped read-only. - * 8. There is guaranteed to be at least 512kB padding after the final + * 7. There is guaranteed to be at least 512kB padding after the final * bootstrap element. If necessary, the bootstrap virtual region is * extended by an extra 4MB to ensure this. * * Note: Prior to 25833:bb85bbccb1c9. ("x86/32-on-64 adjust Dom0 initial page - * table layout") a bug caused the pt_base (3.e above) and cr3 to not point + * table layout") a bug caused the pt_base (3.g above) and cr3 to not point * to the start of the guest page tables (it was offset by two pages). * This only manifested itself on 32-on-64 dom0 kernels and not 32-on-64 domU * or 64-bit kernels of any colour. The page tables for a 32-on-64 dom0 got -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:56:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8VzA-0002bg-2A; Fri, 26 Jun 2015 15:56:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vz9-0002bE-90 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 64/EE-29123-A167D855; Fri, 26 Jun 2015 15:56:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435334166!27027084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12070 invoked from network); 26 Jun 2015 15:56:07 -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; 26 Jun 2015 15:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vz4-0007Fs-2D for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vz3-0004M0-VI for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:06 +0000 Date: Fri, 26 Jun 2015 15:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] update comments regarding pv-domain memory layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6501e9cc6a9473561f4b4bf3ee5583cc08f9e86d Author: Juergen Gross AuthorDate: Mon Jun 22 11:41:01 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 11:41:01 2015 +0200 update comments regarding pv-domain memory layout The comments describing the initial pv-domain memory layout are not complete. They do not mention the pages with console info and xenstore data. Add this information to the comments. Signed-off-by: Juergen Gross --- xen/include/public/xen.h | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 17ecb94..619bb2a 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -718,24 +718,27 @@ typedef struct shared_info shared_info_t; * 3. This the order of bootstrap elements in the initial virtual region: * a. relocated kernel image * b. initial ram disk [mod_start, mod_len] + * (may be omitted) * c. list of allocated page frames [mfn_list, nr_pages] * (unless relocated due to XEN_ELFNOTE_INIT_P2M) * d. start_info_t structure [register ESI (x86)] - * e. bootstrap page tables [pt_base and CR3 (x86)] - * f. bootstrap stack [register ESP (x86)] + * in case of dom0 this page contains the console info, too + * e. unless dom0: xenstore ring page + * f. unless dom0: console ring page + * g. bootstrap page tables [pt_base and CR3 (x86)] + * h. bootstrap stack [register ESP (x86)] * 4. Bootstrap elements are packed together, but each is 4kB-aligned. - * 5. The initial ram disk may be omitted. - * 6. The list of page frames forms a contiguous 'pseudo-physical' memory + * 5. The list of page frames forms a contiguous 'pseudo-physical' memory * layout for the domain. In particular, the bootstrap virtual-memory * region is a 1:1 mapping to the first section of the pseudo-physical map. - * 7. All bootstrap elements are mapped read-writable for the guest OS. The + * 6. All bootstrap elements are mapped read-writable for the guest OS. The * only exception is the bootstrap page table, which is mapped read-only. - * 8. There is guaranteed to be at least 512kB padding after the final + * 7. There is guaranteed to be at least 512kB padding after the final * bootstrap element. If necessary, the bootstrap virtual region is * extended by an extra 4MB to ensure this. * * Note: Prior to 25833:bb85bbccb1c9. ("x86/32-on-64 adjust Dom0 initial page - * table layout") a bug caused the pt_base (3.e above) and cr3 to not point + * table layout") a bug caused the pt_base (3.g above) and cr3 to not point * to the start of the guest page tables (it was offset by two pages). * This only manifested itself on 32-on-64 dom0 kernels and not 32-on-64 domU * or 64-bit kernels of any colour. The page tables for a 32-on-64 dom0 got -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:56:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8VzK-0002f7-55; Fri, 26 Jun 2015 15:56:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzJ-0002du-Ai for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:21 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id B7/18-21325-1267D855; Fri, 26 Jun 2015 15:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435334176!17163692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14001 invoked from network); 26 Jun 2015 15:56:17 -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; 26 Jun 2015 15:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzE-0007G0-7r for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VzE-0004N7-61 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:16 +0000 Date: Fri, 26 Jun 2015 15:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: don't test 64b-only vcpu_guest_context's fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72f6e4ba462256c472c811480581508d901aabb1 Author: Boris Ostrovsky AuthorDate: Mon Jun 22 17:51:11 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:51:11 2015 +0200 x86/pvh: don't test 64b-only vcpu_guest_context's fields vcpu_guest_context's fs_base, gs_base_kernel and gs_base_user are not defined for 32-bit guests. Drop PVH 32bitfixme ASSERT. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 0363650..e396c6c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -769,16 +769,14 @@ int arch_set_info_guest( } else if ( is_pvh_domain(d) ) { - /* PVH 32bitfixme */ - ASSERT(!compat); - if ( c(ctrlreg[0]) || c(ctrlreg[1]) || c(ctrlreg[2]) || c(ctrlreg[4]) || c(ctrlreg[5]) || c(ctrlreg[6]) || c(ctrlreg[7]) || c(ldt_base) || c(ldt_ents) || c(user_regs.cs) || c(user_regs.ss) || c(user_regs.es) || c(user_regs.ds) || c(user_regs.fs) || c(user_regs.gs) || - c(kernel_ss) || c(kernel_sp) || c.nat->gs_base_kernel || - c.nat->gdt_ents || c.nat->fs_base || c.nat->gs_base_user ) + c(kernel_ss) || c(kernel_sp) || c(gdt_ents) || + (!compat && (c.nat->gs_base_kernel || + c.nat->fs_base || c.nat->gs_base_user)) ) return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:56:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8VzK-0002f7-55; Fri, 26 Jun 2015 15:56:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzJ-0002du-Ai for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:21 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id B7/18-21325-1267D855; Fri, 26 Jun 2015 15:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435334176!17163692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14001 invoked from network); 26 Jun 2015 15:56:17 -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; 26 Jun 2015 15:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzE-0007G0-7r for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VzE-0004N7-61 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:16 +0000 Date: Fri, 26 Jun 2015 15:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: don't test 64b-only vcpu_guest_context's fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72f6e4ba462256c472c811480581508d901aabb1 Author: Boris Ostrovsky AuthorDate: Mon Jun 22 17:51:11 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:51:11 2015 +0200 x86/pvh: don't test 64b-only vcpu_guest_context's fields vcpu_guest_context's fs_base, gs_base_kernel and gs_base_user are not defined for 32-bit guests. Drop PVH 32bitfixme ASSERT. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 0363650..e396c6c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -769,16 +769,14 @@ int arch_set_info_guest( } else if ( is_pvh_domain(d) ) { - /* PVH 32bitfixme */ - ASSERT(!compat); - if ( c(ctrlreg[0]) || c(ctrlreg[1]) || c(ctrlreg[2]) || c(ctrlreg[4]) || c(ctrlreg[5]) || c(ctrlreg[6]) || c(ctrlreg[7]) || c(ldt_base) || c(ldt_ents) || c(user_regs.cs) || c(user_regs.ss) || c(user_regs.es) || c(user_regs.ds) || c(user_regs.fs) || c(user_regs.gs) || - c(kernel_ss) || c(kernel_sp) || c.nat->gs_base_kernel || - c.nat->gdt_ents || c.nat->fs_base || c.nat->gs_base_user ) + c(kernel_ss) || c(kernel_sp) || c(gdt_ents) || + (!compat && (c.nat->gs_base_kernel || + c.nat->fs_base || c.nat->gs_base_user)) ) return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:56:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8VzS-0002iZ-L6; Fri, 26 Jun 2015 15:56:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzQ-0002hO-LB for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:28 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 82/F1-15949-C267D855; Fri, 26 Jun 2015 15:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435334186!17172821!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18896 invoked from network); 26 Jun 2015 15:56:27 -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; 26 Jun 2015 15:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzO-0007G8-Ch for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VzO-0004NT-BV for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:26 +0000 Date: Fri, 26 Jun 2015 15:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: don't copy to/from trap_ctxt for 32b PVH 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 57647ee9ccfd0d40c9af8fa0a1787cca182451ec Author: Boris Ostrovsky AuthorDate: Mon Jun 22 17:52:13 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:52:13 2015 +0200 x86/pvh: don't copy to/from trap_ctxt for 32b PVH guests .. as this field is not used by PVH guests Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 9 ++++++--- xen/arch/x86/domctl.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index e396c6c..c7ef1e6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -805,9 +805,12 @@ int arch_set_info_guest( else { XLAT_cpu_user_regs(&v->arch.user_regs, &c.cmp->user_regs); - for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) - XLAT_trap_info(v->arch.pv_vcpu.trap_ctxt + i, - c.cmp->trap_ctxt + i); + if ( is_pv_domain(d) ) + { + for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) + XLAT_trap_info(v->arch.pv_vcpu.trap_ctxt + i, + c.cmp->trap_ctxt + i); + } } if ( has_hvm_container_domain(d) ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d8ffe2b..82bd818 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1204,9 +1204,12 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) else { XLAT_cpu_user_regs(&c.cmp->user_regs, &v->arch.user_regs); - for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) - XLAT_trap_info(c.cmp->trap_ctxt + i, - v->arch.pv_vcpu.trap_ctxt + i); + if ( is_pv_domain(d) ) + { + for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) + XLAT_trap_info(c.cmp->trap_ctxt + i, + v->arch.pv_vcpu.trap_ctxt + i); + } } for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:56:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8VzS-0002iZ-L6; Fri, 26 Jun 2015 15:56:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzQ-0002hO-LB for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:28 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 82/F1-15949-C267D855; Fri, 26 Jun 2015 15:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435334186!17172821!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18896 invoked from network); 26 Jun 2015 15:56:27 -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; 26 Jun 2015 15:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzO-0007G8-Ch for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VzO-0004NT-BV for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:26 +0000 Date: Fri, 26 Jun 2015 15:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: don't copy to/from trap_ctxt for 32b PVH 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 57647ee9ccfd0d40c9af8fa0a1787cca182451ec Author: Boris Ostrovsky AuthorDate: Mon Jun 22 17:52:13 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:52:13 2015 +0200 x86/pvh: don't copy to/from trap_ctxt for 32b PVH guests .. as this field is not used by PVH guests Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 9 ++++++--- xen/arch/x86/domctl.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index e396c6c..c7ef1e6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -805,9 +805,12 @@ int arch_set_info_guest( else { XLAT_cpu_user_regs(&v->arch.user_regs, &c.cmp->user_regs); - for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) - XLAT_trap_info(v->arch.pv_vcpu.trap_ctxt + i, - c.cmp->trap_ctxt + i); + if ( is_pv_domain(d) ) + { + for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) + XLAT_trap_info(v->arch.pv_vcpu.trap_ctxt + i, + c.cmp->trap_ctxt + i); + } } if ( has_hvm_container_domain(d) ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d8ffe2b..82bd818 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1204,9 +1204,12 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) else { XLAT_cpu_user_regs(&c.cmp->user_regs, &v->arch.user_regs); - for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) - XLAT_trap_info(c.cmp->trap_ctxt + i, - v->arch.pv_vcpu.trap_ctxt + i); + if ( is_pv_domain(d) ) + { + for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) + XLAT_trap_info(c.cmp->trap_ctxt + i, + v->arch.pv_vcpu.trap_ctxt + i); + } } for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:56:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8Vzd-0002n9-Ov; Fri, 26 Jun 2015 15:56:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzb-0002mD-OW for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:39 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id FC/22-15949-7367D855; Fri, 26 Jun 2015 15:56:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435334197!17172863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19642 invoked from network); 26 Jun 2015 15:56:38 -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; 26 Jun 2015 15:56:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzY-0007GF-I0 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VzY-0004Nt-H5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:36 +0000 Date: Fri, 26 Jun 2015 15:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: properly initialize PVH guest's CR3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12e88138233f1444388dbc346c5aa6c0a1d45d9f Author: Boris Ostrovsky AuthorDate: Mon Jun 22 17:52:39 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:52:39 2015 +0200 x86/pvh: properly initialize PVH guest's CR3 .. based on whether the guest is 32- or 64-bit Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index c7ef1e6..ba28f38 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -828,7 +828,7 @@ int arch_set_info_guest( cr3_page = get_page_from_gfn(d, cr3_gfn, NULL, P2M_ALLOC); v->arch.cr3 = page_to_maddr(cr3_page); - v->arch.hvm_vcpu.guest_cr[3] = c.nat->ctrlreg[3]; + v->arch.hvm_vcpu.guest_cr[3] = c(ctrlreg[3]); v->arch.guest_table = pagetable_from_page(cr3_page); ASSERT(paging_mode_enabled(d)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:56:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8Vzd-0002n9-Ov; Fri, 26 Jun 2015 15:56:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzb-0002mD-OW for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:39 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id FC/22-15949-7367D855; Fri, 26 Jun 2015 15:56:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435334197!17172863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19642 invoked from network); 26 Jun 2015 15:56:38 -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; 26 Jun 2015 15:56:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8VzY-0007GF-I0 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8VzY-0004Nt-H5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:36 +0000 Date: Fri, 26 Jun 2015 15:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: properly initialize PVH guest's CR3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12e88138233f1444388dbc346c5aa6c0a1d45d9f Author: Boris Ostrovsky AuthorDate: Mon Jun 22 17:52:39 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:52:39 2015 +0200 x86/pvh: properly initialize PVH guest's CR3 .. based on whether the guest is 32- or 64-bit Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index c7ef1e6..ba28f38 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -828,7 +828,7 @@ int arch_set_info_guest( cr3_page = get_page_from_gfn(d, cr3_gfn, NULL, P2M_ALLOC); v->arch.cr3 = page_to_maddr(cr3_page); - v->arch.hvm_vcpu.guest_cr[3] = c.nat->ctrlreg[3]; + v->arch.hvm_vcpu.guest_cr[3] = c(ctrlreg[3]); v->arch.guest_table = pagetable_from_page(cr3_page); ASSERT(paging_mode_enabled(d)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:56:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8Vzm-0002r3-Re; Fri, 26 Jun 2015 15:56:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzl-0002qF-9p for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:49 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 13/45-06457-0467D855; Fri, 26 Jun 2015 15:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435334206!20204383!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26554 invoked from network); 26 Jun 2015 15:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzi-0007GS-MU for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vzi-0004OF-Lf for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:46 +0000 Date: Fri, 26 Jun 2015 15:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vLAPIC: adjust types in internal read/write handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f28a9a2acf4efc999abfd40c39189dc34d0f3877 Author: Jan Beulich AuthorDate: Mon Jun 22 17:53:21 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:53:21 2015 +0200 x86/vLAPIC: adjust types in internal read/write handling - use 32-bit types where possible (produces slightly better code) - drop (now) unnecessary casts - avoid indirection where not needed - avoid duplicate log messages in vlapic_write() - minor other cleanup Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vlapic.c | 83 +++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index fbc51d1..a5c3aba 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -556,52 +556,42 @@ static void vlapic_set_tdcr(struct vlapic *vlapic, unsigned int val) "timer_divisor: %d", vlapic->hw.timer_divisor); } -static void vlapic_read_aligned( - struct vlapic *vlapic, unsigned int offset, unsigned int *result) +static uint32_t vlapic_read_aligned(struct vlapic *vlapic, unsigned int offset) { switch ( offset ) { case APIC_PROCPRI: - *result = vlapic_get_ppr(vlapic); - break; + return vlapic_get_ppr(vlapic); case APIC_TMCCT: /* Timer CCR */ if ( !vlapic_lvtt_oneshot(vlapic) && !vlapic_lvtt_period(vlapic) ) - { - *result = 0; break; - } - *result = vlapic_get_tmcct(vlapic); - break; + return vlapic_get_tmcct(vlapic); case APIC_TMICT: /* Timer ICR */ if ( !vlapic_lvtt_oneshot(vlapic) && !vlapic_lvtt_period(vlapic) ) - { - *result = 0; break; - } + /* fall through */ default: - *result = vlapic_get_reg(vlapic, offset); - break; + return vlapic_get_reg(vlapic, offset); } + + return 0; } static int vlapic_read( struct vcpu *v, unsigned long address, unsigned long len, unsigned long *pval) { - unsigned int alignment; - unsigned int tmp; - unsigned long result = 0; struct vlapic *vlapic = vcpu_vlapic(v); unsigned int offset = address - vlapic_base_address(vlapic); + unsigned int alignment = offset & 3, tmp, result = 0; if ( offset > (APIC_TDCR + 0x3) ) goto out; - alignment = offset & 0x3; + tmp = vlapic_read_aligned(vlapic, offset & ~3); - vlapic_read_aligned(vlapic, offset & ~0x3, &tmp); switch ( len ) { case 1: @@ -627,7 +617,7 @@ static int vlapic_read( } HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "offset %#x with length %#lx, " - "and the result is %#lx", offset, len, result); + "and the result is %#x", offset, len, result); out: *pval = result; @@ -657,19 +647,17 @@ int hvm_x2apic_msr_read(struct vcpu *v, unsigned int msr, uint64_t *msr_content) #undef REGBLOCK }; struct vlapic *vlapic = vcpu_vlapic(v); - uint32_t low, high = 0, reg = msr - MSR_IA32_APICBASE_MSR, - offset = reg << 4; + uint32_t high = 0, reg = msr - MSR_IA32_APICBASE_MSR, offset = reg << 4; if ( !vlapic_x2apic_mode(vlapic) || (reg >= sizeof(readable) * 8) || !test_bit(reg, readable) ) return X86EMUL_UNHANDLEABLE; if ( offset == APIC_ICR ) - vlapic_read_aligned(vlapic, APIC_ICR2, &high); + high = vlapic_read_aligned(vlapic, APIC_ICR2); - vlapic_read_aligned(vlapic, offset, &low); - - *msr_content = (((uint64_t)high) << 32) | low; + *msr_content = ((uint64_t)high << 32) | + vlapic_read_aligned(vlapic, offset); return X86EMUL_OKAY; } @@ -687,7 +675,7 @@ static void vlapic_tdt_pt_cb(struct vcpu *v, void *data) } static int vlapic_reg_write(struct vcpu *v, - unsigned int offset, unsigned long val) + unsigned int offset, uint32_t val) { struct vlapic *vlapic = vcpu_vlapic(v); int rc = X86EMUL_OKAY; @@ -797,8 +785,7 @@ static int vlapic_reg_write(struct vcpu *v, break; } - period = ((uint64_t)APIC_BUS_CYCLE_NS * - (uint32_t)val * vlapic->hw.timer_divisor); + period = (uint64_t)APIC_BUS_CYCLE_NS * val * vlapic->hw.timer_divisor; TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(period), TRC_PAR_LONG(vlapic_lvtt_period(vlapic) ? period : 0LL), vlapic->pt.irq); @@ -811,7 +798,7 @@ static int vlapic_reg_write(struct vcpu *v, HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "bus cycle is %uns, " - "initial count %lu, period %"PRIu64"ns", + "initial count %u, period %"PRIu64"ns", APIC_BUS_CYCLE_NS, val, period); } break; @@ -847,47 +834,41 @@ static int vlapic_write(struct vcpu *v, unsigned long address, * According to the IA32 Manual, all accesses should be 32 bits. * Some OSes do 8- or 16-byte accesses, however. */ - val = (uint32_t)val; - if ( len != 4 ) + if ( unlikely(len != 4) ) { - unsigned int tmp; - unsigned char alignment; - - gdprintk(XENLOG_INFO, "Notice: Local APIC write with len = %lx\n",len); - - alignment = offset & 0x3; - (void)vlapic_read_aligned(vlapic, offset & ~0x3, &tmp); + unsigned int tmp = vlapic_read_aligned(vlapic, offset & ~3); + unsigned char alignment = (offset & 3) * 8; switch ( len ) { case 1: - val = ((tmp & ~(0xff << (8*alignment))) | - ((val & 0xff) << (8*alignment))); + val = ((tmp & ~(0xffU << alignment)) | + ((val & 0xff) << alignment)); break; case 2: if ( alignment & 1 ) goto unaligned_exit_and_crash; - val = ((tmp & ~(0xffff << (8*alignment))) | - ((val & 0xffff) << (8*alignment))); + val = ((tmp & ~(0xffffU << alignment)) | + ((val & 0xffff) << alignment)); break; default: - gdprintk(XENLOG_ERR, "Local APIC write with len = %lx, " - "should be 4 instead\n", len); + gprintk(XENLOG_ERR, "LAPIC write with len %lu\n", len); goto exit_and_crash; } + + gdprintk(XENLOG_INFO, "Notice: LAPIC write with len %lu\n", len); + offset &= ~3; } - else if ( (offset & 0x3) != 0 ) + else if ( unlikely(offset & 3) ) goto unaligned_exit_and_crash; - offset &= ~0x3; - return vlapic_reg_write(v, offset, val); unaligned_exit_and_crash: - gdprintk(XENLOG_ERR, "Unaligned LAPIC write len=%#lx at offset=%#x.\n", - len, offset); + gprintk(XENLOG_ERR, "Unaligned LAPIC write: len=%lu offset=%#x.\n", + len, offset); exit_and_crash: domain_crash(v->domain); return rc; @@ -983,7 +964,7 @@ int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t msr_content) return X86EMUL_UNHANDLEABLE; } - return vlapic_reg_write(v, offset, (uint32_t)msr_content); + return vlapic_reg_write(v, offset, msr_content); } static int vlapic_range(struct vcpu *v, unsigned long addr) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:56:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:56: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 1Z8Vzm-0002r3-Re; Fri, 26 Jun 2015 15:56:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzl-0002qF-9p for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:49 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 13/45-06457-0467D855; Fri, 26 Jun 2015 15:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435334206!20204383!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26554 invoked from network); 26 Jun 2015 15:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzi-0007GS-MU for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vzi-0004OF-Lf for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:46 +0000 Date: Fri, 26 Jun 2015 15:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vLAPIC: adjust types in internal read/write handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f28a9a2acf4efc999abfd40c39189dc34d0f3877 Author: Jan Beulich AuthorDate: Mon Jun 22 17:53:21 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 17:53:21 2015 +0200 x86/vLAPIC: adjust types in internal read/write handling - use 32-bit types where possible (produces slightly better code) - drop (now) unnecessary casts - avoid indirection where not needed - avoid duplicate log messages in vlapic_write() - minor other cleanup Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vlapic.c | 83 +++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index fbc51d1..a5c3aba 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -556,52 +556,42 @@ static void vlapic_set_tdcr(struct vlapic *vlapic, unsigned int val) "timer_divisor: %d", vlapic->hw.timer_divisor); } -static void vlapic_read_aligned( - struct vlapic *vlapic, unsigned int offset, unsigned int *result) +static uint32_t vlapic_read_aligned(struct vlapic *vlapic, unsigned int offset) { switch ( offset ) { case APIC_PROCPRI: - *result = vlapic_get_ppr(vlapic); - break; + return vlapic_get_ppr(vlapic); case APIC_TMCCT: /* Timer CCR */ if ( !vlapic_lvtt_oneshot(vlapic) && !vlapic_lvtt_period(vlapic) ) - { - *result = 0; break; - } - *result = vlapic_get_tmcct(vlapic); - break; + return vlapic_get_tmcct(vlapic); case APIC_TMICT: /* Timer ICR */ if ( !vlapic_lvtt_oneshot(vlapic) && !vlapic_lvtt_period(vlapic) ) - { - *result = 0; break; - } + /* fall through */ default: - *result = vlapic_get_reg(vlapic, offset); - break; + return vlapic_get_reg(vlapic, offset); } + + return 0; } static int vlapic_read( struct vcpu *v, unsigned long address, unsigned long len, unsigned long *pval) { - unsigned int alignment; - unsigned int tmp; - unsigned long result = 0; struct vlapic *vlapic = vcpu_vlapic(v); unsigned int offset = address - vlapic_base_address(vlapic); + unsigned int alignment = offset & 3, tmp, result = 0; if ( offset > (APIC_TDCR + 0x3) ) goto out; - alignment = offset & 0x3; + tmp = vlapic_read_aligned(vlapic, offset & ~3); - vlapic_read_aligned(vlapic, offset & ~0x3, &tmp); switch ( len ) { case 1: @@ -627,7 +617,7 @@ static int vlapic_read( } HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "offset %#x with length %#lx, " - "and the result is %#lx", offset, len, result); + "and the result is %#x", offset, len, result); out: *pval = result; @@ -657,19 +647,17 @@ int hvm_x2apic_msr_read(struct vcpu *v, unsigned int msr, uint64_t *msr_content) #undef REGBLOCK }; struct vlapic *vlapic = vcpu_vlapic(v); - uint32_t low, high = 0, reg = msr - MSR_IA32_APICBASE_MSR, - offset = reg << 4; + uint32_t high = 0, reg = msr - MSR_IA32_APICBASE_MSR, offset = reg << 4; if ( !vlapic_x2apic_mode(vlapic) || (reg >= sizeof(readable) * 8) || !test_bit(reg, readable) ) return X86EMUL_UNHANDLEABLE; if ( offset == APIC_ICR ) - vlapic_read_aligned(vlapic, APIC_ICR2, &high); + high = vlapic_read_aligned(vlapic, APIC_ICR2); - vlapic_read_aligned(vlapic, offset, &low); - - *msr_content = (((uint64_t)high) << 32) | low; + *msr_content = ((uint64_t)high << 32) | + vlapic_read_aligned(vlapic, offset); return X86EMUL_OKAY; } @@ -687,7 +675,7 @@ static void vlapic_tdt_pt_cb(struct vcpu *v, void *data) } static int vlapic_reg_write(struct vcpu *v, - unsigned int offset, unsigned long val) + unsigned int offset, uint32_t val) { struct vlapic *vlapic = vcpu_vlapic(v); int rc = X86EMUL_OKAY; @@ -797,8 +785,7 @@ static int vlapic_reg_write(struct vcpu *v, break; } - period = ((uint64_t)APIC_BUS_CYCLE_NS * - (uint32_t)val * vlapic->hw.timer_divisor); + period = (uint64_t)APIC_BUS_CYCLE_NS * val * vlapic->hw.timer_divisor; TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(period), TRC_PAR_LONG(vlapic_lvtt_period(vlapic) ? period : 0LL), vlapic->pt.irq); @@ -811,7 +798,7 @@ static int vlapic_reg_write(struct vcpu *v, HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "bus cycle is %uns, " - "initial count %lu, period %"PRIu64"ns", + "initial count %u, period %"PRIu64"ns", APIC_BUS_CYCLE_NS, val, period); } break; @@ -847,47 +834,41 @@ static int vlapic_write(struct vcpu *v, unsigned long address, * According to the IA32 Manual, all accesses should be 32 bits. * Some OSes do 8- or 16-byte accesses, however. */ - val = (uint32_t)val; - if ( len != 4 ) + if ( unlikely(len != 4) ) { - unsigned int tmp; - unsigned char alignment; - - gdprintk(XENLOG_INFO, "Notice: Local APIC write with len = %lx\n",len); - - alignment = offset & 0x3; - (void)vlapic_read_aligned(vlapic, offset & ~0x3, &tmp); + unsigned int tmp = vlapic_read_aligned(vlapic, offset & ~3); + unsigned char alignment = (offset & 3) * 8; switch ( len ) { case 1: - val = ((tmp & ~(0xff << (8*alignment))) | - ((val & 0xff) << (8*alignment))); + val = ((tmp & ~(0xffU << alignment)) | + ((val & 0xff) << alignment)); break; case 2: if ( alignment & 1 ) goto unaligned_exit_and_crash; - val = ((tmp & ~(0xffff << (8*alignment))) | - ((val & 0xffff) << (8*alignment))); + val = ((tmp & ~(0xffffU << alignment)) | + ((val & 0xffff) << alignment)); break; default: - gdprintk(XENLOG_ERR, "Local APIC write with len = %lx, " - "should be 4 instead\n", len); + gprintk(XENLOG_ERR, "LAPIC write with len %lu\n", len); goto exit_and_crash; } + + gdprintk(XENLOG_INFO, "Notice: LAPIC write with len %lu\n", len); + offset &= ~3; } - else if ( (offset & 0x3) != 0 ) + else if ( unlikely(offset & 3) ) goto unaligned_exit_and_crash; - offset &= ~0x3; - return vlapic_reg_write(v, offset, val); unaligned_exit_and_crash: - gdprintk(XENLOG_ERR, "Unaligned LAPIC write len=%#lx at offset=%#x.\n", - len, offset); + gprintk(XENLOG_ERR, "Unaligned LAPIC write: len=%lu offset=%#x.\n", + len, offset); exit_and_crash: domain_crash(v->domain); return rc; @@ -983,7 +964,7 @@ int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t msr_content) return X86EMUL_UNHANDLEABLE; } - return vlapic_reg_write(v, offset, (uint32_t)msr_content); + return vlapic_reg_write(v, offset, msr_content); } static int vlapic_range(struct vcpu *v, unsigned long addr) -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:57:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzw-0002uL-UN; Fri, 26 Jun 2015 15:57:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzv-0002tc-09 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:59 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 99/CA-10437-A467D855; Fri, 26 Jun 2015 15:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435334217!15777973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27481 invoked from network); 26 Jun 2015 15:56:57 -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; 26 Jun 2015 15:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzs-0007Gg-R0 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vzs-0004Ob-Ph for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:56 +0000 Date: Fri, 26 Jun 2015 15:56: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 6b444c8e1c19fac08c82f18011ad00ca185e4e80 Author: Ian Jackson AuthorDate: Tue Jun 23 11:42:28 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:28 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 081a599..969a581 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 38609ae72b0a9e09b42be94f469fef928a1049fa -# Tue Jun 9 16:13:11 2015 +0100 -# ... by default. Add a per-device "permissive" mode similar to pciback's +QEMU_TRADITIONAL_REVISION ?= 3e2e51ecc1120bd59537ed19b6bc7066511c7e2e +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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. -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:57:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzw-0002uL-UN; Fri, 26 Jun 2015 15:57:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzv-0002tc-09 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:59 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 99/CA-10437-A467D855; Fri, 26 Jun 2015 15:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435334217!15777973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27481 invoked from network); 26 Jun 2015 15:56:57 -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; 26 Jun 2015 15:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8Vzs-0007Gg-R0 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8Vzs-0004Ob-Ph for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:56:56 +0000 Date: Fri, 26 Jun 2015 15:56: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 6b444c8e1c19fac08c82f18011ad00ca185e4e80 Author: Ian Jackson AuthorDate: Tue Jun 23 11:42:28 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:42:28 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 081a599..969a581 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 38609ae72b0a9e09b42be94f469fef928a1049fa -# Tue Jun 9 16:13:11 2015 +0100 -# ... by default. Add a per-device "permissive" mode similar to pciback's +QEMU_TRADITIONAL_REVISION ?= 3e2e51ecc1120bd59537ed19b6bc7066511c7e2e +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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. -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:57:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W06-0002xt-2o; Fri, 26 Jun 2015 15:57:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W05-0002xS-7I for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:09 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 20/BA-01068-4567D855; Fri, 26 Jun 2015 15:57:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435334227!17768943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4102 invoked from network); 26 Jun 2015 15:57:08 -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; 26 Jun 2015 15:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W03-0007HL-2x for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W02-0004Pd-W3 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:07 +0000 Date: Fri, 26 Jun 2015 15:57:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/compat: manage argument translation area separately from l4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64cb2c00d544d7d2b0beb4f93ed4851eeab8c567 Author: Boris Ostrovsky AuthorDate: Tue Jun 23 18:04:23 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:06:27 2015 +0200 x86/compat: manage argument translation area separately from l4 Managing l4 page table and argument translation area are two unrelated operations and should be handled separately Signed-off-by: Boris Ostrovsky --- xen/arch/x86/domain.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ba28f38..29f3c1a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -321,19 +321,11 @@ static int setup_compat_l4(struct vcpu *v) { struct page_info *pg; l4_pgentry_t *l4tab; - int rc; pg = alloc_domheap_page(v->domain, MEMF_no_owner); if ( pg == NULL ) return -ENOMEM; - rc = setup_compat_arg_xlat(v); - if ( rc ) - { - free_domheap_page(pg); - return rc; - } - /* This page needs to look like a pagetable so that it can be shadowed */ pg->u.inuse.type_info = PGT_l4_page_table|PGT_validated|1; @@ -350,7 +342,6 @@ static int setup_compat_l4(struct vcpu *v) static void release_compat_l4(struct vcpu *v) { - free_compat_arg_xlat(v); free_domheap_page(pagetable_get_page(v->arch.guest_table)); v->arch.guest_table = pagetable_null(); v->arch.guest_table_user = pagetable_null(); @@ -373,7 +364,10 @@ int switch_native(struct domain *d) d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; for_each_vcpu( d, v ) + { + free_compat_arg_xlat(v); release_compat_l4(v); + } return 0; } @@ -398,8 +392,13 @@ int switch_compat(struct domain *d) d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 1; for_each_vcpu( d, v ) - if ( (rc = setup_compat_l4(v)) ) + { + rc = setup_compat_arg_xlat(v); + if ( !rc ) + rc = setup_compat_l4(v); + if ( rc ) goto undo_and_fail; + } domain_set_alloc_bitsize(d); @@ -408,8 +407,12 @@ int switch_compat(struct domain *d) undo_and_fail: d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; for_each_vcpu( d, v ) + { + free_compat_arg_xlat(v); + if ( !pagetable_is_null(v->arch.guest_table) ) release_compat_l4(v); + } return rc; } @@ -481,7 +484,17 @@ int vcpu_initialise(struct vcpu *v) v->arch.pv_vcpu.ctrlreg[4] = real_cr4_to_pv_guest_cr4(mmu_cr4_features); - rc = is_pv_32on64_domain(d) ? setup_compat_l4(v) : 0; + if ( is_pv_32on64_domain(d) ) + { + if ( (rc = setup_compat_arg_xlat(v)) ) + goto done; + + if ( (rc = setup_compat_l4(v)) ) + { + free_compat_arg_xlat(v); + goto done; + } + } done: if ( rc ) { @@ -497,7 +510,10 @@ int vcpu_initialise(struct vcpu *v) void vcpu_destroy(struct vcpu *v) { if ( is_pv_32on64_vcpu(v) ) + { + free_compat_arg_xlat(v); release_compat_l4(v); + } vcpu_destroy_fpu(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:57:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W06-0002xt-2o; Fri, 26 Jun 2015 15:57:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W05-0002xS-7I for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:09 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 20/BA-01068-4567D855; Fri, 26 Jun 2015 15:57:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435334227!17768943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4102 invoked from network); 26 Jun 2015 15:57:08 -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; 26 Jun 2015 15:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W03-0007HL-2x for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W02-0004Pd-W3 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:07 +0000 Date: Fri, 26 Jun 2015 15:57:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/compat: manage argument translation area separately from l4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64cb2c00d544d7d2b0beb4f93ed4851eeab8c567 Author: Boris Ostrovsky AuthorDate: Tue Jun 23 18:04:23 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:06:27 2015 +0200 x86/compat: manage argument translation area separately from l4 Managing l4 page table and argument translation area are two unrelated operations and should be handled separately Signed-off-by: Boris Ostrovsky --- xen/arch/x86/domain.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ba28f38..29f3c1a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -321,19 +321,11 @@ static int setup_compat_l4(struct vcpu *v) { struct page_info *pg; l4_pgentry_t *l4tab; - int rc; pg = alloc_domheap_page(v->domain, MEMF_no_owner); if ( pg == NULL ) return -ENOMEM; - rc = setup_compat_arg_xlat(v); - if ( rc ) - { - free_domheap_page(pg); - return rc; - } - /* This page needs to look like a pagetable so that it can be shadowed */ pg->u.inuse.type_info = PGT_l4_page_table|PGT_validated|1; @@ -350,7 +342,6 @@ static int setup_compat_l4(struct vcpu *v) static void release_compat_l4(struct vcpu *v) { - free_compat_arg_xlat(v); free_domheap_page(pagetable_get_page(v->arch.guest_table)); v->arch.guest_table = pagetable_null(); v->arch.guest_table_user = pagetable_null(); @@ -373,7 +364,10 @@ int switch_native(struct domain *d) d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; for_each_vcpu( d, v ) + { + free_compat_arg_xlat(v); release_compat_l4(v); + } return 0; } @@ -398,8 +392,13 @@ int switch_compat(struct domain *d) d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 1; for_each_vcpu( d, v ) - if ( (rc = setup_compat_l4(v)) ) + { + rc = setup_compat_arg_xlat(v); + if ( !rc ) + rc = setup_compat_l4(v); + if ( rc ) goto undo_and_fail; + } domain_set_alloc_bitsize(d); @@ -408,8 +407,12 @@ int switch_compat(struct domain *d) undo_and_fail: d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; for_each_vcpu( d, v ) + { + free_compat_arg_xlat(v); + if ( !pagetable_is_null(v->arch.guest_table) ) release_compat_l4(v); + } return rc; } @@ -481,7 +484,17 @@ int vcpu_initialise(struct vcpu *v) v->arch.pv_vcpu.ctrlreg[4] = real_cr4_to_pv_guest_cr4(mmu_cr4_features); - rc = is_pv_32on64_domain(d) ? setup_compat_l4(v) : 0; + if ( is_pv_32on64_domain(d) ) + { + if ( (rc = setup_compat_arg_xlat(v)) ) + goto done; + + if ( (rc = setup_compat_l4(v)) ) + { + free_compat_arg_xlat(v); + goto done; + } + } done: if ( rc ) { @@ -497,7 +510,10 @@ int vcpu_initialise(struct vcpu *v) void vcpu_destroy(struct vcpu *v) { if ( is_pv_32on64_vcpu(v) ) + { + free_compat_arg_xlat(v); release_compat_l4(v); + } vcpu_destroy_fpu(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:57:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W0H-00031X-5X; Fri, 26 Jun 2015 15:57:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0G-000313-FF for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:20 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 98/4E-08467-F567D855; Fri, 26 Jun 2015 15:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1435334237!17204500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29300 invoked from network); 26 Jun 2015 15:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0D-0007HU-Cc for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0D-0004QM-6X for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:17 +0000 Date: Fri, 26 Jun 2015 15:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: simplify hvmemul_do_io() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3036e653612bac89d5ca6800ef8e0597f2a63a1a Author: Paul Durrant AuthorDate: Tue Jun 23 18:07:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:07:03 2015 +0200 x86/hvm: simplify hvmemul_do_io() Currently hvmemul_do_io() handles paging for I/O to/from a guest address inline. This causes every exit point to have to execute: if ( ram_page ) put_page(ram_page); This patch introduces wrapper hvmemul_do_io_addr() and hvmemul_do_io_buffer() functions. The latter is used for I/O to/from a Xen buffer and thus the complexity of paging can be restricted only to the former, making the common hvmemul_do_io() function less convoluted. This patch also tightens up some types and introduces pio/mmio wrappers for the above functions with comments to document their semantics. Signed-off-by: Paul Durrant Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 278 ++++++++++++++++++++++++------------- xen/arch/x86/hvm/io.c | 4 +- xen/include/asm-x86/hvm/emulate.h | 17 ++- 3 files changed, 198 insertions(+), 101 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index ac9c9d6..9d7af0c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -51,41 +51,23 @@ static void hvmtrace_io_assist(int is_mmio, ioreq_t *p) } static int hvmemul_do_io( - int is_mmio, paddr_t addr, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data) + bool_t is_mmio, paddr_t addr, unsigned long *reps, unsigned int size, + uint8_t dir, bool_t df, bool_t data_is_addr, uintptr_t data) { struct vcpu *curr = current; - struct hvm_vcpu_io *vio; + struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; ioreq_t p = { .type = is_mmio ? IOREQ_TYPE_COPY : IOREQ_TYPE_PIO, .addr = addr, .size = size, .dir = dir, .df = df, - .data = ram_gpa, - .data_is_ptr = (p_data == NULL), + .data = data, + .data_is_ptr = data_is_addr, /* ioreq_t field name is misleading */ }; - unsigned long ram_gfn = paddr_to_pfn(ram_gpa); - p2m_type_t p2mt; - struct page_info *ram_page; + void *p_data = (void *)data; int rc; - /* Check for paged out page */ - ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); - if ( p2m_is_paging(p2mt) ) - { - if ( ram_page ) - put_page(ram_page); - p2m_mem_paging_populate(curr->domain, ram_gfn); - return X86EMUL_RETRY; - } - if ( p2m_is_shared(p2mt) ) - { - if ( ram_page ) - put_page(ram_page); - return X86EMUL_RETRY; - } - /* * Weird-sized accesses have undefined behaviour: we discard writes * and read all-ones. @@ -93,23 +75,10 @@ static int hvmemul_do_io( if ( unlikely((size > sizeof(long)) || (size & (size - 1))) ) { gdprintk(XENLOG_WARNING, "bad mmio size %d\n", size); - ASSERT(p_data != NULL); /* cannot happen with a REP prefix */ - if ( dir == IOREQ_READ ) - memset(p_data, ~0, size); - if ( ram_page ) - put_page(ram_page); return X86EMUL_UNHANDLEABLE; } - if ( !p.data_is_ptr && (dir == IOREQ_WRITE) ) - { - memcpy(&p.data, p_data, size); - p_data = NULL; - } - - vio = &curr->arch.hvm_vcpu.hvm_io; - - if ( is_mmio && !p.data_is_ptr ) + if ( is_mmio && !data_is_addr ) { /* Part of a multi-cycle read or write? */ if ( dir == IOREQ_WRITE ) @@ -117,11 +86,7 @@ static int hvmemul_do_io( paddr_t pa = vio->mmio_large_write_pa; unsigned int bytes = vio->mmio_large_write_bytes; if ( (addr >= pa) && ((addr + size) <= (pa + bytes)) ) - { - if ( ram_page ) - put_page(ram_page); return X86EMUL_OKAY; - } } else { @@ -131,8 +96,6 @@ static int hvmemul_do_io( { memcpy(p_data, &vio->mmio_large_read[addr - pa], size); - if ( ram_page ) - put_page(ram_page); return X86EMUL_OKAY; } } @@ -144,40 +107,28 @@ static int hvmemul_do_io( break; case HVMIO_completed: vio->io_state = HVMIO_none; - if ( p_data == NULL ) - { - if ( ram_page ) - put_page(ram_page); + if ( data_is_addr || dir == IOREQ_WRITE ) return X86EMUL_UNHANDLEABLE; - } goto finish_access; case HVMIO_dispatched: /* May have to wait for previous cycle of a multi-write to complete. */ - if ( is_mmio && !p.data_is_ptr && (dir == IOREQ_WRITE) && + if ( is_mmio && !data_is_addr && (dir == IOREQ_WRITE) && (addr == (vio->mmio_large_write_pa + vio->mmio_large_write_bytes)) ) - { - if ( ram_page ) - put_page(ram_page); return X86EMUL_RETRY; - } /* fallthrough */ default: - if ( ram_page ) - put_page(ram_page); return X86EMUL_UNHANDLEABLE; } if ( hvm_io_pending(curr) ) { gdprintk(XENLOG_WARNING, "WARNING: io already pending?\n"); - if ( ram_page ) - put_page(ram_page); return X86EMUL_UNHANDLEABLE; } - vio->io_state = - (p_data == NULL) ? HVMIO_dispatched : HVMIO_awaiting_completion; + vio->io_state = (data_is_addr || dir == IOREQ_WRITE) ? + HVMIO_dispatched : HVMIO_awaiting_completion; vio->io_size = size; /* @@ -190,7 +141,12 @@ static int hvmemul_do_io( p.count = *reps; if ( dir == IOREQ_WRITE ) + { + if ( !data_is_addr ) + memcpy(&p.data, p_data, size); + hvmtrace_io_assist(is_mmio, &p); + } if ( is_mmio ) { @@ -235,7 +191,7 @@ static int hvmemul_do_io( rc = X86EMUL_RETRY; if ( !hvm_send_assist_req(s, &p) ) vio->io_state = HVMIO_none; - else if ( p_data == NULL ) + else if ( data_is_addr || dir == IOREQ_WRITE ) rc = X86EMUL_OKAY; } break; @@ -245,20 +201,18 @@ static int hvmemul_do_io( } if ( rc != X86EMUL_OKAY ) - { - if ( ram_page ) - put_page(ram_page); return rc; - } finish_access: if ( dir == IOREQ_READ ) + { hvmtrace_io_assist(is_mmio, &p); - if ( p_data != NULL ) - memcpy(p_data, &vio->io_data, size); + if ( !data_is_addr ) + memcpy(p_data, &vio->io_data, size); + } - if ( is_mmio && !p.data_is_ptr ) + if ( is_mmio && !data_is_addr ) { /* Part of a multi-cycle read or write? */ if ( dir == IOREQ_WRITE ) @@ -285,23 +239,153 @@ static int hvmemul_do_io( } } - if ( ram_page ) - put_page(ram_page); return X86EMUL_OKAY; } -int hvmemul_do_pio( - unsigned long port, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data) +static int hvmemul_do_io_buffer( + bool_t is_mmio, paddr_t addr, unsigned long *reps, unsigned int size, + uint8_t dir, bool_t df, void *buffer) +{ + int rc; + + BUG_ON(buffer == NULL); + + rc = hvmemul_do_io(is_mmio, addr, reps, size, dir, df, 0, + (uintptr_t)buffer); + if ( rc == X86EMUL_UNHANDLEABLE && dir == IOREQ_READ ) + memset(buffer, 0xff, size); + + return rc; +} + +static int hvmemul_acquire_page(unsigned long gmfn, struct page_info **page) +{ + struct domain *curr_d = current->domain; + p2m_type_t p2mt; + + *page = get_page_from_gfn(curr_d, gmfn, &p2mt, P2M_UNSHARE); + + if ( *page == NULL ) + return X86EMUL_UNHANDLEABLE; + + if ( p2m_is_paging(p2mt) ) + { + put_page(*page); + p2m_mem_paging_populate(curr_d, gmfn); + return X86EMUL_RETRY; + } + + if ( p2m_is_shared(p2mt) ) + { + put_page(*page); + return X86EMUL_RETRY; + } + + return X86EMUL_OKAY; +} + +static inline void hvmemul_release_page(struct page_info *page) { - return hvmemul_do_io(0, port, reps, size, ram_gpa, dir, df, p_data); + put_page(page); } -static int hvmemul_do_mmio( - paddr_t gpa, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data) +static int hvmemul_do_io_addr( + bool_t is_mmio, paddr_t addr, unsigned long *reps, + unsigned int size, uint8_t dir, bool_t df, paddr_t ram_gpa) +{ + struct page_info *ram_page; + int rc; + + rc = hvmemul_acquire_page(paddr_to_pfn(ram_gpa), &ram_page); + if ( rc != X86EMUL_OKAY ) + return rc; + + rc = hvmemul_do_io(is_mmio, addr, reps, size, dir, df, 1, + ram_gpa); + + hvmemul_release_page(ram_page); + + return rc; +} + +/* + * Perform I/O between and . indicates the + * direction: IOREQ_READ means a read from to and + * IOREQ_WRITE means a write from to . Each access has + * width . + */ +int hvmemul_do_pio_buffer(uint16_t port, + unsigned int size, + uint8_t dir, + void *buffer) +{ + unsigned long one_rep = 1; + + return hvmemul_do_io_buffer(0, port, &one_rep, size, dir, 0, buffer); +} + +/* + * Perform I/O between and guest RAM starting at . + * indicates the direction: IOREQ_READ means a read from to + * RAM and IOREQ_WRITE means a write from RAM to . Each access has + * width and up to * accesses will be performed. If + * X86EMUL_OKAY is returned then will be updated with the number + * of accesses actually performed. + * Each access will be done to/from successive RAM addresses, increasing + * if is 0 or decreasing if is 1. + */ +static int hvmemul_do_pio_addr(uint16_t port, + unsigned long *reps, + unsigned int size, + uint8_t dir, + bool_t df, + paddr_t ram_addr) +{ + return hvmemul_do_io_addr(0, port, reps, size, dir, df, ram_addr); +} + +/* + * Perform I/O between MMIO space starting at and . + * indicates the direction: IOREQ_READ means a read from MMIO to + * and IOREQ_WRITE means a write from to MMIO. Each + * access has width and up to * accesses will be performed. + * If X86EMUL_OKAY is returned then will be updated with the number + * of accesses actually performed. + * Each access will be done to/from successive MMIO addresses, increasing + * if is 0 or decreasing if is 1. + * + * NOTE: If * is greater than 1, each access will use the + * pointer; there is no implicit interation over a + * block of memory starting at . + */ +static int hvmemul_do_mmio_buffer(paddr_t mmio_gpa, + unsigned long *reps, + unsigned int size, + uint8_t dir, + bool_t df, + void *buffer) +{ + return hvmemul_do_io_buffer(1, mmio_gpa, reps, size, dir, df, buffer); +} + +/* + * Perform I/O between MMIO space starting at and guest RAM + * starting at . indicates the direction: IOREQ_READ + * means a read from MMIO to RAM and IOREQ_WRITE means a write from RAM + * to MMIO. Each access has width and up to * accesses will + * be performed. If X86EMUL_OKAY is returned then will be updated + * with the number of accesses actually performed. + * Each access will be done to/from successive RAM *and* MMIO addresses, + * increasing if is 0 or decreasing if is 1. + */ +static int hvmemul_do_mmio_addr(paddr_t mmio_gpa, + unsigned long *reps, + unsigned int size, + uint8_t dir, + bool_t df, + paddr_t ram_gpa) { - return hvmemul_do_io(1, gpa, reps, size, ram_gpa, dir, df, p_data); + return hvmemul_do_io_addr(1, mmio_gpa, reps, size, dir, df, ram_gpa); } /* @@ -503,7 +587,8 @@ static int __hvmemul_read( gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_READ, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) return rc; addr += chunk; @@ -537,7 +622,8 @@ static int __hvmemul_read( hvmemul_ctxt); while ( rc == X86EMUL_OKAY ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_READ, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) break; addr += chunk; @@ -645,7 +731,8 @@ static int hvmemul_write( gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_WRITE, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) return rc; addr += chunk; @@ -675,7 +762,8 @@ static int hvmemul_write( hvmemul_ctxt); while ( rc == X86EMUL_OKAY ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_WRITE, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) break; addr += chunk; @@ -849,8 +937,8 @@ static int hvmemul_rep_ins( if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) return X86EMUL_UNHANDLEABLE; - return hvmemul_do_pio(src_port, reps, bytes_per_rep, gpa, IOREQ_READ, - !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); + return hvmemul_do_pio_addr(src_port, reps, bytes_per_rep, IOREQ_READ, + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_outs( @@ -887,8 +975,8 @@ static int hvmemul_rep_outs( if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) return X86EMUL_UNHANDLEABLE; - return hvmemul_do_pio(dst_port, reps, bytes_per_rep, gpa, IOREQ_WRITE, - !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); + return hvmemul_do_pio_addr(dst_port, reps, bytes_per_rep, IOREQ_WRITE, + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_movs( @@ -944,12 +1032,12 @@ static int hvmemul_rep_movs( return X86EMUL_UNHANDLEABLE; if ( sp2mt == p2m_mmio_dm ) - return hvmemul_do_mmio( - sgpa, reps, bytes_per_rep, dgpa, IOREQ_READ, df, NULL); + return hvmemul_do_mmio_addr( + sgpa, reps, bytes_per_rep, IOREQ_READ, df, dgpa); if ( dp2mt == p2m_mmio_dm ) - return hvmemul_do_mmio( - dgpa, reps, bytes_per_rep, sgpa, IOREQ_WRITE, df, NULL); + return hvmemul_do_mmio_addr( + dgpa, reps, bytes_per_rep, IOREQ_WRITE, df, sgpa); /* RAM-to-RAM copy: emulate as equivalent of memmove(dgpa, sgpa, bytes). */ bytes = *reps * bytes_per_rep; @@ -1102,8 +1190,8 @@ static int hvmemul_rep_stos( return X86EMUL_UNHANDLEABLE; case p2m_mmio_dm: - return hvmemul_do_mmio(gpa, reps, bytes_per_rep, 0, IOREQ_WRITE, df, - p_data); + return hvmemul_do_mmio_buffer(gpa, reps, bytes_per_rep, IOREQ_WRITE, df, + p_data); } } @@ -1140,9 +1228,8 @@ static int hvmemul_read_io( unsigned long *val, struct x86_emulate_ctxt *ctxt) { - unsigned long reps = 1; *val = 0; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_READ, 0, val); + return hvmemul_do_pio_buffer(port, bytes, IOREQ_READ, val); } static int hvmemul_write_io( @@ -1151,8 +1238,7 @@ static int hvmemul_write_io( unsigned long val, struct x86_emulate_ctxt *ctxt) { - unsigned long reps = 1; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_WRITE, 0, &val); + return hvmemul_do_pio_buffer(port, bytes, IOREQ_WRITE, &val); } static int hvmemul_read_cr( diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 68fb890..c0964ec 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -132,7 +132,7 @@ int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; - unsigned long data, reps = 1; + unsigned long data; int rc; ASSERT((size - 1) < 4 && size != 3); @@ -140,7 +140,7 @@ int handle_pio(uint16_t port, unsigned int size, int dir) if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; - rc = hvmemul_do_pio(port, &reps, size, 0, dir, 0, &data); + rc = hvmemul_do_pio_buffer(port, size, dir, &data); switch ( rc ) { diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index b3971c8..594be38 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -50,11 +50,22 @@ struct segment_register *hvmemul_get_seg_reg( enum x86_segment seg, struct hvm_emulate_ctxt *hvmemul_ctxt); -int hvmemul_do_pio( - unsigned long port, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data); +int hvmemul_do_pio_buffer(uint16_t port, + unsigned int size, + uint8_t dir, + void *buffer); void hvm_dump_emulation_state(const char *prefix, struct hvm_emulate_ctxt *hvmemul_ctxt); #endif /* __ASM_X86_HVM_EMULATE_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:57:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W0H-00031X-5X; Fri, 26 Jun 2015 15:57:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0G-000313-FF for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:20 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 98/4E-08467-F567D855; Fri, 26 Jun 2015 15:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1435334237!17204500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29300 invoked from network); 26 Jun 2015 15:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0D-0007HU-Cc for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0D-0004QM-6X for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:17 +0000 Date: Fri, 26 Jun 2015 15:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: simplify hvmemul_do_io() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3036e653612bac89d5ca6800ef8e0597f2a63a1a Author: Paul Durrant AuthorDate: Tue Jun 23 18:07:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:07:03 2015 +0200 x86/hvm: simplify hvmemul_do_io() Currently hvmemul_do_io() handles paging for I/O to/from a guest address inline. This causes every exit point to have to execute: if ( ram_page ) put_page(ram_page); This patch introduces wrapper hvmemul_do_io_addr() and hvmemul_do_io_buffer() functions. The latter is used for I/O to/from a Xen buffer and thus the complexity of paging can be restricted only to the former, making the common hvmemul_do_io() function less convoluted. This patch also tightens up some types and introduces pio/mmio wrappers for the above functions with comments to document their semantics. Signed-off-by: Paul Durrant Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 278 ++++++++++++++++++++++++------------- xen/arch/x86/hvm/io.c | 4 +- xen/include/asm-x86/hvm/emulate.h | 17 ++- 3 files changed, 198 insertions(+), 101 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index ac9c9d6..9d7af0c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -51,41 +51,23 @@ static void hvmtrace_io_assist(int is_mmio, ioreq_t *p) } static int hvmemul_do_io( - int is_mmio, paddr_t addr, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data) + bool_t is_mmio, paddr_t addr, unsigned long *reps, unsigned int size, + uint8_t dir, bool_t df, bool_t data_is_addr, uintptr_t data) { struct vcpu *curr = current; - struct hvm_vcpu_io *vio; + struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; ioreq_t p = { .type = is_mmio ? IOREQ_TYPE_COPY : IOREQ_TYPE_PIO, .addr = addr, .size = size, .dir = dir, .df = df, - .data = ram_gpa, - .data_is_ptr = (p_data == NULL), + .data = data, + .data_is_ptr = data_is_addr, /* ioreq_t field name is misleading */ }; - unsigned long ram_gfn = paddr_to_pfn(ram_gpa); - p2m_type_t p2mt; - struct page_info *ram_page; + void *p_data = (void *)data; int rc; - /* Check for paged out page */ - ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); - if ( p2m_is_paging(p2mt) ) - { - if ( ram_page ) - put_page(ram_page); - p2m_mem_paging_populate(curr->domain, ram_gfn); - return X86EMUL_RETRY; - } - if ( p2m_is_shared(p2mt) ) - { - if ( ram_page ) - put_page(ram_page); - return X86EMUL_RETRY; - } - /* * Weird-sized accesses have undefined behaviour: we discard writes * and read all-ones. @@ -93,23 +75,10 @@ static int hvmemul_do_io( if ( unlikely((size > sizeof(long)) || (size & (size - 1))) ) { gdprintk(XENLOG_WARNING, "bad mmio size %d\n", size); - ASSERT(p_data != NULL); /* cannot happen with a REP prefix */ - if ( dir == IOREQ_READ ) - memset(p_data, ~0, size); - if ( ram_page ) - put_page(ram_page); return X86EMUL_UNHANDLEABLE; } - if ( !p.data_is_ptr && (dir == IOREQ_WRITE) ) - { - memcpy(&p.data, p_data, size); - p_data = NULL; - } - - vio = &curr->arch.hvm_vcpu.hvm_io; - - if ( is_mmio && !p.data_is_ptr ) + if ( is_mmio && !data_is_addr ) { /* Part of a multi-cycle read or write? */ if ( dir == IOREQ_WRITE ) @@ -117,11 +86,7 @@ static int hvmemul_do_io( paddr_t pa = vio->mmio_large_write_pa; unsigned int bytes = vio->mmio_large_write_bytes; if ( (addr >= pa) && ((addr + size) <= (pa + bytes)) ) - { - if ( ram_page ) - put_page(ram_page); return X86EMUL_OKAY; - } } else { @@ -131,8 +96,6 @@ static int hvmemul_do_io( { memcpy(p_data, &vio->mmio_large_read[addr - pa], size); - if ( ram_page ) - put_page(ram_page); return X86EMUL_OKAY; } } @@ -144,40 +107,28 @@ static int hvmemul_do_io( break; case HVMIO_completed: vio->io_state = HVMIO_none; - if ( p_data == NULL ) - { - if ( ram_page ) - put_page(ram_page); + if ( data_is_addr || dir == IOREQ_WRITE ) return X86EMUL_UNHANDLEABLE; - } goto finish_access; case HVMIO_dispatched: /* May have to wait for previous cycle of a multi-write to complete. */ - if ( is_mmio && !p.data_is_ptr && (dir == IOREQ_WRITE) && + if ( is_mmio && !data_is_addr && (dir == IOREQ_WRITE) && (addr == (vio->mmio_large_write_pa + vio->mmio_large_write_bytes)) ) - { - if ( ram_page ) - put_page(ram_page); return X86EMUL_RETRY; - } /* fallthrough */ default: - if ( ram_page ) - put_page(ram_page); return X86EMUL_UNHANDLEABLE; } if ( hvm_io_pending(curr) ) { gdprintk(XENLOG_WARNING, "WARNING: io already pending?\n"); - if ( ram_page ) - put_page(ram_page); return X86EMUL_UNHANDLEABLE; } - vio->io_state = - (p_data == NULL) ? HVMIO_dispatched : HVMIO_awaiting_completion; + vio->io_state = (data_is_addr || dir == IOREQ_WRITE) ? + HVMIO_dispatched : HVMIO_awaiting_completion; vio->io_size = size; /* @@ -190,7 +141,12 @@ static int hvmemul_do_io( p.count = *reps; if ( dir == IOREQ_WRITE ) + { + if ( !data_is_addr ) + memcpy(&p.data, p_data, size); + hvmtrace_io_assist(is_mmio, &p); + } if ( is_mmio ) { @@ -235,7 +191,7 @@ static int hvmemul_do_io( rc = X86EMUL_RETRY; if ( !hvm_send_assist_req(s, &p) ) vio->io_state = HVMIO_none; - else if ( p_data == NULL ) + else if ( data_is_addr || dir == IOREQ_WRITE ) rc = X86EMUL_OKAY; } break; @@ -245,20 +201,18 @@ static int hvmemul_do_io( } if ( rc != X86EMUL_OKAY ) - { - if ( ram_page ) - put_page(ram_page); return rc; - } finish_access: if ( dir == IOREQ_READ ) + { hvmtrace_io_assist(is_mmio, &p); - if ( p_data != NULL ) - memcpy(p_data, &vio->io_data, size); + if ( !data_is_addr ) + memcpy(p_data, &vio->io_data, size); + } - if ( is_mmio && !p.data_is_ptr ) + if ( is_mmio && !data_is_addr ) { /* Part of a multi-cycle read or write? */ if ( dir == IOREQ_WRITE ) @@ -285,23 +239,153 @@ static int hvmemul_do_io( } } - if ( ram_page ) - put_page(ram_page); return X86EMUL_OKAY; } -int hvmemul_do_pio( - unsigned long port, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data) +static int hvmemul_do_io_buffer( + bool_t is_mmio, paddr_t addr, unsigned long *reps, unsigned int size, + uint8_t dir, bool_t df, void *buffer) +{ + int rc; + + BUG_ON(buffer == NULL); + + rc = hvmemul_do_io(is_mmio, addr, reps, size, dir, df, 0, + (uintptr_t)buffer); + if ( rc == X86EMUL_UNHANDLEABLE && dir == IOREQ_READ ) + memset(buffer, 0xff, size); + + return rc; +} + +static int hvmemul_acquire_page(unsigned long gmfn, struct page_info **page) +{ + struct domain *curr_d = current->domain; + p2m_type_t p2mt; + + *page = get_page_from_gfn(curr_d, gmfn, &p2mt, P2M_UNSHARE); + + if ( *page == NULL ) + return X86EMUL_UNHANDLEABLE; + + if ( p2m_is_paging(p2mt) ) + { + put_page(*page); + p2m_mem_paging_populate(curr_d, gmfn); + return X86EMUL_RETRY; + } + + if ( p2m_is_shared(p2mt) ) + { + put_page(*page); + return X86EMUL_RETRY; + } + + return X86EMUL_OKAY; +} + +static inline void hvmemul_release_page(struct page_info *page) { - return hvmemul_do_io(0, port, reps, size, ram_gpa, dir, df, p_data); + put_page(page); } -static int hvmemul_do_mmio( - paddr_t gpa, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data) +static int hvmemul_do_io_addr( + bool_t is_mmio, paddr_t addr, unsigned long *reps, + unsigned int size, uint8_t dir, bool_t df, paddr_t ram_gpa) +{ + struct page_info *ram_page; + int rc; + + rc = hvmemul_acquire_page(paddr_to_pfn(ram_gpa), &ram_page); + if ( rc != X86EMUL_OKAY ) + return rc; + + rc = hvmemul_do_io(is_mmio, addr, reps, size, dir, df, 1, + ram_gpa); + + hvmemul_release_page(ram_page); + + return rc; +} + +/* + * Perform I/O between and . indicates the + * direction: IOREQ_READ means a read from to and + * IOREQ_WRITE means a write from to . Each access has + * width . + */ +int hvmemul_do_pio_buffer(uint16_t port, + unsigned int size, + uint8_t dir, + void *buffer) +{ + unsigned long one_rep = 1; + + return hvmemul_do_io_buffer(0, port, &one_rep, size, dir, 0, buffer); +} + +/* + * Perform I/O between and guest RAM starting at . + * indicates the direction: IOREQ_READ means a read from to + * RAM and IOREQ_WRITE means a write from RAM to . Each access has + * width and up to * accesses will be performed. If + * X86EMUL_OKAY is returned then will be updated with the number + * of accesses actually performed. + * Each access will be done to/from successive RAM addresses, increasing + * if is 0 or decreasing if is 1. + */ +static int hvmemul_do_pio_addr(uint16_t port, + unsigned long *reps, + unsigned int size, + uint8_t dir, + bool_t df, + paddr_t ram_addr) +{ + return hvmemul_do_io_addr(0, port, reps, size, dir, df, ram_addr); +} + +/* + * Perform I/O between MMIO space starting at and . + * indicates the direction: IOREQ_READ means a read from MMIO to + * and IOREQ_WRITE means a write from to MMIO. Each + * access has width and up to * accesses will be performed. + * If X86EMUL_OKAY is returned then will be updated with the number + * of accesses actually performed. + * Each access will be done to/from successive MMIO addresses, increasing + * if is 0 or decreasing if is 1. + * + * NOTE: If * is greater than 1, each access will use the + * pointer; there is no implicit interation over a + * block of memory starting at . + */ +static int hvmemul_do_mmio_buffer(paddr_t mmio_gpa, + unsigned long *reps, + unsigned int size, + uint8_t dir, + bool_t df, + void *buffer) +{ + return hvmemul_do_io_buffer(1, mmio_gpa, reps, size, dir, df, buffer); +} + +/* + * Perform I/O between MMIO space starting at and guest RAM + * starting at . indicates the direction: IOREQ_READ + * means a read from MMIO to RAM and IOREQ_WRITE means a write from RAM + * to MMIO. Each access has width and up to * accesses will + * be performed. If X86EMUL_OKAY is returned then will be updated + * with the number of accesses actually performed. + * Each access will be done to/from successive RAM *and* MMIO addresses, + * increasing if is 0 or decreasing if is 1. + */ +static int hvmemul_do_mmio_addr(paddr_t mmio_gpa, + unsigned long *reps, + unsigned int size, + uint8_t dir, + bool_t df, + paddr_t ram_gpa) { - return hvmemul_do_io(1, gpa, reps, size, ram_gpa, dir, df, p_data); + return hvmemul_do_io_addr(1, mmio_gpa, reps, size, dir, df, ram_gpa); } /* @@ -503,7 +587,8 @@ static int __hvmemul_read( gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_READ, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) return rc; addr += chunk; @@ -537,7 +622,8 @@ static int __hvmemul_read( hvmemul_ctxt); while ( rc == X86EMUL_OKAY ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_READ, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) break; addr += chunk; @@ -645,7 +731,8 @@ static int hvmemul_write( gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_WRITE, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) return rc; addr += chunk; @@ -675,7 +762,8 @@ static int hvmemul_write( hvmemul_ctxt); while ( rc == X86EMUL_OKAY ) { - rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + rc = hvmemul_do_mmio_buffer(gpa, &reps, chunk, IOREQ_WRITE, 0, + p_data); if ( rc != X86EMUL_OKAY || bytes == chunk ) break; addr += chunk; @@ -849,8 +937,8 @@ static int hvmemul_rep_ins( if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) return X86EMUL_UNHANDLEABLE; - return hvmemul_do_pio(src_port, reps, bytes_per_rep, gpa, IOREQ_READ, - !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); + return hvmemul_do_pio_addr(src_port, reps, bytes_per_rep, IOREQ_READ, + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_outs( @@ -887,8 +975,8 @@ static int hvmemul_rep_outs( if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) return X86EMUL_UNHANDLEABLE; - return hvmemul_do_pio(dst_port, reps, bytes_per_rep, gpa, IOREQ_WRITE, - !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); + return hvmemul_do_pio_addr(dst_port, reps, bytes_per_rep, IOREQ_WRITE, + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_movs( @@ -944,12 +1032,12 @@ static int hvmemul_rep_movs( return X86EMUL_UNHANDLEABLE; if ( sp2mt == p2m_mmio_dm ) - return hvmemul_do_mmio( - sgpa, reps, bytes_per_rep, dgpa, IOREQ_READ, df, NULL); + return hvmemul_do_mmio_addr( + sgpa, reps, bytes_per_rep, IOREQ_READ, df, dgpa); if ( dp2mt == p2m_mmio_dm ) - return hvmemul_do_mmio( - dgpa, reps, bytes_per_rep, sgpa, IOREQ_WRITE, df, NULL); + return hvmemul_do_mmio_addr( + dgpa, reps, bytes_per_rep, IOREQ_WRITE, df, sgpa); /* RAM-to-RAM copy: emulate as equivalent of memmove(dgpa, sgpa, bytes). */ bytes = *reps * bytes_per_rep; @@ -1102,8 +1190,8 @@ static int hvmemul_rep_stos( return X86EMUL_UNHANDLEABLE; case p2m_mmio_dm: - return hvmemul_do_mmio(gpa, reps, bytes_per_rep, 0, IOREQ_WRITE, df, - p_data); + return hvmemul_do_mmio_buffer(gpa, reps, bytes_per_rep, IOREQ_WRITE, df, + p_data); } } @@ -1140,9 +1228,8 @@ static int hvmemul_read_io( unsigned long *val, struct x86_emulate_ctxt *ctxt) { - unsigned long reps = 1; *val = 0; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_READ, 0, val); + return hvmemul_do_pio_buffer(port, bytes, IOREQ_READ, val); } static int hvmemul_write_io( @@ -1151,8 +1238,7 @@ static int hvmemul_write_io( unsigned long val, struct x86_emulate_ctxt *ctxt) { - unsigned long reps = 1; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_WRITE, 0, &val); + return hvmemul_do_pio_buffer(port, bytes, IOREQ_WRITE, &val); } static int hvmemul_read_cr( diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 68fb890..c0964ec 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -132,7 +132,7 @@ int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; - unsigned long data, reps = 1; + unsigned long data; int rc; ASSERT((size - 1) < 4 && size != 3); @@ -140,7 +140,7 @@ int handle_pio(uint16_t port, unsigned int size, int dir) if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; - rc = hvmemul_do_pio(port, &reps, size, 0, dir, 0, &data); + rc = hvmemul_do_pio_buffer(port, size, dir, &data); switch ( rc ) { diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index b3971c8..594be38 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -50,11 +50,22 @@ struct segment_register *hvmemul_get_seg_reg( enum x86_segment seg, struct hvm_emulate_ctxt *hvmemul_ctxt); -int hvmemul_do_pio( - unsigned long port, unsigned long *reps, int size, - paddr_t ram_gpa, int dir, int df, void *p_data); +int hvmemul_do_pio_buffer(uint16_t port, + unsigned int size, + uint8_t dir, + void *buffer); void hvm_dump_emulation_state(const char *prefix, struct hvm_emulate_ctxt *hvmemul_ctxt); #endif /* __ASM_X86_HVM_EMULATE_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:57:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W0R-00034S-8F; Fri, 26 Jun 2015 15:57:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0P-00033y-U2 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:30 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id C3/56-06457-9667D855; Fri, 26 Jun 2015 15:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435334247!20216989!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28842 invoked from network); 26 Jun 2015 15:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0N-0007Hi-Hh for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0N-0004Qu-GE for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:27 +0000 Date: Fri, 26 Jun 2015 15:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: remove hvm_io_pending() check in hvmemul_do_io() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2df1aa01bef7366798248ac6d03cfb42048b003d Author: Paul Durrant AuthorDate: Tue Jun 23 18:07:49 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:07:49 2015 +0200 x86/hvm: remove hvm_io_pending() check in hvmemul_do_io() The check is done at the wrong point (since it is irrelevant if the I/O is to be handled by the hypervisor) and its functionality can be covered by returning X86EMUL_UNHANDLEABLE from hvm_send_assist_req() instead. This patch also removes the domain_crash() call from hvm_send_assist_req(). Returning X86EMUL_UNHANDLEABLE allows the higher layers of emulation to decide what to do instead. Signed-off-by: Paul Durrant --- xen/arch/x86/hvm/emulate.c | 10 ++-------- xen/arch/x86/hvm/hvm.c | 16 ++++++---------- xen/include/asm-x86/hvm/hvm.h | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 9d7af0c..b412302 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -121,12 +121,6 @@ static int hvmemul_do_io( return X86EMUL_UNHANDLEABLE; } - if ( hvm_io_pending(curr) ) - { - gdprintk(XENLOG_WARNING, "WARNING: io already pending?\n"); - return X86EMUL_UNHANDLEABLE; - } - vio->io_state = (data_is_addr || dir == IOREQ_WRITE) ? HVMIO_dispatched : HVMIO_awaiting_completion; vio->io_size = size; @@ -188,8 +182,8 @@ static int hvmemul_do_io( } else { - rc = X86EMUL_RETRY; - if ( !hvm_send_assist_req(s, &p) ) + rc = hvm_send_assist_req(s, &p); + if ( rc != X86EMUL_RETRY ) vio->io_state = HVMIO_none; else if ( data_is_addr || dir == IOREQ_WRITE ) rc = X86EMUL_OKAY; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d5e5242..535d622 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2605,7 +2605,7 @@ int hvm_buffered_io_send(ioreq_t *p) return 1; } -bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) +int hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) { struct vcpu *curr = current; struct domain *d = curr->domain; @@ -2613,7 +2613,7 @@ bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) ASSERT(s); if ( unlikely(!vcpu_start_shutdown_deferral(curr)) ) - return 0; /* implicitly bins the i/o operation */ + return X86EMUL_OKAY; list_for_each_entry ( sv, &s->ioreq_vcpu_list, @@ -2628,14 +2628,14 @@ bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) { gprintk(XENLOG_ERR, "device model set bad IO state %d\n", p->state); - goto crash; + break; } if ( unlikely(p->vp_eport != port) ) { gprintk(XENLOG_ERR, "device model set bad event channel %d\n", p->vp_eport); - goto crash; + break; } proto_p->state = STATE_IOREQ_NONE; @@ -2651,15 +2651,11 @@ bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) */ p->state = STATE_IOREQ_READY; notify_via_xen_event_channel(d, port); - break; + return X86EMUL_RETRY; } } - return 1; - - crash: - domain_crash(d); - return 0; + return X86EMUL_UNHANDLEABLE; } void hvm_complete_assist_req(ioreq_t *p) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 77eeac5..57f9605 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -230,7 +230,7 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip); struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, ioreq_t *p); -bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *p); +int hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *p); void hvm_broadcast_assist_req(ioreq_t *p); void hvm_complete_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 Fri Jun 26 15:57:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W0R-00034S-8F; Fri, 26 Jun 2015 15:57:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0P-00033y-U2 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:30 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id C3/56-06457-9667D855; Fri, 26 Jun 2015 15:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435334247!20216989!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28842 invoked from network); 26 Jun 2015 15:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0N-0007Hi-Hh for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0N-0004Qu-GE for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:27 +0000 Date: Fri, 26 Jun 2015 15:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: remove hvm_io_pending() check in hvmemul_do_io() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2df1aa01bef7366798248ac6d03cfb42048b003d Author: Paul Durrant AuthorDate: Tue Jun 23 18:07:49 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:07:49 2015 +0200 x86/hvm: remove hvm_io_pending() check in hvmemul_do_io() The check is done at the wrong point (since it is irrelevant if the I/O is to be handled by the hypervisor) and its functionality can be covered by returning X86EMUL_UNHANDLEABLE from hvm_send_assist_req() instead. This patch also removes the domain_crash() call from hvm_send_assist_req(). Returning X86EMUL_UNHANDLEABLE allows the higher layers of emulation to decide what to do instead. Signed-off-by: Paul Durrant --- xen/arch/x86/hvm/emulate.c | 10 ++-------- xen/arch/x86/hvm/hvm.c | 16 ++++++---------- xen/include/asm-x86/hvm/hvm.h | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 9d7af0c..b412302 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -121,12 +121,6 @@ static int hvmemul_do_io( return X86EMUL_UNHANDLEABLE; } - if ( hvm_io_pending(curr) ) - { - gdprintk(XENLOG_WARNING, "WARNING: io already pending?\n"); - return X86EMUL_UNHANDLEABLE; - } - vio->io_state = (data_is_addr || dir == IOREQ_WRITE) ? HVMIO_dispatched : HVMIO_awaiting_completion; vio->io_size = size; @@ -188,8 +182,8 @@ static int hvmemul_do_io( } else { - rc = X86EMUL_RETRY; - if ( !hvm_send_assist_req(s, &p) ) + rc = hvm_send_assist_req(s, &p); + if ( rc != X86EMUL_RETRY ) vio->io_state = HVMIO_none; else if ( data_is_addr || dir == IOREQ_WRITE ) rc = X86EMUL_OKAY; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d5e5242..535d622 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2605,7 +2605,7 @@ int hvm_buffered_io_send(ioreq_t *p) return 1; } -bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) +int hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) { struct vcpu *curr = current; struct domain *d = curr->domain; @@ -2613,7 +2613,7 @@ bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) ASSERT(s); if ( unlikely(!vcpu_start_shutdown_deferral(curr)) ) - return 0; /* implicitly bins the i/o operation */ + return X86EMUL_OKAY; list_for_each_entry ( sv, &s->ioreq_vcpu_list, @@ -2628,14 +2628,14 @@ bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) { gprintk(XENLOG_ERR, "device model set bad IO state %d\n", p->state); - goto crash; + break; } if ( unlikely(p->vp_eport != port) ) { gprintk(XENLOG_ERR, "device model set bad event channel %d\n", p->vp_eport); - goto crash; + break; } proto_p->state = STATE_IOREQ_NONE; @@ -2651,15 +2651,11 @@ bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *proto_p) */ p->state = STATE_IOREQ_READY; notify_via_xen_event_channel(d, port); - break; + return X86EMUL_RETRY; } } - return 1; - - crash: - domain_crash(d); - return 0; + return X86EMUL_UNHANDLEABLE; } void hvm_complete_assist_req(ioreq_t *p) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 77eeac5..57f9605 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -230,7 +230,7 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip); struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, ioreq_t *p); -bool_t hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *p); +int hvm_send_assist_req(struct hvm_ioreq_server *s, ioreq_t *p); void hvm_broadcast_assist_req(ioreq_t *p); void hvm_complete_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 Fri Jun 26 15:57:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0b-00038Z-DC; Fri, 26 Jun 2015 15:57:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0a-000381-4K for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:40 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 56/93-15949-3767D855; Fri, 26 Jun 2015 15:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435334257!17163978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21331 invoked from network); 26 Jun 2015 15:57:38 -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; 26 Jun 2015 15:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0X-0007Hq-Mp for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0X-0004Rd-Lz for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:37 +0000 Date: Fri, 26 Jun 2015 15:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: remove extraneous parameter from hvmtrace_io_assist() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65bb47fb732265f704d4ec6616076ec74771a6eb Author: Paul Durrant AuthorDate: Tue Jun 23 18:08:32 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:08:32 2015 +0200 x86/hvm: remove extraneous parameter from hvmtrace_io_assist() The is_mmio parameter can be inferred from the ioreq type. Signed-off-by: Paul Durrant Constify its other parameter. Avoid introducing local variable is_mmio. Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index b412302..fe5661d 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -23,7 +23,7 @@ #include #include -static void hvmtrace_io_assist(int is_mmio, ioreq_t *p) +static void hvmtrace_io_assist(const ioreq_t *p) { unsigned int size, event; unsigned char buffer[12]; @@ -31,7 +31,7 @@ static void hvmtrace_io_assist(int is_mmio, ioreq_t *p) if ( likely(!tb_init_done) ) return; - if ( is_mmio ) + if ( p->type == IOREQ_TYPE_COPY ) event = p->dir ? TRC_HVM_IOMEM_READ : TRC_HVM_IOMEM_WRITE; else event = p->dir ? TRC_HVM_IOPORT_READ : TRC_HVM_IOPORT_WRITE; @@ -139,7 +139,7 @@ static int hvmemul_do_io( if ( !data_is_addr ) memcpy(&p.data, p_data, size); - hvmtrace_io_assist(is_mmio, &p); + hvmtrace_io_assist(&p); } if ( is_mmio ) @@ -200,7 +200,7 @@ static int hvmemul_do_io( finish_access: if ( dir == IOREQ_READ ) { - hvmtrace_io_assist(is_mmio, &p); + hvmtrace_io_assist(&p); if ( !data_is_addr ) memcpy(p_data, &vio->io_data, 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 Jun 26 15:57:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0b-00038Z-DC; Fri, 26 Jun 2015 15:57:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0a-000381-4K for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:40 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 56/93-15949-3767D855; Fri, 26 Jun 2015 15:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435334257!17163978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21331 invoked from network); 26 Jun 2015 15:57:38 -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; 26 Jun 2015 15:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0X-0007Hq-Mp for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0X-0004Rd-Lz for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:37 +0000 Date: Fri, 26 Jun 2015 15:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: remove extraneous parameter from hvmtrace_io_assist() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65bb47fb732265f704d4ec6616076ec74771a6eb Author: Paul Durrant AuthorDate: Tue Jun 23 18:08:32 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 18:08:32 2015 +0200 x86/hvm: remove extraneous parameter from hvmtrace_io_assist() The is_mmio parameter can be inferred from the ioreq type. Signed-off-by: Paul Durrant Constify its other parameter. Avoid introducing local variable is_mmio. Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index b412302..fe5661d 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -23,7 +23,7 @@ #include #include -static void hvmtrace_io_assist(int is_mmio, ioreq_t *p) +static void hvmtrace_io_assist(const ioreq_t *p) { unsigned int size, event; unsigned char buffer[12]; @@ -31,7 +31,7 @@ static void hvmtrace_io_assist(int is_mmio, ioreq_t *p) if ( likely(!tb_init_done) ) return; - if ( is_mmio ) + if ( p->type == IOREQ_TYPE_COPY ) event = p->dir ? TRC_HVM_IOMEM_READ : TRC_HVM_IOMEM_WRITE; else event = p->dir ? TRC_HVM_IOPORT_READ : TRC_HVM_IOPORT_WRITE; @@ -139,7 +139,7 @@ static int hvmemul_do_io( if ( !data_is_addr ) memcpy(&p.data, p_data, size); - hvmtrace_io_assist(is_mmio, &p); + hvmtrace_io_assist(&p); } if ( is_mmio ) @@ -200,7 +200,7 @@ static int hvmemul_do_io( finish_access: if ( dir == IOREQ_READ ) { - hvmtrace_io_assist(is_mmio, &p); + hvmtrace_io_assist(&p); if ( !data_is_addr ) memcpy(p_data, &vio->io_data, 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 Jun 26 15:57:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W0l-0003CO-Fw; Fri, 26 Jun 2015 15:57:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0k-0003Bw-8S for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:50 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 03/3C-02952-D767D855; Fri, 26 Jun 2015 15:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435334268!20077331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4354 invoked from network); 26 Jun 2015 15:57:48 -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; 26 Jun 2015 15:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0h-0007Hy-Qt for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0h-0004SB-Q5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:47 +0000 Date: Fri, 26 Jun 2015 15:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_sharing: relax sanity check for memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c566ffadec51aecafbda17e3830d063966b634fd Author: Tamas K Lengyel AuthorDate: Wed Jun 24 10:33:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 10:33:05 2015 +0200 x86/mem_sharing: relax sanity check for memops The sharing vm_event ring being enabled is not necessary for mem_sharing memops. Signed-off-by: Tamas K Lengyel Reviewed-by: Andres Lagar-Cavilla --- xen/arch/x86/mm/mem_sharing.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 0700f00..16e329e 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1320,10 +1320,6 @@ int mem_sharing_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_sharing_op_t) arg) if ( !hap_enabled(d) || !d->arch.hvm_domain.mem_sharing_enabled ) goto out; - rc = -ENODEV; - if ( unlikely(!d->vm_event->share.ring_page) ) - goto out; - switch ( mso.op ) { case XENMEM_sharing_op_nominate_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 Fri Jun 26 15:57:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:57: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 1Z8W0l-0003CO-Fw; Fri, 26 Jun 2015 15:57:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0k-0003Bw-8S for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:50 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 03/3C-02952-D767D855; Fri, 26 Jun 2015 15:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435334268!20077331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4354 invoked from network); 26 Jun 2015 15:57:48 -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; 26 Jun 2015 15:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0h-0007Hy-Qt for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0h-0004SB-Q5 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:47 +0000 Date: Fri, 26 Jun 2015 15:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_sharing: relax sanity check for memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c566ffadec51aecafbda17e3830d063966b634fd Author: Tamas K Lengyel AuthorDate: Wed Jun 24 10:33:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 10:33:05 2015 +0200 x86/mem_sharing: relax sanity check for memops The sharing vm_event ring being enabled is not necessary for mem_sharing memops. Signed-off-by: Tamas K Lengyel Reviewed-by: Andres Lagar-Cavilla --- xen/arch/x86/mm/mem_sharing.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 0700f00..16e329e 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1320,10 +1320,6 @@ int mem_sharing_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_sharing_op_t) arg) if ( !hap_enabled(d) || !d->arch.hvm_domain.mem_sharing_enabled ) goto out; - rc = -ENODEV; - if ( unlikely(!d->vm_event->share.ring_page) ) - goto out; - switch ( mso.op ) { case XENMEM_sharing_op_nominate_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 Fri Jun 26 15:58:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58: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 1Z8W0v-0003GG-Ih; Fri, 26 Jun 2015 15:58:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0u-0003Fs-SC for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:01 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 9D/B5-30151-8867D855; Fri, 26 Jun 2015 15:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435334278!15608296!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1774 invoked from network); 26 Jun 2015 15:57:59 -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; 26 Jun 2015 15:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0r-0007IC-WB for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0r-0004Sv-VL for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:57 +0000 Date: Fri, 26 Jun 2015 15:57:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop is_pv_32on64_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 77411f1079d29c4195a13fa89b8506bf92462d10 Author: Jan Beulich AuthorDate: Wed Jun 24 10:37:06 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 10:37:06 2015 +0200 x86: drop is_pv_32on64_vcpu() ... as being identical to is_pv_32bit_vcpu() after the x86-32 removal. In a few cases this includes an additional is_pv_32bit_vcpu() -> is_pv_32bit_domain() conversion. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.c | 8 ++++---- xen/arch/x86/domain.c | 4 ++-- xen/arch/x86/mm.c | 2 +- xen/arch/x86/trace.c | 12 ++++++------ xen/arch/x86/traps.c | 20 ++++++++++---------- xen/include/asm-x86/domain.h | 1 - xen/include/asm-x86/ldt.h | 2 +- xen/include/xen/tmem_xen.h | 2 +- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 3a3b4dc..7c2cacc 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1339,7 +1339,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) mctelem_cookie_t cookie = ID2COOKIE(mc_fetch.nat->fetch_id); mctelem_ack(which, cookie); } else { - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? guest_handle_is_null(mc_fetch.nat->data) : compat_handle_is_null(mc_fetch.cmp->data)) return x86_mcerr("do_mca fetch: guest buffer " @@ -1347,7 +1347,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if ((mctc = mctelem_consume_oldest_begin(which))) { struct mc_info *mcip = mctelem_dataptr(mctc); - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? copy_to_guest(mc_fetch.nat->data, mcip, 1) : copy_to_compat(mc_fetch.cmp->data, mcip, 1)) { @@ -1378,7 +1378,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) mc_physcpuinfo.nat = &op->u.mc_physcpuinfo; nlcpu = num_online_cpus(); - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? !guest_handle_is_null(mc_physcpuinfo.nat->info) : !compat_handle_is_null(mc_physcpuinfo.cmp->info)) { if (mc_physcpuinfo.nat->ncpus <= 0) @@ -1389,7 +1389,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if (log_cpus == NULL) return x86_mcerr("do_mca cpuinfo", -ENOMEM); on_each_cpu(do_mc_get_cpu_info, log_cpus, 1); - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? copy_to_guest(mc_physcpuinfo.nat->info, log_cpus, nlcpu) : copy_to_compat(mc_physcpuinfo.cmp->info, diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 29f3c1a..a8fe046 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -509,7 +509,7 @@ int vcpu_initialise(struct vcpu *v) void vcpu_destroy(struct vcpu *v) { - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_vcpu(v) ) { free_compat_arg_xlat(v); release_compat_l4(v); @@ -1722,7 +1722,7 @@ unsigned long hypercall_create_continuation( curr->arch.hvm_vcpu.hcall_preempted = 1; if ( is_pv_vcpu(curr) ? - !is_pv_32on64_vcpu(curr) : + !is_pv_32bit_vcpu(curr) : curr->arch.hvm_vcpu.hcall_64bit ) { for ( i = 0; *p != '\0'; i++ ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9e08c9b..fd151c6 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2652,7 +2652,7 @@ int vcpu_destroy_pagetables(struct vcpu *v) if ( rc ) return rc; - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_vcpu(v) ) { l4tab = map_domain_page(mfn); mfn = l4e_get_pfn(*l4tab); diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c index 64e9ad0..bd8596c 100644 --- a/xen/arch/x86/trace.c +++ b/xen/arch/x86/trace.c @@ -11,7 +11,7 @@ void __trace_hypercall_entry(void) struct cpu_user_regs *regs = guest_cpu_user_regs(); unsigned long args[6]; - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { args[0] = regs->ebx; args[1] = regs->ecx; @@ -36,7 +36,7 @@ void __trace_hypercall_entry(void) void __trace_pv_trap(int trapnr, unsigned long eip, int use_error_code, unsigned error_code) { - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { unsigned eip:32, @@ -77,7 +77,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) { unsigned long eip = guest_cpu_user_regs()->eip; - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { u32 eip, addr, error_code; @@ -108,7 +108,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) void __trace_trap_one_addr(unsigned event, unsigned long va) { - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { u32 d = va; __trace_var(event, 1, sizeof(d), &d); @@ -123,7 +123,7 @@ void __trace_trap_one_addr(unsigned event, unsigned long va) void __trace_trap_two_addr(unsigned event, unsigned long va1, unsigned long va2) { - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { u32 va1, va2; @@ -156,7 +156,7 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) * cases, "unsigned long" is the size of a guest virtual address. */ - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { l1_pgentry_t pte; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c634008..ac62f20 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -124,7 +124,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) if ( is_hvm_vcpu(v) ) return; - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_vcpu(v) ) { compat_show_guest_stack(v, regs, debug_stack_lines); return; @@ -2382,7 +2382,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) { unsigned long mfn; - if ( !is_pv_32on64_vcpu(v) ) + if ( !is_pv_32bit_domain(currd) ) { mfn = pagetable_get_pfn(v->arch.guest_table); *reg = xen_pfn_to_cr3(mfn_to_gmfn(currd, mfn)); @@ -2452,7 +2452,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) unsigned long gfn; struct page_info *page; - gfn = !is_pv_32on64_vcpu(v) + gfn = !is_pv_32bit_domain(currd) ? xen_cr3_to_pfn(*reg) : compat_cr3_to_pfn(*reg); page = get_page_from_gfn(currd, gfn, NULL, P2M_ALLOC); if ( page ) @@ -2504,19 +2504,19 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) switch ( regs->_ecx ) { case MSR_FS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; wrfsbase(msr_content); v->arch.pv_vcpu.fs_base = msr_content; break; case MSR_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; wrgsbase(msr_content); v->arch.pv_vcpu.gs_base_kernel = msr_content; break; case MSR_SHADOW_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; if ( wrmsr_safe(MSR_SHADOW_GS_BASE, msr_content) ) goto fail; @@ -2675,18 +2675,18 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) switch ( regs->_ecx ) { case MSR_FS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; val = cpu_has_fsgsbase ? __rdfsbase() : v->arch.pv_vcpu.fs_base; goto rdmsr_writeback; case MSR_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; val = cpu_has_fsgsbase ? __rdgsbase() : v->arch.pv_vcpu.gs_base_kernel; goto rdmsr_writeback; case MSR_SHADOW_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; val = v->arch.pv_vcpu.gs_base_user; goto rdmsr_writeback; @@ -3201,7 +3201,7 @@ void do_general_protection(struct cpu_user_regs *regs) return; } } - else if ( is_pv_32on64_vcpu(v) && regs->error_code ) + else if ( is_pv_32bit_vcpu(v) && regs->error_code ) { emulate_gate_op(regs); return; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 5eb6832..96bde65 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -15,7 +15,6 @@ #define is_pv_32bit_domain(d) ((d)->arch.is_32bit_pv) #define is_pv_32bit_vcpu(v) (is_pv_32bit_domain((v)->domain)) #define is_pv_32on64_domain(d) (is_pv_32bit_domain(d)) -#define is_pv_32on64_vcpu(v) (is_pv_32on64_domain((v)->domain)) #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) diff --git a/xen/include/asm-x86/ldt.h b/xen/include/asm-x86/ldt.h index aa77368..289ae19 100644 --- a/xen/include/asm-x86/ldt.h +++ b/xen/include/asm-x86/ldt.h @@ -15,7 +15,7 @@ static inline void load_LDT(struct vcpu *v) } else { - desc = (!is_pv_32on64_vcpu(v) + desc = (!is_pv_32bit_vcpu(v) ? this_cpu(gdt_table) : this_cpu(compat_gdt_table)) + LDT_ENTRY - FIRST_RESERVED_GDT_ENTRY; _set_tssldt_desc(desc, LDT_VIRT_START(v), ents*8-1, SYS_DESC_ldt); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 885ee21..c0d6831 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -285,7 +285,7 @@ static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) #ifdef CONFIG_COMPAT if ( has_hvm_container_vcpu(current) ? hvm_guest_x86_mode(current) != 8 : - is_pv_32on64_vcpu(current) ) + is_pv_32bit_vcpu(current) ) { int rc; enum XLAT_tmem_op_u u; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:58:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58: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 1Z8W0v-0003GG-Ih; Fri, 26 Jun 2015 15:58:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0u-0003Fs-SC for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:01 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 9D/B5-30151-8867D855; Fri, 26 Jun 2015 15:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435334278!15608296!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1774 invoked from network); 26 Jun 2015 15:57:59 -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; 26 Jun 2015 15:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W0r-0007IC-WB for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W0r-0004Sv-VL for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:57:57 +0000 Date: Fri, 26 Jun 2015 15:57:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop is_pv_32on64_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 77411f1079d29c4195a13fa89b8506bf92462d10 Author: Jan Beulich AuthorDate: Wed Jun 24 10:37:06 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 10:37:06 2015 +0200 x86: drop is_pv_32on64_vcpu() ... as being identical to is_pv_32bit_vcpu() after the x86-32 removal. In a few cases this includes an additional is_pv_32bit_vcpu() -> is_pv_32bit_domain() conversion. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.c | 8 ++++---- xen/arch/x86/domain.c | 4 ++-- xen/arch/x86/mm.c | 2 +- xen/arch/x86/trace.c | 12 ++++++------ xen/arch/x86/traps.c | 20 ++++++++++---------- xen/include/asm-x86/domain.h | 1 - xen/include/asm-x86/ldt.h | 2 +- xen/include/xen/tmem_xen.h | 2 +- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 3a3b4dc..7c2cacc 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1339,7 +1339,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) mctelem_cookie_t cookie = ID2COOKIE(mc_fetch.nat->fetch_id); mctelem_ack(which, cookie); } else { - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? guest_handle_is_null(mc_fetch.nat->data) : compat_handle_is_null(mc_fetch.cmp->data)) return x86_mcerr("do_mca fetch: guest buffer " @@ -1347,7 +1347,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if ((mctc = mctelem_consume_oldest_begin(which))) { struct mc_info *mcip = mctelem_dataptr(mctc); - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? copy_to_guest(mc_fetch.nat->data, mcip, 1) : copy_to_compat(mc_fetch.cmp->data, mcip, 1)) { @@ -1378,7 +1378,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) mc_physcpuinfo.nat = &op->u.mc_physcpuinfo; nlcpu = num_online_cpus(); - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? !guest_handle_is_null(mc_physcpuinfo.nat->info) : !compat_handle_is_null(mc_physcpuinfo.cmp->info)) { if (mc_physcpuinfo.nat->ncpus <= 0) @@ -1389,7 +1389,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if (log_cpus == NULL) return x86_mcerr("do_mca cpuinfo", -ENOMEM); on_each_cpu(do_mc_get_cpu_info, log_cpus, 1); - if (!is_pv_32on64_vcpu(v) + if (!is_pv_32bit_vcpu(v) ? copy_to_guest(mc_physcpuinfo.nat->info, log_cpus, nlcpu) : copy_to_compat(mc_physcpuinfo.cmp->info, diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 29f3c1a..a8fe046 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -509,7 +509,7 @@ int vcpu_initialise(struct vcpu *v) void vcpu_destroy(struct vcpu *v) { - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_vcpu(v) ) { free_compat_arg_xlat(v); release_compat_l4(v); @@ -1722,7 +1722,7 @@ unsigned long hypercall_create_continuation( curr->arch.hvm_vcpu.hcall_preempted = 1; if ( is_pv_vcpu(curr) ? - !is_pv_32on64_vcpu(curr) : + !is_pv_32bit_vcpu(curr) : curr->arch.hvm_vcpu.hcall_64bit ) { for ( i = 0; *p != '\0'; i++ ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9e08c9b..fd151c6 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2652,7 +2652,7 @@ int vcpu_destroy_pagetables(struct vcpu *v) if ( rc ) return rc; - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_vcpu(v) ) { l4tab = map_domain_page(mfn); mfn = l4e_get_pfn(*l4tab); diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c index 64e9ad0..bd8596c 100644 --- a/xen/arch/x86/trace.c +++ b/xen/arch/x86/trace.c @@ -11,7 +11,7 @@ void __trace_hypercall_entry(void) struct cpu_user_regs *regs = guest_cpu_user_regs(); unsigned long args[6]; - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { args[0] = regs->ebx; args[1] = regs->ecx; @@ -36,7 +36,7 @@ void __trace_hypercall_entry(void) void __trace_pv_trap(int trapnr, unsigned long eip, int use_error_code, unsigned error_code) { - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { unsigned eip:32, @@ -77,7 +77,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) { unsigned long eip = guest_cpu_user_regs()->eip; - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { u32 eip, addr, error_code; @@ -108,7 +108,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) void __trace_trap_one_addr(unsigned event, unsigned long va) { - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { u32 d = va; __trace_var(event, 1, sizeof(d), &d); @@ -123,7 +123,7 @@ void __trace_trap_one_addr(unsigned event, unsigned long va) void __trace_trap_two_addr(unsigned event, unsigned long va1, unsigned long va2) { - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { u32 va1, va2; @@ -156,7 +156,7 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) * cases, "unsigned long" is the size of a guest virtual address. */ - if ( is_pv_32on64_vcpu(current) ) + if ( is_pv_32bit_vcpu(current) ) { struct __packed { l1_pgentry_t pte; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c634008..ac62f20 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -124,7 +124,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) if ( is_hvm_vcpu(v) ) return; - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_vcpu(v) ) { compat_show_guest_stack(v, regs, debug_stack_lines); return; @@ -2382,7 +2382,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) { unsigned long mfn; - if ( !is_pv_32on64_vcpu(v) ) + if ( !is_pv_32bit_domain(currd) ) { mfn = pagetable_get_pfn(v->arch.guest_table); *reg = xen_pfn_to_cr3(mfn_to_gmfn(currd, mfn)); @@ -2452,7 +2452,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) unsigned long gfn; struct page_info *page; - gfn = !is_pv_32on64_vcpu(v) + gfn = !is_pv_32bit_domain(currd) ? xen_cr3_to_pfn(*reg) : compat_cr3_to_pfn(*reg); page = get_page_from_gfn(currd, gfn, NULL, P2M_ALLOC); if ( page ) @@ -2504,19 +2504,19 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) switch ( regs->_ecx ) { case MSR_FS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; wrfsbase(msr_content); v->arch.pv_vcpu.fs_base = msr_content; break; case MSR_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; wrgsbase(msr_content); v->arch.pv_vcpu.gs_base_kernel = msr_content; break; case MSR_SHADOW_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; if ( wrmsr_safe(MSR_SHADOW_GS_BASE, msr_content) ) goto fail; @@ -2675,18 +2675,18 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) switch ( regs->_ecx ) { case MSR_FS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; val = cpu_has_fsgsbase ? __rdfsbase() : v->arch.pv_vcpu.fs_base; goto rdmsr_writeback; case MSR_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; val = cpu_has_fsgsbase ? __rdgsbase() : v->arch.pv_vcpu.gs_base_kernel; goto rdmsr_writeback; case MSR_SHADOW_GS_BASE: - if ( is_pv_32on64_vcpu(v) ) + if ( is_pv_32bit_domain(currd) ) goto fail; val = v->arch.pv_vcpu.gs_base_user; goto rdmsr_writeback; @@ -3201,7 +3201,7 @@ void do_general_protection(struct cpu_user_regs *regs) return; } } - else if ( is_pv_32on64_vcpu(v) && regs->error_code ) + else if ( is_pv_32bit_vcpu(v) && regs->error_code ) { emulate_gate_op(regs); return; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 5eb6832..96bde65 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -15,7 +15,6 @@ #define is_pv_32bit_domain(d) ((d)->arch.is_32bit_pv) #define is_pv_32bit_vcpu(v) (is_pv_32bit_domain((v)->domain)) #define is_pv_32on64_domain(d) (is_pv_32bit_domain(d)) -#define is_pv_32on64_vcpu(v) (is_pv_32on64_domain((v)->domain)) #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) diff --git a/xen/include/asm-x86/ldt.h b/xen/include/asm-x86/ldt.h index aa77368..289ae19 100644 --- a/xen/include/asm-x86/ldt.h +++ b/xen/include/asm-x86/ldt.h @@ -15,7 +15,7 @@ static inline void load_LDT(struct vcpu *v) } else { - desc = (!is_pv_32on64_vcpu(v) + desc = (!is_pv_32bit_vcpu(v) ? this_cpu(gdt_table) : this_cpu(compat_gdt_table)) + LDT_ENTRY - FIRST_RESERVED_GDT_ENTRY; _set_tssldt_desc(desc, LDT_VIRT_START(v), ents*8-1, SYS_DESC_ldt); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 885ee21..c0d6831 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -285,7 +285,7 @@ static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) #ifdef CONFIG_COMPAT if ( has_hvm_container_vcpu(current) ? hvm_guest_x86_mode(current) != 8 : - is_pv_32on64_vcpu(current) ) + is_pv_32bit_vcpu(current) ) { int rc; enum XLAT_tmem_op_u u; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 26 15:58:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58: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 1Z8W16-0003L2-2D; Fri, 26 Jun 2015 15:58:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W14-0003K7-Ce for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:10 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id F6/74-15949-1967D855; Fri, 26 Jun 2015 15:58:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1435334288!17203012!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8431 invoked from network); 26 Jun 2015 15:58:09 -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; 26 Jun 2015 15:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W12-0007In-77 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W12-0004Ua-3P for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:08 +0000 Date: Fri, 26 Jun 2015 15:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: use is_..._vcpu() instead of open coding 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 c528edb5df0a4325141df13e07bd2eee742b32bf Author: Jan Beulich AuthorDate: Wed Jun 24 10:37:50 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 10:37:50 2015 +0200 x86/mm: use is_..._vcpu() instead of open coding it Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap --- xen/arch/x86/mm/p2m.c | 4 +--- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/mm/shadow/none.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1fd1194..6b39733 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1851,9 +1851,7 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, struct p2m_domain *hostp2m = p2m_get_hostp2m(v->domain); const struct paging_mode *hostmode = paging_get_hostmode(v); - if ( is_hvm_domain(v->domain) - && paging_mode_hap(v->domain) - && nestedhvm_is_n2(v) ) + if ( is_hvm_vcpu(v) && paging_mode_hap(v->domain) && nestedhvm_is_n2(v) ) { unsigned long gfn; struct p2m_domain *p2m; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index c7e0e54..55b9671 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -971,7 +971,7 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) if ( pg->shadow_flags & ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) || sh_page_has_multiple_shadows(pg) - || is_pv_domain(v->domain) + || is_pv_vcpu(v) || !v->domain->arch.paging.shadow.oos_active ) return 0; diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index 809f81c..9526443 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -73,6 +73,6 @@ static const struct paging_mode sh_paging_none = { void shadow_vcpu_init(struct vcpu *v) { - ASSERT(is_pv_domain(v->domain)); + ASSERT(is_pv_vcpu(v)); v->arch.paging.mode = &sh_paging_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 Fri Jun 26 15:58:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58: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 1Z8W16-0003L2-2D; Fri, 26 Jun 2015 15:58:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W14-0003K7-Ce for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:10 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id F6/74-15949-1967D855; Fri, 26 Jun 2015 15:58:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1435334288!17203012!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8431 invoked from network); 26 Jun 2015 15:58:09 -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; 26 Jun 2015 15:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W12-0007In-77 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W12-0004Ua-3P for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:08 +0000 Date: Fri, 26 Jun 2015 15:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: use is_..._vcpu() instead of open coding 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 c528edb5df0a4325141df13e07bd2eee742b32bf Author: Jan Beulich AuthorDate: Wed Jun 24 10:37:50 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 10:37:50 2015 +0200 x86/mm: use is_..._vcpu() instead of open coding it Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap --- xen/arch/x86/mm/p2m.c | 4 +--- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/mm/shadow/none.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1fd1194..6b39733 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1851,9 +1851,7 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, struct p2m_domain *hostp2m = p2m_get_hostp2m(v->domain); const struct paging_mode *hostmode = paging_get_hostmode(v); - if ( is_hvm_domain(v->domain) - && paging_mode_hap(v->domain) - && nestedhvm_is_n2(v) ) + if ( is_hvm_vcpu(v) && paging_mode_hap(v->domain) && nestedhvm_is_n2(v) ) { unsigned long gfn; struct p2m_domain *p2m; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index c7e0e54..55b9671 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -971,7 +971,7 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) if ( pg->shadow_flags & ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) || sh_page_has_multiple_shadows(pg) - || is_pv_domain(v->domain) + || is_pv_vcpu(v) || !v->domain->arch.paging.shadow.oos_active ) return 0; diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index 809f81c..9526443 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -73,6 +73,6 @@ static const struct paging_mode sh_paging_none = { void shadow_vcpu_init(struct vcpu *v) { - ASSERT(is_pv_domain(v->domain)); + ASSERT(is_pv_vcpu(v)); v->arch.paging.mode = &sh_paging_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 Fri Jun 26 15:58:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1H-0003Qb-59; Fri, 26 Jun 2015 15:58:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1F-0003Pj-Dn for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:21 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 17/CD-16518-C967D855; Fri, 26 Jun 2015 15:58:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435334298!20204808!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20020 invoked from network); 26 Jun 2015 15:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1C-0007Iv-C4 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W1C-0004VA-Ai for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:18 +0000 Date: Fri, 26 Jun 2015 15:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: re-name struct hvm_mmio_handler to hvm_mmio_ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcc0986c7abec04df211c49d741e0b8970adb242 Author: Paul Durrant AuthorDate: Wed Jun 24 17:53:36 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 17:53:36 2015 +0200 x86/hvm: re-name struct hvm_mmio_handler to hvm_mmio_ops The struct just contains three methods and no data, so the name hvm_mmio_ops more accurately reflects its content. A subsequent patch introduces a new structure which more accurately warrants the name hvm_mmio_handler so doing the rename in this purely cosmetic patch avoids conflating functional and cosmetic changes in a single patch. Signed-off-by: Paul Durrant Acked-by: Jan Beulich --- tools/tests/vhpet/emul.h | 8 +++--- tools/tests/vhpet/main.c | 6 ++-- xen/arch/x86/hvm/hpet.c | 8 +++--- xen/arch/x86/hvm/intercept.c | 41 ++++++++++++++--------------- xen/arch/x86/hvm/vioapic.c | 8 +++--- xen/arch/x86/hvm/vlapic.c | 8 +++--- xen/arch/x86/hvm/vmsi.c | 8 +++--- xen/drivers/passthrough/amd/iommu_guest.c | 8 +++--- xen/include/asm-x86/hvm/io.h | 18 ++++++------ 9 files changed, 56 insertions(+), 57 deletions(-) diff --git a/tools/tests/vhpet/emul.h b/tools/tests/vhpet/emul.h index 09e4611..383acff 100644 --- a/tools/tests/vhpet/emul.h +++ b/tools/tests/vhpet/emul.h @@ -237,11 +237,11 @@ typedef int (*hvm_mmio_write_t)(struct vcpu *v, typedef int (*hvm_mmio_check_t)(struct vcpu *v, unsigned long addr); -struct hvm_mmio_handler +struct hvm_mmio_ops { - hvm_mmio_check_t check_handler; - hvm_mmio_read_t read_handler; - hvm_mmio_write_t write_handler; + hvm_mmio_check_t check; + hvm_mmio_read_t read; + hvm_mmio_write_t write; }; /* Marshalling and unmarshalling uses a buffer with size and cursor. */ diff --git a/tools/tests/vhpet/main.c b/tools/tests/vhpet/main.c index fbd7510..6fe65ea 100644 --- a/tools/tests/vhpet/main.c +++ b/tools/tests/vhpet/main.c @@ -70,7 +70,7 @@ static int skip_error_on_load; static char *global_thousep; -extern const struct hvm_mmio_handler hpet_mmio_handler; +extern const struct hvm_mmio_ops hpet_mmio_ops; struct domain dom1; struct vcpu vcpu0; @@ -297,13 +297,13 @@ void udelay(int w) unsigned int hpet_readl(unsigned long a) { unsigned long ret = 0; - hpet_mmio_handler.read_handler(current, a, 4, &ret); + hpet_mmio_ops.read(current, a, 4, &ret); return ret; } void hpet_writel(unsigned long d, unsigned long a) { - hpet_mmio_handler.write_handler(current, a, 4, d); + hpet_mmio_ops.write(current, a, 4, d); return; } diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index d898169..9585ca8 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -504,10 +504,10 @@ static int hpet_range(struct vcpu *v, unsigned long addr) (addr < (HPET_BASE_ADDRESS + HPET_MMAP_SIZE)) ); } -const struct hvm_mmio_handler hpet_mmio_handler = { - .check_handler = hpet_range, - .read_handler = hpet_read, - .write_handler = hpet_write +const struct hvm_mmio_ops hpet_mmio_ops = { + .check = hpet_range, + .read = hpet_read, + .write = hpet_write }; diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index d52a48c..cc44733 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -32,20 +32,20 @@ #include #include -static const struct hvm_mmio_handler *const +static const struct hvm_mmio_ops *const hvm_mmio_handlers[HVM_MMIO_HANDLER_NR] = { - &hpet_mmio_handler, - &vlapic_mmio_handler, - &vioapic_mmio_handler, - &msixtbl_mmio_handler, - &iommu_mmio_handler + &hpet_mmio_ops, + &vlapic_mmio_ops, + &vioapic_mmio_ops, + &msixtbl_mmio_ops, + &iommu_mmio_ops }; static int hvm_mmio_access(struct vcpu *v, ioreq_t *p, - hvm_mmio_read_t read_handler, - hvm_mmio_write_t write_handler) + hvm_mmio_read_t read, + hvm_mmio_write_t write) { struct hvm_vcpu_io *vio = &v->arch.hvm_vcpu.hvm_io; unsigned long data; @@ -64,11 +64,11 @@ static int hvm_mmio_access(struct vcpu *v, vio->mmio_retrying = 0; } else - rc = read_handler(v, p->addr, p->size, &data); + rc = read(v, p->addr, p->size, &data); p->data = data; } else /* p->dir == IOREQ_WRITE */ - rc = write_handler(v, p->addr, p->size, p->data); + rc = write(v, p->addr, p->size, p->data); return rc; } @@ -86,7 +86,7 @@ static int hvm_mmio_access(struct vcpu *v, } else { - rc = read_handler(v, p->addr + step * i, p->size, &data); + rc = read(v, p->addr + step * i, p->size, &data); if ( rc != X86EMUL_OKAY ) break; } @@ -145,7 +145,7 @@ static int hvm_mmio_access(struct vcpu *v, } if ( rc != X86EMUL_OKAY ) break; - rc = write_handler(v, p->addr + step * i, p->size, data); + rc = write(v, p->addr + step * i, p->size, data); if ( rc != X86EMUL_OKAY ) break; } @@ -169,7 +169,7 @@ bool_t hvm_mmio_internal(paddr_t gpa) unsigned int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; ++i ) - if ( hvm_mmio_handlers[i]->check_handler(curr, gpa) ) + if ( hvm_mmio_handlers[i]->check(curr, gpa) ) return 1; return 0; @@ -182,21 +182,20 @@ int hvm_mmio_intercept(ioreq_t *p) for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) { - hvm_mmio_check_t check_handler = - hvm_mmio_handlers[i]->check_handler; + hvm_mmio_check_t check = hvm_mmio_handlers[i]->check; - if ( check_handler(v, p->addr) ) + if ( check(v, p->addr) ) { if ( unlikely(p->count > 1) && - !check_handler(v, unlikely(p->df) - ? p->addr - (p->count - 1L) * p->size - : p->addr + (p->count - 1L) * p->size) ) + !check(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) p->count = 1; return hvm_mmio_access( v, p, - hvm_mmio_handlers[i]->read_handler, - hvm_mmio_handlers[i]->write_handler); + hvm_mmio_handlers[i]->read, + hvm_mmio_handlers[i]->write); } } diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index f903420..cbbef9f 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -250,10 +250,10 @@ static int vioapic_range(struct vcpu *v, unsigned long addr) (addr < vioapic->base_address + VIOAPIC_MEM_LENGTH))); } -const struct hvm_mmio_handler vioapic_mmio_handler = { - .check_handler = vioapic_range, - .read_handler = vioapic_read, - .write_handler = vioapic_write +const struct hvm_mmio_ops vioapic_mmio_ops = { + .check = vioapic_range, + .read = vioapic_read, + .write = vioapic_write }; static void ioapic_inj_irq( diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index a5c3aba..32e649e 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -977,10 +977,10 @@ static int vlapic_range(struct vcpu *v, unsigned long addr) (offset < PAGE_SIZE); } -const struct hvm_mmio_handler vlapic_mmio_handler = { - .check_handler = vlapic_range, - .read_handler = vlapic_read, - .write_handler = vlapic_write +const struct hvm_mmio_ops vlapic_mmio_ops = { + .check = vlapic_range, + .read = vlapic_read, + .write = vlapic_write }; static void set_x2apic_id(struct vlapic *vlapic) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 3dbbe37..f89233d 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -344,10 +344,10 @@ static int msixtbl_range(struct vcpu *v, unsigned long addr) return !!desc; } -const struct hvm_mmio_handler msixtbl_mmio_handler = { - .check_handler = msixtbl_range, - .read_handler = msixtbl_read, - .write_handler = msixtbl_write +const struct hvm_mmio_ops msixtbl_mmio_ops = { + .check = msixtbl_range, + .read = msixtbl_read, + .write = msixtbl_write }; static void add_msixtbl_entry(struct domain *d, diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index 98e7b38..7b0c102 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -919,8 +919,8 @@ static int guest_iommu_mmio_range(struct vcpu *v, unsigned long addr) addr < iommu->mmio_base + IOMMU_MMIO_SIZE; } -const struct hvm_mmio_handler iommu_mmio_handler = { - .check_handler = guest_iommu_mmio_range, - .read_handler = guest_iommu_mmio_read, - .write_handler = guest_iommu_mmio_write +const struct hvm_mmio_ops iommu_mmio_ops = { + .check = guest_iommu_mmio_range, + .read = guest_iommu_mmio_read, + .write = guest_iommu_mmio_write }; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 886a9d6..f2aaec5 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -59,17 +59,17 @@ struct hvm_io_handler { struct io_handler hdl_list[MAX_IO_HANDLER]; }; -struct hvm_mmio_handler { - hvm_mmio_check_t check_handler; - hvm_mmio_read_t read_handler; - hvm_mmio_write_t write_handler; +struct hvm_mmio_ops { + hvm_mmio_check_t check; + hvm_mmio_read_t read; + hvm_mmio_write_t write; }; -extern const struct hvm_mmio_handler hpet_mmio_handler; -extern const struct hvm_mmio_handler vlapic_mmio_handler; -extern const struct hvm_mmio_handler vioapic_mmio_handler; -extern const struct hvm_mmio_handler msixtbl_mmio_handler; -extern const struct hvm_mmio_handler iommu_mmio_handler; +extern const struct hvm_mmio_ops hpet_mmio_ops; +extern const struct hvm_mmio_ops vlapic_mmio_ops; +extern const struct hvm_mmio_ops vioapic_mmio_ops; +extern const struct hvm_mmio_ops msixtbl_mmio_ops; +extern const struct hvm_mmio_ops iommu_mmio_ops; #define HVM_MMIO_HANDLER_NR 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 Fri Jun 26 15:58:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1H-0003Qb-59; Fri, 26 Jun 2015 15:58:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1F-0003Pj-Dn for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:21 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 17/CD-16518-C967D855; Fri, 26 Jun 2015 15:58:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435334298!20204808!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20020 invoked from network); 26 Jun 2015 15:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Jun 2015 15:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1C-0007Iv-C4 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W1C-0004VA-Ai for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:18 +0000 Date: Fri, 26 Jun 2015 15:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: re-name struct hvm_mmio_handler to hvm_mmio_ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcc0986c7abec04df211c49d741e0b8970adb242 Author: Paul Durrant AuthorDate: Wed Jun 24 17:53:36 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 17:53:36 2015 +0200 x86/hvm: re-name struct hvm_mmio_handler to hvm_mmio_ops The struct just contains three methods and no data, so the name hvm_mmio_ops more accurately reflects its content. A subsequent patch introduces a new structure which more accurately warrants the name hvm_mmio_handler so doing the rename in this purely cosmetic patch avoids conflating functional and cosmetic changes in a single patch. Signed-off-by: Paul Durrant Acked-by: Jan Beulich --- tools/tests/vhpet/emul.h | 8 +++--- tools/tests/vhpet/main.c | 6 ++-- xen/arch/x86/hvm/hpet.c | 8 +++--- xen/arch/x86/hvm/intercept.c | 41 ++++++++++++++--------------- xen/arch/x86/hvm/vioapic.c | 8 +++--- xen/arch/x86/hvm/vlapic.c | 8 +++--- xen/arch/x86/hvm/vmsi.c | 8 +++--- xen/drivers/passthrough/amd/iommu_guest.c | 8 +++--- xen/include/asm-x86/hvm/io.h | 18 ++++++------ 9 files changed, 56 insertions(+), 57 deletions(-) diff --git a/tools/tests/vhpet/emul.h b/tools/tests/vhpet/emul.h index 09e4611..383acff 100644 --- a/tools/tests/vhpet/emul.h +++ b/tools/tests/vhpet/emul.h @@ -237,11 +237,11 @@ typedef int (*hvm_mmio_write_t)(struct vcpu *v, typedef int (*hvm_mmio_check_t)(struct vcpu *v, unsigned long addr); -struct hvm_mmio_handler +struct hvm_mmio_ops { - hvm_mmio_check_t check_handler; - hvm_mmio_read_t read_handler; - hvm_mmio_write_t write_handler; + hvm_mmio_check_t check; + hvm_mmio_read_t read; + hvm_mmio_write_t write; }; /* Marshalling and unmarshalling uses a buffer with size and cursor. */ diff --git a/tools/tests/vhpet/main.c b/tools/tests/vhpet/main.c index fbd7510..6fe65ea 100644 --- a/tools/tests/vhpet/main.c +++ b/tools/tests/vhpet/main.c @@ -70,7 +70,7 @@ static int skip_error_on_load; static char *global_thousep; -extern const struct hvm_mmio_handler hpet_mmio_handler; +extern const struct hvm_mmio_ops hpet_mmio_ops; struct domain dom1; struct vcpu vcpu0; @@ -297,13 +297,13 @@ void udelay(int w) unsigned int hpet_readl(unsigned long a) { unsigned long ret = 0; - hpet_mmio_handler.read_handler(current, a, 4, &ret); + hpet_mmio_ops.read(current, a, 4, &ret); return ret; } void hpet_writel(unsigned long d, unsigned long a) { - hpet_mmio_handler.write_handler(current, a, 4, d); + hpet_mmio_ops.write(current, a, 4, d); return; } diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index d898169..9585ca8 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -504,10 +504,10 @@ static int hpet_range(struct vcpu *v, unsigned long addr) (addr < (HPET_BASE_ADDRESS + HPET_MMAP_SIZE)) ); } -const struct hvm_mmio_handler hpet_mmio_handler = { - .check_handler = hpet_range, - .read_handler = hpet_read, - .write_handler = hpet_write +const struct hvm_mmio_ops hpet_mmio_ops = { + .check = hpet_range, + .read = hpet_read, + .write = hpet_write }; diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index d52a48c..cc44733 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -32,20 +32,20 @@ #include #include -static const struct hvm_mmio_handler *const +static const struct hvm_mmio_ops *const hvm_mmio_handlers[HVM_MMIO_HANDLER_NR] = { - &hpet_mmio_handler, - &vlapic_mmio_handler, - &vioapic_mmio_handler, - &msixtbl_mmio_handler, - &iommu_mmio_handler + &hpet_mmio_ops, + &vlapic_mmio_ops, + &vioapic_mmio_ops, + &msixtbl_mmio_ops, + &iommu_mmio_ops }; static int hvm_mmio_access(struct vcpu *v, ioreq_t *p, - hvm_mmio_read_t read_handler, - hvm_mmio_write_t write_handler) + hvm_mmio_read_t read, + hvm_mmio_write_t write) { struct hvm_vcpu_io *vio = &v->arch.hvm_vcpu.hvm_io; unsigned long data; @@ -64,11 +64,11 @@ static int hvm_mmio_access(struct vcpu *v, vio->mmio_retrying = 0; } else - rc = read_handler(v, p->addr, p->size, &data); + rc = read(v, p->addr, p->size, &data); p->data = data; } else /* p->dir == IOREQ_WRITE */ - rc = write_handler(v, p->addr, p->size, p->data); + rc = write(v, p->addr, p->size, p->data); return rc; } @@ -86,7 +86,7 @@ static int hvm_mmio_access(struct vcpu *v, } else { - rc = read_handler(v, p->addr + step * i, p->size, &data); + rc = read(v, p->addr + step * i, p->size, &data); if ( rc != X86EMUL_OKAY ) break; } @@ -145,7 +145,7 @@ static int hvm_mmio_access(struct vcpu *v, } if ( rc != X86EMUL_OKAY ) break; - rc = write_handler(v, p->addr + step * i, p->size, data); + rc = write(v, p->addr + step * i, p->size, data); if ( rc != X86EMUL_OKAY ) break; } @@ -169,7 +169,7 @@ bool_t hvm_mmio_internal(paddr_t gpa) unsigned int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; ++i ) - if ( hvm_mmio_handlers[i]->check_handler(curr, gpa) ) + if ( hvm_mmio_handlers[i]->check(curr, gpa) ) return 1; return 0; @@ -182,21 +182,20 @@ int hvm_mmio_intercept(ioreq_t *p) for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) { - hvm_mmio_check_t check_handler = - hvm_mmio_handlers[i]->check_handler; + hvm_mmio_check_t check = hvm_mmio_handlers[i]->check; - if ( check_handler(v, p->addr) ) + if ( check(v, p->addr) ) { if ( unlikely(p->count > 1) && - !check_handler(v, unlikely(p->df) - ? p->addr - (p->count - 1L) * p->size - : p->addr + (p->count - 1L) * p->size) ) + !check(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) p->count = 1; return hvm_mmio_access( v, p, - hvm_mmio_handlers[i]->read_handler, - hvm_mmio_handlers[i]->write_handler); + hvm_mmio_handlers[i]->read, + hvm_mmio_handlers[i]->write); } } diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index f903420..cbbef9f 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -250,10 +250,10 @@ static int vioapic_range(struct vcpu *v, unsigned long addr) (addr < vioapic->base_address + VIOAPIC_MEM_LENGTH))); } -const struct hvm_mmio_handler vioapic_mmio_handler = { - .check_handler = vioapic_range, - .read_handler = vioapic_read, - .write_handler = vioapic_write +const struct hvm_mmio_ops vioapic_mmio_ops = { + .check = vioapic_range, + .read = vioapic_read, + .write = vioapic_write }; static void ioapic_inj_irq( diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index a5c3aba..32e649e 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -977,10 +977,10 @@ static int vlapic_range(struct vcpu *v, unsigned long addr) (offset < PAGE_SIZE); } -const struct hvm_mmio_handler vlapic_mmio_handler = { - .check_handler = vlapic_range, - .read_handler = vlapic_read, - .write_handler = vlapic_write +const struct hvm_mmio_ops vlapic_mmio_ops = { + .check = vlapic_range, + .read = vlapic_read, + .write = vlapic_write }; static void set_x2apic_id(struct vlapic *vlapic) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 3dbbe37..f89233d 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -344,10 +344,10 @@ static int msixtbl_range(struct vcpu *v, unsigned long addr) return !!desc; } -const struct hvm_mmio_handler msixtbl_mmio_handler = { - .check_handler = msixtbl_range, - .read_handler = msixtbl_read, - .write_handler = msixtbl_write +const struct hvm_mmio_ops msixtbl_mmio_ops = { + .check = msixtbl_range, + .read = msixtbl_read, + .write = msixtbl_write }; static void add_msixtbl_entry(struct domain *d, diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index 98e7b38..7b0c102 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -919,8 +919,8 @@ static int guest_iommu_mmio_range(struct vcpu *v, unsigned long addr) addr < iommu->mmio_base + IOMMU_MMIO_SIZE; } -const struct hvm_mmio_handler iommu_mmio_handler = { - .check_handler = guest_iommu_mmio_range, - .read_handler = guest_iommu_mmio_read, - .write_handler = guest_iommu_mmio_write +const struct hvm_mmio_ops iommu_mmio_ops = { + .check = guest_iommu_mmio_range, + .read = guest_iommu_mmio_read, + .write = guest_iommu_mmio_write }; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 886a9d6..f2aaec5 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -59,17 +59,17 @@ struct hvm_io_handler { struct io_handler hdl_list[MAX_IO_HANDLER]; }; -struct hvm_mmio_handler { - hvm_mmio_check_t check_handler; - hvm_mmio_read_t read_handler; - hvm_mmio_write_t write_handler; +struct hvm_mmio_ops { + hvm_mmio_check_t check; + hvm_mmio_read_t read; + hvm_mmio_write_t write; }; -extern const struct hvm_mmio_handler hpet_mmio_handler; -extern const struct hvm_mmio_handler vlapic_mmio_handler; -extern const struct hvm_mmio_handler vioapic_mmio_handler; -extern const struct hvm_mmio_handler msixtbl_mmio_handler; -extern const struct hvm_mmio_handler iommu_mmio_handler; +extern const struct hvm_mmio_ops hpet_mmio_ops; +extern const struct hvm_mmio_ops vlapic_mmio_ops; +extern const struct hvm_mmio_ops vioapic_mmio_ops; +extern const struct hvm_mmio_ops msixtbl_mmio_ops; +extern const struct hvm_mmio_ops iommu_mmio_ops; #define HVM_MMIO_HANDLER_NR 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 Fri Jun 26 15:58:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1Q-0003V2-9u; Fri, 26 Jun 2015 15:58:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1O-0003UO-U4 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:31 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id E7/51-01469-6A67D855; Fri, 26 Jun 2015 15:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1435334308!27019225!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2216 invoked from network); 26 Jun 2015 15:58:29 -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; 26 Jun 2015 15:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1M-0007J5-GY for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W1M-0004VY-Fm for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:28 +0000 Date: Fri, 26 Jun 2015 15:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix build with old gas X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e4c2f8d8c4375aaa00a15b9759596499989e3415 Author: Jan Beulich AuthorDate: Wed Jun 24 17:54:41 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 17:54:41 2015 +0200 x86: fix build with old gas .string8 is only supported by gas 2.19 and newer. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/include/asm-x86/bug.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index f1a8c9d..cec6bce 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -79,7 +79,7 @@ extern const struct bug_frame __start_bug_frames[], .L\@ud: ud2a .pushsection .rodata.str1, "aMS", @progbits, 1 - .L\@s1: .string8 "\file_str" + .L\@s1: .asciz "\file_str" .popsection .pushsection .bug_frames.\type, "a", @progbits @@ -91,7 +91,7 @@ extern const struct bug_frame __start_bug_frames[], .if \second_frame .pushsection .rodata.str1, "aMS", @progbits, 1 - .L\@s2: .string8 "\msg" + .L\@s2: .asciz "\msg" .popsection .long 0, (.L\@s2 - .L\@bf) .endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 15:58:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 15:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1Q-0003V2-9u; Fri, 26 Jun 2015 15:58:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1O-0003UO-U4 for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:31 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id E7/51-01469-6A67D855; Fri, 26 Jun 2015 15:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1435334308!27019225!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2216 invoked from network); 26 Jun 2015 15:58:29 -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; 26 Jun 2015 15:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8W1M-0007J5-GY for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8W1M-0004VY-Fm for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 15:58:28 +0000 Date: Fri, 26 Jun 2015 15:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix build with old gas X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e4c2f8d8c4375aaa00a15b9759596499989e3415 Author: Jan Beulich AuthorDate: Wed Jun 24 17:54:41 2015 +0200 Commit: Jan Beulich CommitDate: Wed Jun 24 17:54:41 2015 +0200 x86: fix build with old gas .string8 is only supported by gas 2.19 and newer. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/include/asm-x86/bug.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index f1a8c9d..cec6bce 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -79,7 +79,7 @@ extern const struct bug_frame __start_bug_frames[], .L\@ud: ud2a .pushsection .rodata.str1, "aMS", @progbits, 1 - .L\@s1: .string8 "\file_str" + .L\@s1: .asciz "\file_str" .popsection .pushsection .bug_frames.\type, "a", @progbits @@ -91,7 +91,7 @@ extern const struct bug_frame __start_bug_frames[], .if \second_frame .pushsection .rodata.str1, "aMS", @progbits, 1 - .L\@s2: .string8 "\msg" + .L\@s2: .asciz "\msg" .popsection .long 0, (.L\@s2 - .L\@bf) .endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 21:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 21: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 1Z8b4Z-00007A-QS; Fri, 26 Jun 2015 21:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8b4Y-00006i-3W for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 21:22:06 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 18/A6-16813-D72CD855; Fri, 26 Jun 2015 21:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1435353723!27073169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6659 invoked from network); 26 Jun 2015 21:22:04 -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; 26 Jun 2015 21:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8b4V-000374-Dn for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 21:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8b4U-0008KF-SX for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 21:22:03 +0000 Date: Fri, 26 Jun 2015 21:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] 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 38fcda225d6613ecc4bf44769806887252d7b2b1 Author: Ian Jackson AuthorDate: Tue Jun 23 11:44:13 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:13 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f9d1718..eef4d23 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 1259e092ee27f444f683f0d76a13a8a72d3f26cb -# Wed Jun 10 14:17:55 2015 +0100 -# xen/pt: unknown PCI config space fields should be read-only +QEMU_TAG ?= 2b5c19892fd76d1c5b6b2a0b4fee6a35513b4999 +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 26 21:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Jun 2015 21: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 1Z8b4Z-00007A-QS; Fri, 26 Jun 2015 21:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8b4Y-00006i-3W for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 21:22:06 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 18/A6-16813-D72CD855; Fri, 26 Jun 2015 21:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1435353723!27073169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6659 invoked from network); 26 Jun 2015 21:22:04 -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; 26 Jun 2015 21:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8b4V-000374-Dn for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 21:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8b4U-0008KF-SX for xen-changelog@lists.xensource.com; Fri, 26 Jun 2015 21:22:03 +0000 Date: Fri, 26 Jun 2015 21:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] 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 38fcda225d6613ecc4bf44769806887252d7b2b1 Author: Ian Jackson AuthorDate: Tue Jun 23 11:44:13 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:44:13 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f9d1718..eef4d23 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 1259e092ee27f444f683f0d76a13a8a72d3f26cb -# Wed Jun 10 14:17:55 2015 +0100 -# xen/pt: unknown PCI config space fields should be read-only +QEMU_TAG ?= 2b5c19892fd76d1c5b6b2a0b4fee6a35513b4999 +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02:22: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 1Z8fkt-0006eQ-EU; Sat, 27 Jun 2015 02:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fks-0006e9-2W for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:06 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 9C/BE-15949-DC80E855; Sat, 27 Jun 2015 02:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1435371723!11834590!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26054 invoked from network); 27 Jun 2015 02:22: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; 27 Jun 2015 02:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fkp-0005HS-Cf for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8fko-00036f-Ql for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:03 +0000 Date: Sat, 27 Jun 2015 02:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b1b9d165349dfc387fe7b3e466aaa960689debb Author: Jan Beulich AuthorDate: Mon Jun 22 10:43:59 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 10:43:59 2015 +0200 update Xen version to 4.5.1 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 8217417..a235904 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1-rc2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= afaa35b4bc975b2b89ad44c481d0d7623e3d1c49 +QEMU_TRADITIONAL_REVISION ?= xen-4.5.1 # Tue Jun 9 16:32:24 2015 +0100 # ... by default. Add a per-device "permissive" mode similar to pciback's diff --git a/xen/Makefile b/xen/Makefile index a5b47f7..df1d539 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .1-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02:22: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 1Z8fkt-0006eQ-EU; Sat, 27 Jun 2015 02:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fks-0006e9-2W for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:06 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 9C/BE-15949-DC80E855; Sat, 27 Jun 2015 02:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1435371723!11834590!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26054 invoked from network); 27 Jun 2015 02:22: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; 27 Jun 2015 02:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fkp-0005HS-Cf for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8fko-00036f-Ql for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:03 +0000 Date: Sat, 27 Jun 2015 02:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b1b9d165349dfc387fe7b3e466aaa960689debb Author: Jan Beulich AuthorDate: Mon Jun 22 10:43:59 2015 +0200 Commit: Jan Beulich CommitDate: Mon Jun 22 10:43:59 2015 +0200 update Xen version to 4.5.1 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 8217417..a235904 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1-rc2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.1 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= afaa35b4bc975b2b89ad44c481d0d7623e3d1c49 +QEMU_TRADITIONAL_REVISION ?= xen-4.5.1 # Tue Jun 9 16:32:24 2015 +0100 # ... by default. Add a per-device "permissive" mode similar to pciback's diff --git a/xen/Makefile b/xen/Makefile index a5b47f7..df1d539 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .1-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02:22: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 1Z8fl3-0006gt-H9; Sat, 27 Jun 2015 02:22:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fl1-0006gI-Rz for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:15 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 6E/A8-08467-7D80E855; Sat, 27 Jun 2015 02:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435371733!17236441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4965 invoked from network); 27 Jun 2015 02:22:14 -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; 27 Jun 2015 02:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fkz-0005HX-M1 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8fkz-00037A-K3 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:13 +0000 Date: Sat, 27 Jun 2015 02:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: update to say Xen 4.5, not Xen 4.5.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 6e865a4319f27090d0f422c7aa58602bb184d2dc Author: Ian Jackson AuthorDate: Mon Jun 22 14:12:56 2015 +0100 Commit: Ian Jackson CommitDate: Mon Jun 22 14:41:35 2015 +0100 README: update to say Xen 4.5, not Xen 4.5.0 We are about to release 4.5.1. And, we want to not have to patch README each time. Signed-off-by: Ian Jackson Acked-by: Jan Beulich --- README | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 3bdc74e..86b689e 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ ____ ___ -\ \/ /___ _ __ | || | | ___| / _ \ - \ // _ \ '_ \ | || |_ |___ \| | | | - / \ __/ | | | |__ _| ___) | |_| | -/_/\_\___|_| |_| |_|(_)____(_)___/ +__ __ _ _ ____ +\ \/ /___ _ __ | || | | ___| + \ // _ \ '_ \ | || |_ |___ \ + / \ __/ | | | |__ _| ___) | +/_/\_\___|_| |_| |_|(_)____/ ################################# -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02:22: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 1Z8fl3-0006gt-H9; Sat, 27 Jun 2015 02:22:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fl1-0006gI-Rz for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:15 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 6E/A8-08467-7D80E855; Sat, 27 Jun 2015 02:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435371733!17236441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4965 invoked from network); 27 Jun 2015 02:22:14 -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; 27 Jun 2015 02:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fkz-0005HX-M1 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8fkz-00037A-K3 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:13 +0000 Date: Sat, 27 Jun 2015 02:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: update to say Xen 4.5, not Xen 4.5.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 6e865a4319f27090d0f422c7aa58602bb184d2dc Author: Ian Jackson AuthorDate: Mon Jun 22 14:12:56 2015 +0100 Commit: Ian Jackson CommitDate: Mon Jun 22 14:41:35 2015 +0100 README: update to say Xen 4.5, not Xen 4.5.0 We are about to release 4.5.1. And, we want to not have to patch README each time. Signed-off-by: Ian Jackson Acked-by: Jan Beulich --- README | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 3bdc74e..86b689e 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ ____ ___ -\ \/ /___ _ __ | || | | ___| / _ \ - \ // _ \ '_ \ | || |_ |___ \| | | | - / \ __/ | | | |__ _| ___) | |_| | -/_/\_\___|_| |_| |_|(_)____(_)___/ +__ __ _ _ ____ +\ \/ /___ _ __ | || | | ___| + \ // _ \ '_ \ | || |_ |___ \ + / \ __/ | | | |__ _| ___) | +/_/\_\___|_| |_| |_|(_)____/ ################################# -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02:22: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 1Z8flD-0006jM-Jc; Sat, 27 Jun 2015 02:22:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8flC-0006il-1r for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:26 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id AE/DD-21074-1E80E855; Sat, 27 Jun 2015 02:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1435371744!17266415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16607 invoked from network); 27 Jun 2015 02:22:24 -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; 27 Jun 2015 02:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fl9-0005Hn-QW for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8fl9-00037W-Pd for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:23 +0000 Date: Sat, 27 Jun 2015 02:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.2-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 031ab7f5d1411e3a90bfe178c720345db54ccc09 Author: Jan Beulich AuthorDate: Tue Jun 23 12:40:11 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 12:40:11 2015 +0200 update Xen version to 4.5.2-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index df1d539..ee0bcfc 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02:22: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 1Z8flD-0006jM-Jc; Sat, 27 Jun 2015 02:22:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8flC-0006il-1r for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:26 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id AE/DD-21074-1E80E855; Sat, 27 Jun 2015 02:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1435371744!17266415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16607 invoked from network); 27 Jun 2015 02:22:24 -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; 27 Jun 2015 02:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8fl9-0005Hn-QW for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8fl9-00037W-Pd for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:23 +0000 Date: Sat, 27 Jun 2015 02:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.2-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 031ab7f5d1411e3a90bfe178c720345db54ccc09 Author: Jan Beulich AuthorDate: Tue Jun 23 12:40:11 2015 +0200 Commit: Jan Beulich CommitDate: Tue Jun 23 12:40:11 2015 +0200 update Xen version to 4.5.2-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index df1d539..ee0bcfc 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02: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 1Z8flO-0006m3-M8; Sat, 27 Jun 2015 02: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 1Z8flN-0006ld-0q for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:37 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id B0/C9-18676-CE80E855; Sat, 27 Jun 2015 02:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1435371754!27138730!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27015 invoked from network); 27 Jun 2015 02:22:35 -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; 27 Jun 2015 02:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8flK-0005Hx-2f for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8flJ-000387-Tg for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:34 +0000 Date: Sat, 27 Jun 2015 02:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 e3bd3cefba5f11062523701bd07051c92a47ef34 Author: Ian Jackson AuthorDate: Tue Jun 23 11:41:55 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:41:55 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index a235904..f5d19ff 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.1 -# Tue Jun 9 16:32:24 2015 +0100 -# ... by default. Add a per-device "permissive" mode similar to pciback's +QEMU_TRADITIONAL_REVISION ?= 9f9441988e7a3cd7a59fc613e1975c802b2d60d0 +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 02:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 02: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 1Z8flO-0006m3-M8; Sat, 27 Jun 2015 02: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 1Z8flN-0006ld-0q for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:37 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id B0/C9-18676-CE80E855; Sat, 27 Jun 2015 02:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1435371754!27138730!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27015 invoked from network); 27 Jun 2015 02:22:35 -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; 27 Jun 2015 02:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8flK-0005Hx-2f for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8flJ-000387-Tg for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 02:22:34 +0000 Date: Sat, 27 Jun 2015 02:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 e3bd3cefba5f11062523701bd07051c92a47ef34 Author: Ian Jackson AuthorDate: Tue Jun 23 11:41:55 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:41:55 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index a235904..f5d19ff 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.1 -# Tue Jun 9 16:32:24 2015 +0100 -# ... by default. Add a per-device "permissive" mode similar to pciback's +QEMU_TRADITIONAL_REVISION ?= 9f9441988e7a3cd7a59fc613e1975c802b2d60d0 +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:00:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00: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 1Z8tSk-0000Pz-1k; Sat, 27 Jun 2015 17:00:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSi-0000Ph-2V for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:16 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 9B/6D-31650-F96DE855; Sat, 27 Jun 2015 17:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1435424413!27191741!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19093 invoked from network); 27 Jun 2015 17:00:14 -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; 27 Jun 2015 17:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSW-0007Kd-Ku for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tSW-00006n-9z for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:04 +0000 Date: Sat, 27 Jun 2015 17:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] New maintainers for VM events and memory access. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed3fceb6e107668be6cc26b74b61d06e0e7d79fd Author: Tim Deegan AuthorDate: Tue Jun 23 11:41:33 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 New maintainers for VM events and memory access. Razvan and Tamas have been working on this code for a while now, and have kindly agreed to act as maintainers. Signed-off-by: Tim Deegan Acked-by: Tamas K Lengyel Acked-by: Razvan Cojocaru --- MAINTAINERS | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0372ef7..319df75 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -375,7 +375,8 @@ F: xen/arch/x86/mm/mem_paging.c F: tools/memshr VM EVENT AND MEM ACCESS -M: Tim Deegan +M: Razvan Cojocaru +M: Tamas K Lengyel S: Supported F: xen/common/vm_event.c F: xen/common/mem_access.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 Jun 27 17:00:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00: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 1Z8tSk-0000Pz-1k; Sat, 27 Jun 2015 17:00:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSi-0000Ph-2V for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:16 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 9B/6D-31650-F96DE855; Sat, 27 Jun 2015 17:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1435424413!27191741!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19093 invoked from network); 27 Jun 2015 17:00:14 -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; 27 Jun 2015 17:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSW-0007Kd-Ku for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tSW-00006n-9z for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:04 +0000 Date: Sat, 27 Jun 2015 17:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] New maintainers for VM events and memory access. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed3fceb6e107668be6cc26b74b61d06e0e7d79fd Author: Tim Deegan AuthorDate: Tue Jun 23 11:41:33 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 New maintainers for VM events and memory access. Razvan and Tamas have been working on this code for a while now, and have kindly agreed to act as maintainers. Signed-off-by: Tim Deegan Acked-by: Tamas K Lengyel Acked-by: Razvan Cojocaru --- MAINTAINERS | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0372ef7..319df75 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -375,7 +375,8 @@ F: xen/arch/x86/mm/mem_paging.c F: tools/memshr VM EVENT AND MEM ACCESS -M: Tim Deegan +M: Razvan Cojocaru +M: Tamas K Lengyel S: Supported F: xen/common/vm_event.c F: xen/common/mem_access.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 Jun 27 17:00:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSq-0000R5-40; Sat, 27 Jun 2015 17:00:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSo-0000Qg-32 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:22 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 26/11-02952-5A6DE855; Sat, 27 Jun 2015 17:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1435424420!20373606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28455 invoked from network); 27 Jun 2015 17:00:20 -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; 27 Jun 2015 17:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSl-0007Kh-Sd for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tSl-00007p-NP for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:19 +0000 Date: Sat, 27 Jun 2015 17:00:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] New maintainer for x86/mm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 893bbf858a9fedb04bfdc8b42d9b3e3be5315578 Author: Tim Deegan AuthorDate: Tue Jun 23 11:47:26 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 New maintainer for x86/mm George has a long record of contributions to the x86 memory management and p2m code. He will be taking over as the primary maintainer of x86/mm; I will still help out with the shadow pagetable code. Signed-off-by: Tim Deegan Acked-by: George Dunlap --- MAINTAINERS | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 319df75..b0f43d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -362,7 +362,7 @@ F: tools/firmware/hvmloader/ F: tools/tests/x86_emulator/ X86 MEMORY MANAGEMENT -M: Tim Deegan +M: George Dunlap S: Supported F: xen/arch/x86/mm/ @@ -374,6 +374,11 @@ F: xen/arch/x86/mm/mem_sharing.c F: xen/arch/x86/mm/mem_paging.c F: tools/memshr +X86 SHADOW PAGETABLES +M: Tim Deegan +S: Maintained +F: xen/arch/x86/mm/shadow/ + VM EVENT AND MEM ACCESS M: Razvan Cojocaru M: Tamas K Lengyel -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:00:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSq-0000R5-40; Sat, 27 Jun 2015 17:00:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSo-0000Qg-32 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:22 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 26/11-02952-5A6DE855; Sat, 27 Jun 2015 17:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1435424420!20373606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28455 invoked from network); 27 Jun 2015 17:00:20 -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; 27 Jun 2015 17:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSl-0007Kh-Sd for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tSl-00007p-NP for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:19 +0000 Date: Sat, 27 Jun 2015 17:00:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] New maintainer for x86/mm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 893bbf858a9fedb04bfdc8b42d9b3e3be5315578 Author: Tim Deegan AuthorDate: Tue Jun 23 11:47:26 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 New maintainer for x86/mm George has a long record of contributions to the x86 memory management and p2m code. He will be taking over as the primary maintainer of x86/mm; I will still help out with the shadow pagetable code. Signed-off-by: Tim Deegan Acked-by: George Dunlap --- MAINTAINERS | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 319df75..b0f43d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -362,7 +362,7 @@ F: tools/firmware/hvmloader/ F: tools/tests/x86_emulator/ X86 MEMORY MANAGEMENT -M: Tim Deegan +M: George Dunlap S: Supported F: xen/arch/x86/mm/ @@ -374,6 +374,11 @@ F: xen/arch/x86/mm/mem_sharing.c F: xen/arch/x86/mm/mem_paging.c F: tools/memshr +X86 SHADOW PAGETABLES +M: Tim Deegan +S: Maintained +F: xen/arch/x86/mm/shadow/ + VM EVENT AND MEM ACCESS M: Razvan Cojocaru M: Tamas K Lengyel -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:00:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tT0-0000Sl-6U; Sat, 27 Jun 2015 17:00:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSy-0000Sc-CQ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:32 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 41/31-18676-FA6DE855; Sat, 27 Jun 2015 17:00:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1435424430!27163439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19568 invoked from network); 27 Jun 2015 17:00:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSw-0007Kv-0n for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tSv-00008L-W5 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:29 +0000 Date: Sat, 27 Jun 2015 17:00:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Change kdd to 'Odd 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 c2c814fc16853c4ccbbfc2a05bf45ea44a25929e Author: Tim Deegan AuthorDate: Tue Jun 23 11:30:26 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 Change kdd to 'Odd Fixes'. kdd's knowledge of Windows kernel internals is several releases out of date now. However the underlying implementation of the serial protocol is still sound. I have heard that some people are using it, and I'm happy to answer questions/bug reports, so don't deprecate it just yet. Signed-off-by: Tim Deegan --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b0f43d1..7f0e96e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -182,7 +182,7 @@ F: tools/debugger/gdbsx/ KDD DEBUGGER M: Tim Deegan -S: Supported +S: Odd Fixes F: tools/debugger/kdd/ INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:00:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tT0-0000Sl-6U; Sat, 27 Jun 2015 17:00:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSy-0000Sc-CQ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:32 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 41/31-18676-FA6DE855; Sat, 27 Jun 2015 17:00:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1435424430!27163439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19568 invoked from network); 27 Jun 2015 17:00:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tSw-0007Kv-0n for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tSv-00008L-W5 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:29 +0000 Date: Sat, 27 Jun 2015 17:00:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Change kdd to 'Odd 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 c2c814fc16853c4ccbbfc2a05bf45ea44a25929e Author: Tim Deegan AuthorDate: Tue Jun 23 11:30:26 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 Change kdd to 'Odd Fixes'. kdd's knowledge of Windows kernel internals is several releases out of date now. However the underlying implementation of the serial protocol is still sound. I have heard that some people are using it, and I'm happy to answer questions/bug reports, so don't deprecate it just yet. Signed-off-by: Tim Deegan --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b0f43d1..7f0e96e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -182,7 +182,7 @@ F: tools/debugger/gdbsx/ KDD DEBUGGER M: Tim Deegan -S: Supported +S: Odd Fixes F: tools/debugger/kdd/ INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:00:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTA-0000Uh-9A; Sat, 27 Jun 2015 17:00:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tT8-0000UD-Ez for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:42 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 31/E9-10593-9B6DE855; Sat, 27 Jun 2015 17:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1435424440!20444693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32485 invoked from network); 27 Jun 2015 17:00:41 -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; 27 Jun 2015 17:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tT6-0007L3-5m for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tT6-00008l-4C for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:40 +0000 Date: Sat, 27 Jun 2015 17:00:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Change x86 paging/sharing to 'Orphaned'. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a338559db7cf16cd9f2187c0531f845b2fb8d211 Author: Tim Deegan AuthorDate: Tue Jun 23 11:35:09 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 Change x86 paging/sharing to 'Orphaned'. This code now has no active maintainers, as neither Andres nor I can commit the time. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla --- MAINTAINERS | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7f0e96e..d1bec17 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -367,9 +367,7 @@ S: Supported F: xen/arch/x86/mm/ X86 MEMORY SHARING AND PAGING -M: Andres Lagar-Cavilla -M: Tim Deegan -S: Supported +S: Orphaned F: xen/arch/x86/mm/mem_sharing.c F: xen/arch/x86/mm/mem_paging.c F: tools/memshr -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:00:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTA-0000Uh-9A; Sat, 27 Jun 2015 17:00:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tT8-0000UD-Ez for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:42 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 31/E9-10593-9B6DE855; Sat, 27 Jun 2015 17:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1435424440!20444693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32485 invoked from network); 27 Jun 2015 17:00:41 -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; 27 Jun 2015 17:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tT6-0007L3-5m for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tT6-00008l-4C for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:40 +0000 Date: Sat, 27 Jun 2015 17:00:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Change x86 paging/sharing to 'Orphaned'. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a338559db7cf16cd9f2187c0531f845b2fb8d211 Author: Tim Deegan AuthorDate: Tue Jun 23 11:35:09 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 Change x86 paging/sharing to 'Orphaned'. This code now has no active maintainers, as neither Andres nor I can commit the time. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla --- MAINTAINERS | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7f0e96e..d1bec17 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -367,9 +367,7 @@ S: Supported F: xen/arch/x86/mm/ X86 MEMORY SHARING AND PAGING -M: Andres Lagar-Cavilla -M: Tim Deegan -S: Supported +S: Orphaned F: xen/arch/x86/mm/mem_sharing.c F: xen/arch/x86/mm/mem_paging.c F: tools/memshr -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:00:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00: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 1Z8tTK-0000X9-Be; Sat, 27 Jun 2015 17:00:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTI-0000Wi-G2 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:52 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 46/93-10437-3C6DE855; Sat, 27 Jun 2015 17:00:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435424450!20452987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1297 invoked from network); 27 Jun 2015 17:00:51 -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; 27 Jun 2015 17:00:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTG-0007LB-B0 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTG-000098-8w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:50 +0000 Date: Sat, 27 Jun 2015 17:00:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Remove me from ARM/DT maintainers list. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c16485394844976cdb847d3158659cb998c83f91 Author: Tim Deegan AuthorDate: Tue Jun 23 11:27:31 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 Remove me from ARM/DT maintainers list. In practice I haven't been actively involved in this code for some time. Signed-off-by: Tim Deegan Acked-by: Ian Campbell --- MAINTAINERS | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1bec17..6b1068e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -127,7 +127,6 @@ F: tools/libxc/xc_arinc653.c ARM (W/ VIRTUALISATION EXTENSIONS) ARCHITECTURE M: Ian Campbell M: Stefano Stabellini -M: Tim Deegan S: Supported L: xen-devel@lists.xen.org F: xen/arch/arm/ @@ -151,7 +150,6 @@ F: xen/common/cpupool.c DEVICE TREE M: Ian Campbell M: Stefano Stabellini -M: Tim Deegan S: Supported F: xen/common/libfdt/ F: xen/common/device_tree.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 Jun 27 17:00:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:00: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 1Z8tTK-0000X9-Be; Sat, 27 Jun 2015 17:00:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTI-0000Wi-G2 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:52 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 46/93-10437-3C6DE855; Sat, 27 Jun 2015 17:00:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435424450!20452987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1297 invoked from network); 27 Jun 2015 17:00:51 -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; 27 Jun 2015 17:00:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTG-0007LB-B0 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTG-000098-8w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:00:50 +0000 Date: Sat, 27 Jun 2015 17:00:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Remove me from ARM/DT maintainers list. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c16485394844976cdb847d3158659cb998c83f91 Author: Tim Deegan AuthorDate: Tue Jun 23 11:27:31 2015 +0100 Commit: Tim Deegan (3P) CommitDate: Thu Jun 25 10:17:58 2015 +0100 Remove me from ARM/DT maintainers list. In practice I haven't been actively involved in this code for some time. Signed-off-by: Tim Deegan Acked-by: Ian Campbell --- MAINTAINERS | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1bec17..6b1068e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -127,7 +127,6 @@ F: tools/libxc/xc_arinc653.c ARM (W/ VIRTUALISATION EXTENSIONS) ARCHITECTURE M: Ian Campbell M: Stefano Stabellini -M: Tim Deegan S: Supported L: xen-devel@lists.xen.org F: xen/arch/arm/ @@ -151,7 +150,6 @@ F: xen/common/cpupool.c DEVICE TREE M: Ian Campbell M: Stefano Stabellini -M: Tim Deegan S: Supported F: xen/common/libfdt/ F: xen/common/device_tree.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 Jun 27 17:01:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTU-0000Z8-EJ; Sat, 27 Jun 2015 17:01:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTT-0000Yu-DD for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:03 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 5E/D1-08244-EC6DE855; Sat, 27 Jun 2015 17:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1435424460!17284561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8572 invoked from network); 27 Jun 2015 17:01:01 -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; 27 Jun 2015 17:01:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTQ-0007LM-ID for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTQ-0000AD-FS for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:00 +0000 Date: Sat, 27 Jun 2015 17:01:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Propagate clock-frequency to DOMU if present in the DT timer node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59ccb33c40c84af729d6c4c5042a7962a40e8537 Author: Julien Grall AuthorDate: Fri Jun 19 13:41:29 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 10:59:08 2015 +0100 xen/arm: Propagate clock-frequency to DOMU if present in the DT timer node When the property "clock-frequency" is present in the DT timer node, it means that the bootloader/firmware didn't correctly configure the CNTFRQ/CNTFRQ_EL0 on each processor. The best solution would be to fix the offending firmware/bootloader, although it may not always be possible to modify and re-flash it. As it's not possible to trap the register CNTFRQ/CNTFRQ_EL0, we have to extend xen_arch_domainconfig to provide the timer frequency to the toolstack when the property "clock-frequency" is present to the host DT timer node. Then, a property "clock-frequency" will be created in the guest DT timer node if the value is not 0. We could have set the property in the guest DT no matter if the property is present in the host DT. Although, we still want to let the guest using CNTFRQ in normal case. After all, the property "clock-frequency" is just a workaround for buggy firmware. Also add a stub for fdt_property_u32 which is not present in libfdt < 1.4.0 used by distribution such as Debian Wheezy. Signed-off-by: Julien Grall Tested-by: Chris Brand Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- tools/config.h.in | 4 ++++ tools/configure | 15 +++++++++++++++ tools/configure.ac | 4 ++++ tools/libxl/libxl_arm.c | 9 +++++++-- tools/libxl/libxl_libfdt_compat.h | 9 +++++++++ xen/arch/arm/domain.c | 2 +- xen/arch/arm/time.c | 5 +++++ xen/arch/arm/vtimer.c | 4 +++- xen/arch/arm/vtimer.h | 3 ++- xen/include/asm-arm/time.h | 6 ++++++ xen/include/public/arch-arm.h | 14 ++++++++++++++ 11 files changed, 70 insertions(+), 5 deletions(-) diff --git a/tools/config.h.in b/tools/config.h.in index d55173b..478a2cc 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -14,6 +14,10 @@ you don't. */ #undef HAVE_DECL_FDT_NEXT_SUBNODE +/* Define to 1 if you have the declaration of `fdt_property_u32', and to 0 if + you don't. */ +#undef HAVE_DECL_FDT_PROPERTY_U32 + /* Define to 1 if you have the `fdt_first_subnode' function. */ #undef HAVE_FDT_FIRST_SUBNODE diff --git a/tools/configure b/tools/configure index 896d892..9e87e90 100755 --- a/tools/configure +++ b/tools/configure @@ -8906,6 +8906,21 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL_FDT_NEXT_SUBNODE $ac_have_decl _ACEOF + +# The helper fdt_property_u32 is only present in libfdt >= 1.4.0 +# It's an inline function, so only check if the declaration is present +ac_fn_c_check_decl "$LINENO" "fdt_property_u32" "ac_cv_have_decl_fdt_property_u32" "#include +" +if test "x$ac_cv_have_decl_fdt_property_u32" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FDT_PROPERTY_U32 $ac_have_decl +_ACEOF + esac # Checks for header files. diff --git a/tools/configure.ac b/tools/configure.ac index 1a06ddf..2886cb5 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -379,6 +379,10 @@ AS_IF([test "x$partial_dt" = "xy" ], # * The prototype exists but the functions are not exposed. Don't ask why... AC_CHECK_FUNCS([fdt_first_subnode fdt_next_subnode]) AC_CHECK_DECLS([fdt_first_subnode, fdt_next_subnode],,,[#include ]) + +# The helper fdt_property_u32 is only present in libfdt >= 1.4.0 +# It's an inline function, so only check if the declaration is present +AC_CHECK_DECLS([fdt_property_u32],,,[#include ]) esac # Checks for header files. diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 4fb5e26..f09c860 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -444,7 +444,9 @@ static int make_gicv3_node(libxl__gc *gc, void *fdt) return 0; } -static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ainfo) +static int make_timer_node(libxl__gc *gc, void *fdt, + const struct arch_info *ainfo, + uint32_t frequency) { int res; gic_interrupt ints[3]; @@ -462,6 +464,9 @@ static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ain res = fdt_property_interrupts(gc, fdt, ints, 3); if (res) return res; + if ( frequency ) + fdt_property_u32(fdt, "clock-frequency", frequency); + res = fdt_end_node(fdt); if (res) return res; @@ -805,7 +810,7 @@ next_resize: goto out; } - FDT( make_timer_node(gc, fdt, ainfo) ); + FDT( make_timer_node(gc, fdt, ainfo, xc_config->clock_frequency) ); FDT( make_hypervisor_node(gc, fdt, vers) ); if (pfdt) diff --git a/tools/libxl/libxl_libfdt_compat.h b/tools/libxl/libxl_libfdt_compat.h index 53a5076..23230b5 100644 --- a/tools/libxl/libxl_libfdt_compat.h +++ b/tools/libxl/libxl_libfdt_compat.h @@ -61,6 +61,7 @@ #define LIBXL_LIBFDT_COMPAT_H #include "libxl_internal.h" +#include #if !HAVE_DECL_FDT_FIRST_SUBNODE _hidden int fdt_first_subnode(const void *fdt, int offset); @@ -70,6 +71,14 @@ _hidden int fdt_first_subnode(const void *fdt, int offset); _hidden int fdt_next_subnode(const void *fdt, int offset); #endif +#if !HAVE_DECL_FDT_PROPERTY_U32 +static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val) +{ + uint32_t tmp = cpu_to_fdt32(val); + return fdt_property(fdt, name, &tmp, sizeof(tmp)); +} +#endif + #endif /* diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 24b8938..8b1bf5a 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -593,7 +593,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, if ( (rc = domain_vgic_init(d, config->nr_spis)) != 0 ) goto fail; - if ( (rc = domain_vtimer_init(d)) != 0 ) + if ( (rc = domain_vtimer_init(d, config)) != 0 ) goto fail; /* diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index ce6d3fd..5ded30c 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -42,6 +42,8 @@ uint64_t __read_mostly boot_count; * register-mapped time source in the SoC. */ unsigned long __read_mostly cpu_khz; /* CPU clock frequency in kHz. */ +uint32_t __read_mostly timer_dt_clock_frequency; + static unsigned int timer_irq[MAX_TIMER_PPI]; unsigned int timer_get_irq(enum timer_ppi ppi) @@ -86,7 +88,10 @@ void __init preinit_xen_time(void) res = dt_property_read_u32(timer, "clock-frequency", &rate); if ( res ) + { cpu_khz = rate / 1000; + timer_dt_clock_frequency = rate; + } else cpu_khz = READ_SYSREG32(CNTFRQ_EL0) / 1000; diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 685bfea..1418092 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -60,11 +60,13 @@ static void virt_timer_expired(void *data) perfc_incr(vtimer_virt_inject); } -int domain_vtimer_init(struct domain *d) +int domain_vtimer_init(struct domain *d, struct xen_arch_domainconfig *config) { d->arch.phys_timer_base.offset = NOW(); d->arch.virt_timer_base.offset = READ_SYSREG64(CNTPCT_EL0); + config->clock_frequency = timer_dt_clock_frequency; + /* At this stage vgic_reserve_virq can't fail */ if ( is_hardware_domain(d) ) { diff --git a/xen/arch/arm/vtimer.h b/xen/arch/arm/vtimer.h index 6d2e46e..99e8145 100644 --- a/xen/arch/arm/vtimer.h +++ b/xen/arch/arm/vtimer.h @@ -20,7 +20,8 @@ #ifndef __ARCH_ARM_VTIMER_H__ #define __ARCH_ARM_VTIMER_H__ -extern int domain_vtimer_init(struct domain *d); +extern int domain_vtimer_init(struct domain *d, + struct xen_arch_domainconfig *config); extern int vcpu_vtimer_init(struct vcpu *v); extern int vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr); extern int virt_timer_save(struct vcpu *v); diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 039039a..d755f36 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -22,6 +22,12 @@ enum timer_ppi MAX_TIMER_PPI = 4, }; +/* + * Value of "clock-frequency" in the DT timer node if present. + * 0 means the property doesn't exist. + */ +extern uint32_t timer_dt_clock_frequency; + /* Get one of the timer IRQ number */ unsigned int timer_get_irq(enum timer_ppi ppi); diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 6f24c5f..805483e 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -311,6 +311,20 @@ struct xen_arch_domainconfig { uint8_t gic_version; /* IN */ uint32_t nr_spis; + /* + * OUT + * Based on the property clock-frequency in the DT timer node. + * The property may be present when the bootloader/firmware doesn't + * set correctly CNTFRQ which hold the timer frequency. + * + * As it's not possible to trap this register, we have to replicate + * the value in the guest DT. + * + * = 0 => property not present + * > 0 => Value of the property + * + */ + uint32_t clock_frequency; }; #endif /* __XEN__ || __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 Sat Jun 27 17:01:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTU-0000Z8-EJ; Sat, 27 Jun 2015 17:01:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTT-0000Yu-DD for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:03 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 5E/D1-08244-EC6DE855; Sat, 27 Jun 2015 17:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1435424460!17284561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8572 invoked from network); 27 Jun 2015 17:01:01 -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; 27 Jun 2015 17:01:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTQ-0007LM-ID for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTQ-0000AD-FS for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:00 +0000 Date: Sat, 27 Jun 2015 17:01:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Propagate clock-frequency to DOMU if present in the DT timer node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59ccb33c40c84af729d6c4c5042a7962a40e8537 Author: Julien Grall AuthorDate: Fri Jun 19 13:41:29 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 10:59:08 2015 +0100 xen/arm: Propagate clock-frequency to DOMU if present in the DT timer node When the property "clock-frequency" is present in the DT timer node, it means that the bootloader/firmware didn't correctly configure the CNTFRQ/CNTFRQ_EL0 on each processor. The best solution would be to fix the offending firmware/bootloader, although it may not always be possible to modify and re-flash it. As it's not possible to trap the register CNTFRQ/CNTFRQ_EL0, we have to extend xen_arch_domainconfig to provide the timer frequency to the toolstack when the property "clock-frequency" is present to the host DT timer node. Then, a property "clock-frequency" will be created in the guest DT timer node if the value is not 0. We could have set the property in the guest DT no matter if the property is present in the host DT. Although, we still want to let the guest using CNTFRQ in normal case. After all, the property "clock-frequency" is just a workaround for buggy firmware. Also add a stub for fdt_property_u32 which is not present in libfdt < 1.4.0 used by distribution such as Debian Wheezy. Signed-off-by: Julien Grall Tested-by: Chris Brand Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- tools/config.h.in | 4 ++++ tools/configure | 15 +++++++++++++++ tools/configure.ac | 4 ++++ tools/libxl/libxl_arm.c | 9 +++++++-- tools/libxl/libxl_libfdt_compat.h | 9 +++++++++ xen/arch/arm/domain.c | 2 +- xen/arch/arm/time.c | 5 +++++ xen/arch/arm/vtimer.c | 4 +++- xen/arch/arm/vtimer.h | 3 ++- xen/include/asm-arm/time.h | 6 ++++++ xen/include/public/arch-arm.h | 14 ++++++++++++++ 11 files changed, 70 insertions(+), 5 deletions(-) diff --git a/tools/config.h.in b/tools/config.h.in index d55173b..478a2cc 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -14,6 +14,10 @@ you don't. */ #undef HAVE_DECL_FDT_NEXT_SUBNODE +/* Define to 1 if you have the declaration of `fdt_property_u32', and to 0 if + you don't. */ +#undef HAVE_DECL_FDT_PROPERTY_U32 + /* Define to 1 if you have the `fdt_first_subnode' function. */ #undef HAVE_FDT_FIRST_SUBNODE diff --git a/tools/configure b/tools/configure index 896d892..9e87e90 100755 --- a/tools/configure +++ b/tools/configure @@ -8906,6 +8906,21 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL_FDT_NEXT_SUBNODE $ac_have_decl _ACEOF + +# The helper fdt_property_u32 is only present in libfdt >= 1.4.0 +# It's an inline function, so only check if the declaration is present +ac_fn_c_check_decl "$LINENO" "fdt_property_u32" "ac_cv_have_decl_fdt_property_u32" "#include +" +if test "x$ac_cv_have_decl_fdt_property_u32" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FDT_PROPERTY_U32 $ac_have_decl +_ACEOF + esac # Checks for header files. diff --git a/tools/configure.ac b/tools/configure.ac index 1a06ddf..2886cb5 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -379,6 +379,10 @@ AS_IF([test "x$partial_dt" = "xy" ], # * The prototype exists but the functions are not exposed. Don't ask why... AC_CHECK_FUNCS([fdt_first_subnode fdt_next_subnode]) AC_CHECK_DECLS([fdt_first_subnode, fdt_next_subnode],,,[#include ]) + +# The helper fdt_property_u32 is only present in libfdt >= 1.4.0 +# It's an inline function, so only check if the declaration is present +AC_CHECK_DECLS([fdt_property_u32],,,[#include ]) esac # Checks for header files. diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 4fb5e26..f09c860 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -444,7 +444,9 @@ static int make_gicv3_node(libxl__gc *gc, void *fdt) return 0; } -static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ainfo) +static int make_timer_node(libxl__gc *gc, void *fdt, + const struct arch_info *ainfo, + uint32_t frequency) { int res; gic_interrupt ints[3]; @@ -462,6 +464,9 @@ static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ain res = fdt_property_interrupts(gc, fdt, ints, 3); if (res) return res; + if ( frequency ) + fdt_property_u32(fdt, "clock-frequency", frequency); + res = fdt_end_node(fdt); if (res) return res; @@ -805,7 +810,7 @@ next_resize: goto out; } - FDT( make_timer_node(gc, fdt, ainfo) ); + FDT( make_timer_node(gc, fdt, ainfo, xc_config->clock_frequency) ); FDT( make_hypervisor_node(gc, fdt, vers) ); if (pfdt) diff --git a/tools/libxl/libxl_libfdt_compat.h b/tools/libxl/libxl_libfdt_compat.h index 53a5076..23230b5 100644 --- a/tools/libxl/libxl_libfdt_compat.h +++ b/tools/libxl/libxl_libfdt_compat.h @@ -61,6 +61,7 @@ #define LIBXL_LIBFDT_COMPAT_H #include "libxl_internal.h" +#include #if !HAVE_DECL_FDT_FIRST_SUBNODE _hidden int fdt_first_subnode(const void *fdt, int offset); @@ -70,6 +71,14 @@ _hidden int fdt_first_subnode(const void *fdt, int offset); _hidden int fdt_next_subnode(const void *fdt, int offset); #endif +#if !HAVE_DECL_FDT_PROPERTY_U32 +static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val) +{ + uint32_t tmp = cpu_to_fdt32(val); + return fdt_property(fdt, name, &tmp, sizeof(tmp)); +} +#endif + #endif /* diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 24b8938..8b1bf5a 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -593,7 +593,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, if ( (rc = domain_vgic_init(d, config->nr_spis)) != 0 ) goto fail; - if ( (rc = domain_vtimer_init(d)) != 0 ) + if ( (rc = domain_vtimer_init(d, config)) != 0 ) goto fail; /* diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index ce6d3fd..5ded30c 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -42,6 +42,8 @@ uint64_t __read_mostly boot_count; * register-mapped time source in the SoC. */ unsigned long __read_mostly cpu_khz; /* CPU clock frequency in kHz. */ +uint32_t __read_mostly timer_dt_clock_frequency; + static unsigned int timer_irq[MAX_TIMER_PPI]; unsigned int timer_get_irq(enum timer_ppi ppi) @@ -86,7 +88,10 @@ void __init preinit_xen_time(void) res = dt_property_read_u32(timer, "clock-frequency", &rate); if ( res ) + { cpu_khz = rate / 1000; + timer_dt_clock_frequency = rate; + } else cpu_khz = READ_SYSREG32(CNTFRQ_EL0) / 1000; diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 685bfea..1418092 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -60,11 +60,13 @@ static void virt_timer_expired(void *data) perfc_incr(vtimer_virt_inject); } -int domain_vtimer_init(struct domain *d) +int domain_vtimer_init(struct domain *d, struct xen_arch_domainconfig *config) { d->arch.phys_timer_base.offset = NOW(); d->arch.virt_timer_base.offset = READ_SYSREG64(CNTPCT_EL0); + config->clock_frequency = timer_dt_clock_frequency; + /* At this stage vgic_reserve_virq can't fail */ if ( is_hardware_domain(d) ) { diff --git a/xen/arch/arm/vtimer.h b/xen/arch/arm/vtimer.h index 6d2e46e..99e8145 100644 --- a/xen/arch/arm/vtimer.h +++ b/xen/arch/arm/vtimer.h @@ -20,7 +20,8 @@ #ifndef __ARCH_ARM_VTIMER_H__ #define __ARCH_ARM_VTIMER_H__ -extern int domain_vtimer_init(struct domain *d); +extern int domain_vtimer_init(struct domain *d, + struct xen_arch_domainconfig *config); extern int vcpu_vtimer_init(struct vcpu *v); extern int vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr); extern int virt_timer_save(struct vcpu *v); diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 039039a..d755f36 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -22,6 +22,12 @@ enum timer_ppi MAX_TIMER_PPI = 4, }; +/* + * Value of "clock-frequency" in the DT timer node if present. + * 0 means the property doesn't exist. + */ +extern uint32_t timer_dt_clock_frequency; + /* Get one of the timer IRQ number */ unsigned int timer_get_irq(enum timer_ppi ppi); diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 6f24c5f..805483e 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -311,6 +311,20 @@ struct xen_arch_domainconfig { uint8_t gic_version; /* IN */ uint32_t nr_spis; + /* + * OUT + * Based on the property clock-frequency in the DT timer node. + * The property may be present when the bootloader/firmware doesn't + * set correctly CNTFRQ which hold the timer frequency. + * + * As it's not possible to trap this register, we have to replicate + * the value in the guest DT. + * + * = 0 => property not present + * > 0 => Value of the property + * + */ + uint32_t clock_frequency; }; #endif /* __XEN__ || __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 Sat Jun 27 17:01:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTe-0000b1-Gx; Sat, 27 Jun 2015 17:01:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTd-0000af-8g for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:13 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 17/42-01139-8D6DE855; Sat, 27 Jun 2015 17:01:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1435424471!9730409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13333 invoked from network); 27 Jun 2015 17:01:11 -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; 27 Jun 2015 17:01:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTa-0007M0-TP for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTa-0000Ak-LN for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:10 +0000 Date: Sat, 27 Jun 2015 17:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Look for documentation in sub-directories X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6592bf60beaf1fa0b4fd36fb73800eb001c739af Author: Julien Grall AuthorDate: Sat Jun 20 12:37:13 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:00:26 2015 +0100 docs: Look for documentation in sub-directories The ARM documentation is living in a specific folder under misc. Until now, it was skipped during building. In order to avoid missing future directory, use find to look for a specific file pattern through all the directory. Note the we already use find in other Makefile. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/Makefile | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 60bc541..0ee6808 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,16 +7,16 @@ VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build -MAN1SRC-y := $(sort $(wildcard man/xl*.pod.1)) -MAN1SRC-y += $(sort $(wildcard man/xenstore*.pod.1)) +MAN1SRC-y += $(sort $(shell find man -name 'xl*.pod.1' -print)) +MAN1SRC-y += $(sort $(shell find man -name 'xenstore*.pod.1' -print)) -MAN5SRC-y := $(sort $(wildcard man/xl*.pod.5)) +MAN5SRC-y := $(sort $(shell find man 'xl*.pod.5' -print)) -MARKDOWNSRC-y := $(sort $(wildcard misc/*.markdown)) +MARKDOWNSRC-y := $(sort $(shell find misc '*.markdown' -print)) -TXTSRC-y := $(sort $(wildcard misc/*.txt)) +TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(wildcard specs/*.pandoc)) +PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-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 Jun 27 17:01:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTe-0000b1-Gx; Sat, 27 Jun 2015 17:01:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTd-0000af-8g for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:13 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 17/42-01139-8D6DE855; Sat, 27 Jun 2015 17:01:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1435424471!9730409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13333 invoked from network); 27 Jun 2015 17:01:11 -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; 27 Jun 2015 17:01:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTa-0007M0-TP for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTa-0000Ak-LN for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:10 +0000 Date: Sat, 27 Jun 2015 17:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Look for documentation in sub-directories X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6592bf60beaf1fa0b4fd36fb73800eb001c739af Author: Julien Grall AuthorDate: Sat Jun 20 12:37:13 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:00:26 2015 +0100 docs: Look for documentation in sub-directories The ARM documentation is living in a specific folder under misc. Until now, it was skipped during building. In order to avoid missing future directory, use find to look for a specific file pattern through all the directory. Note the we already use find in other Makefile. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/Makefile | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 60bc541..0ee6808 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,16 +7,16 @@ VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build -MAN1SRC-y := $(sort $(wildcard man/xl*.pod.1)) -MAN1SRC-y += $(sort $(wildcard man/xenstore*.pod.1)) +MAN1SRC-y += $(sort $(shell find man -name 'xl*.pod.1' -print)) +MAN1SRC-y += $(sort $(shell find man -name 'xenstore*.pod.1' -print)) -MAN5SRC-y := $(sort $(wildcard man/xl*.pod.5)) +MAN5SRC-y := $(sort $(shell find man 'xl*.pod.5' -print)) -MARKDOWNSRC-y := $(sort $(wildcard misc/*.markdown)) +MARKDOWNSRC-y := $(sort $(shell find misc '*.markdown' -print)) -TXTSRC-y := $(sort $(wildcard misc/*.txt)) +TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(wildcard specs/*.pandoc)) +PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-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 Jun 27 17:01:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTn-0000ct-Lp; Sat, 27 Jun 2015 17:01:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTn-0000ci-79 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:23 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id F9/B1-02952-2E6DE855; Sat, 27 Jun 2015 17:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435424481!20414138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31580 invoked from network); 27 Jun 2015 17:01:22 -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; 27 Jun 2015 17:01:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTl-0007M8-4N for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTk-0000B9-W8 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:21 +0000 Date: Sat, 27 Jun 2015 17:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Update INDEX to give a title for each ARM docs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit baf60a54d473a0e5cdd8e5f92350ce8650507d04 Author: Julien Grall AuthorDate: Sat Jun 20 12:37:14 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:00:26 2015 +0100 docs: Update INDEX to give a title for each ARM docs Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/INDEX | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/docs/INDEX b/docs/INDEX index fdf0ad8..5ed156f 100644 --- a/docs/INDEX +++ b/docs/INDEX @@ -26,3 +26,8 @@ misc/vtpm Virtual TPM misc/xen-error-handling Xen Error Handling misc/xenpaging Xen Paging misc/xsm-flask XSM/FLASK Configuration +misc/arm/booting How to boot Xen on ARM +misc/arm/early-printk Enabling early printk on ARM +misc/arm/passthrough Passthrough a device described in the Device Tree to a guest +misc/arm/device-tree/booting Device tree bindings to boot Xen +misc/arm/device-tree/passthrough Device tree binding to passthrough a device -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:01:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTn-0000ct-Lp; Sat, 27 Jun 2015 17:01:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTn-0000ci-79 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:23 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id F9/B1-02952-2E6DE855; Sat, 27 Jun 2015 17:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435424481!20414138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31580 invoked from network); 27 Jun 2015 17:01:22 -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; 27 Jun 2015 17:01:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTl-0007M8-4N for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTk-0000B9-W8 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:21 +0000 Date: Sat, 27 Jun 2015 17:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Update INDEX to give a title for each ARM docs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit baf60a54d473a0e5cdd8e5f92350ce8650507d04 Author: Julien Grall AuthorDate: Sat Jun 20 12:37:14 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:00:26 2015 +0100 docs: Update INDEX to give a title for each ARM docs Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/INDEX | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/docs/INDEX b/docs/INDEX index fdf0ad8..5ed156f 100644 --- a/docs/INDEX +++ b/docs/INDEX @@ -26,3 +26,8 @@ misc/vtpm Virtual TPM misc/xen-error-handling Xen Error Handling misc/xenpaging Xen Paging misc/xsm-flask XSM/FLASK Configuration +misc/arm/booting How to boot Xen on ARM +misc/arm/early-printk Enabling early printk on ARM +misc/arm/passthrough Passthrough a device described in the Device Tree to a guest +misc/arm/device-tree/booting Device tree bindings to boot Xen +misc/arm/device-tree/passthrough Device tree binding to passthrough a device -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:01:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTy-0000eg-OR; Sat, 27 Jun 2015 17:01:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTx-0000eU-Pj for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:33 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 75/66-19853-DE6DE855; Sat, 27 Jun 2015 17:01:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435424491!17284358!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2805 invoked from network); 27 Jun 2015 17:01:32 -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; 27 Jun 2015 17:01:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTv-0007MI-Al for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTv-0000Ba-8w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:31 +0000 Date: Sat, 27 Jun 2015 17:01:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "libxl_set_memory_target: retain the same maxmem offset on top of the current target" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3821d303f5d2d35f8625391879f9ada16f53a40b Author: Wei Liu AuthorDate: Tue Jun 23 17:07:57 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:22:04 2015 +0100 Revert "libxl_set_memory_target: retain the same maxmem offset on top of the current target" This reverts commit 0c029c4da2169159064568ef4fea862a5d2cd84a. A new memory model that allows QEMU to bump memory behind libxl's back was merged a few months ago. We didn't fully understand the repercussions back then. Now it breaks migration and becomes blocker of 4.6 release. It's better to restore to original behaviour at this stage of the release cycle, that would put us in a position no worse than before, so the release is unblocked. The said function is still racy after reverting these two patches. Making domain memory state consistent requires a bit more work. Separate patch(es) will be sent out to deal with that problem. Fix up conflicts with f5b43e95 (libxl: fix "xl mem-set" regression from 0c029c4da2). Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index d86ea62..cfc2623 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4742,16 +4742,11 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); + xc_domaininfo_t info; libxl_dominfo ptr; char *uuid; xs_transaction_t t; - libxl_dominfo_init(&ptr); - if (libxl_domain_info(ctx, &ptr, domid) < 0) - goto out_no_transaction; - - uuid = libxl__uuid2string(gc, ptr.uuid); - retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4827,12 +4822,13 @@ retry_transaction: } if (enforce) { - memorykb = ptr.max_memkb - current_target_memkb + new_target_memkb; - rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb); + memorykb = new_target_memkb + videoram; + rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb + + LIBXL_MAXMEM_CONSTANT); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_setmaxmem domid=%u memkb=%"PRIu64" failed " - "rc=%d\n", domid, memorykb, rc); + "rc=%d\n", domid, memorykb + LIBXL_MAXMEM_CONSTANT, rc); abort_transaction = 1; goto out; } @@ -4851,9 +4847,18 @@ retry_transaction: libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/memory/target", dompath), "%"PRIu32, new_target_memkb); + rc = xc_domain_getinfolist(ctx->xch, domid, 1, &info); + if (rc != 1 || info.domain != domid) { + abort_transaction = 1; + goto out; + } + libxl_dominfo_init(&ptr); + xcinfo2xlinfo(ctx, &info, &ptr); + uuid = libxl__uuid2string(gc, ptr.uuid); libxl__xs_write(gc, t, libxl__sprintf(gc, "/vm/%s/memory", uuid), "%"PRIu32, new_target_memkb / 1024); + libxl_dominfo_dispose(&ptr); out: if (!xs_transaction_end(ctx->xsh, t, abort_transaction) @@ -4862,7 +4867,6 @@ out: goto retry_transaction; out_no_transaction: - libxl_dominfo_dispose(&ptr); GC_FREE; 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 Jun 27 17:01:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tTy-0000eg-OR; Sat, 27 Jun 2015 17:01:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTx-0000eU-Pj for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:33 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 75/66-19853-DE6DE855; Sat, 27 Jun 2015 17:01:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435424491!17284358!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2805 invoked from network); 27 Jun 2015 17:01:32 -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; 27 Jun 2015 17:01:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tTv-0007MI-Al for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tTv-0000Ba-8w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:31 +0000 Date: Sat, 27 Jun 2015 17:01:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "libxl_set_memory_target: retain the same maxmem offset on top of the current target" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3821d303f5d2d35f8625391879f9ada16f53a40b Author: Wei Liu AuthorDate: Tue Jun 23 17:07:57 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 11:22:04 2015 +0100 Revert "libxl_set_memory_target: retain the same maxmem offset on top of the current target" This reverts commit 0c029c4da2169159064568ef4fea862a5d2cd84a. A new memory model that allows QEMU to bump memory behind libxl's back was merged a few months ago. We didn't fully understand the repercussions back then. Now it breaks migration and becomes blocker of 4.6 release. It's better to restore to original behaviour at this stage of the release cycle, that would put us in a position no worse than before, so the release is unblocked. The said function is still racy after reverting these two patches. Making domain memory state consistent requires a bit more work. Separate patch(es) will be sent out to deal with that problem. Fix up conflicts with f5b43e95 (libxl: fix "xl mem-set" regression from 0c029c4da2). Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index d86ea62..cfc2623 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4742,16 +4742,11 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); + xc_domaininfo_t info; libxl_dominfo ptr; char *uuid; xs_transaction_t t; - libxl_dominfo_init(&ptr); - if (libxl_domain_info(ctx, &ptr, domid) < 0) - goto out_no_transaction; - - uuid = libxl__uuid2string(gc, ptr.uuid); - retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4827,12 +4822,13 @@ retry_transaction: } if (enforce) { - memorykb = ptr.max_memkb - current_target_memkb + new_target_memkb; - rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb); + memorykb = new_target_memkb + videoram; + rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb + + LIBXL_MAXMEM_CONSTANT); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_setmaxmem domid=%u memkb=%"PRIu64" failed " - "rc=%d\n", domid, memorykb, rc); + "rc=%d\n", domid, memorykb + LIBXL_MAXMEM_CONSTANT, rc); abort_transaction = 1; goto out; } @@ -4851,9 +4847,18 @@ retry_transaction: libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/memory/target", dompath), "%"PRIu32, new_target_memkb); + rc = xc_domain_getinfolist(ctx->xch, domid, 1, &info); + if (rc != 1 || info.domain != domid) { + abort_transaction = 1; + goto out; + } + libxl_dominfo_init(&ptr); + xcinfo2xlinfo(ctx, &info, &ptr); + uuid = libxl__uuid2string(gc, ptr.uuid); libxl__xs_write(gc, t, libxl__sprintf(gc, "/vm/%s/memory", uuid), "%"PRIu32, new_target_memkb / 1024); + libxl_dominfo_dispose(&ptr); out: if (!xs_transaction_end(ctx->xsh, t, abort_transaction) @@ -4862,7 +4867,6 @@ out: goto retry_transaction; out_no_transaction: - libxl_dominfo_dispose(&ptr); GC_FREE; 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 Jun 27 17:01:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tU9-0000gP-Qz; Sat, 27 Jun 2015 17:01:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tU8-0000gF-Ru for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:45 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id CF/91-06739-8F6DE855; Sat, 27 Jun 2015 17:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1435424502!27191939!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24309 invoked from network); 27 Jun 2015 17:01:42 -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; 27 Jun 2015 17:01:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tU5-0007MQ-Ra for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tU5-0000C5-Px for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:41 +0000 Date: Sat, 27 Jun 2015 17:01:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] NetBSDRump: provide evtchn.h and privcmd.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 d2de2a1a5c3d546ab8dcc807a5bb6f507e3ebff0 Author: Wei Liu AuthorDate: Wed Jun 24 11:10:09 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 12:10:01 2015 +0100 NetBSDRump: provide evtchn.h and privcmd.h Xen's build system has a target for rump kernel called NetBSDRump. We want to build libxc against rump kernel, so we need to copy NetBSD's evtchn.h and privcmd.h to NetBSDRump. These copies is not very likely to diverge from NetBSD's copies, but we don't preclude such possibility. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/include/xen-sys/NetBSDRump/evtchn.h | 86 ++++++++++++++++++++++++++++ tools/include/xen-sys/NetBSDRump/privcmd.h | 81 +++++++++++++++++++++++++- 2 files changed, 164 insertions(+), 3 deletions(-) diff --git a/tools/include/xen-sys/NetBSDRump/evtchn.h b/tools/include/xen-sys/NetBSDRump/evtchn.h new file mode 100644 index 0000000..2d8a1f9 --- /dev/null +++ b/tools/include/xen-sys/NetBSDRump/evtchn.h @@ -0,0 +1,86 @@ +/* $NetBSD: evtchn.h,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $ */ +/****************************************************************************** + * evtchn.h + * + * Interface to /dev/xen/evtchn. + * + * Copyright (c) 2003-2005, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __NetBSD_EVTCHN_H__ +#define __NetBSD_EVTCHN_H__ + +/* + * Bind a fresh port to VIRQ @virq. + */ +#define IOCTL_EVTCHN_BIND_VIRQ \ + _IOWR('E', 4, struct ioctl_evtchn_bind_virq) +struct ioctl_evtchn_bind_virq { + unsigned int virq; + unsigned int port; +}; + +/* + * Bind a fresh port to remote <@remote_domain, @remote_port>. + */ +#define IOCTL_EVTCHN_BIND_INTERDOMAIN \ + _IOWR('E', 5, struct ioctl_evtchn_bind_interdomain) +struct ioctl_evtchn_bind_interdomain { + unsigned int remote_domain, remote_port; + unsigned int port; +}; + +/* + * Allocate a fresh port for binding to @remote_domain. + */ +#define IOCTL_EVTCHN_BIND_UNBOUND_PORT \ + _IOWR('E', 6, struct ioctl_evtchn_bind_unbound_port) +struct ioctl_evtchn_bind_unbound_port { + unsigned int remote_domain; + unsigned int port; +}; + +/* + * Unbind previously allocated @port. + */ +#define IOCTL_EVTCHN_UNBIND \ + _IOW('E', 7, struct ioctl_evtchn_unbind) +struct ioctl_evtchn_unbind { + unsigned int port; +}; + +/* + * Send event to previously allocated @port. + */ +#define IOCTL_EVTCHN_NOTIFY \ + _IOW('E', 8, struct ioctl_evtchn_notify) +struct ioctl_evtchn_notify { + unsigned int port; +}; + +/* Clear and reinitialise the event buffer. Clear error condition. */ +#define IOCTL_EVTCHN_RESET \ + _IO('E', 9) + +#endif /* __NetBSD_EVTCHN_H__ */ diff --git a/tools/include/xen-sys/NetBSDRump/privcmd.h b/tools/include/xen-sys/NetBSDRump/privcmd.h index efdcae9..1296b30 100644 --- a/tools/include/xen-sys/NetBSDRump/privcmd.h +++ b/tools/include/xen-sys/NetBSDRump/privcmd.h @@ -1,6 +1,36 @@ +/* NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $ */ -#ifndef __NetBSDRump_PRIVCMD_H__ -#define __NetBSDRump_PRIVCMD_H__ +/****************************************************************************** + * privcmd.h + * + * Copyright (c) 2003-2004, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __NetBSD_PRIVCMD_H__ +#define __NetBSD_PRIVCMD_H__ + +/* Interface to /proc/xen/privcmd */ typedef struct privcmd_hypercall { @@ -28,4 +58,49 @@ typedef struct privcmd_mmapbatch { unsigned long *arr; /* array of mfns - top nibble set on err */ } privcmd_mmapbatch_t; -#endif +typedef struct privcmd_blkmsg +{ + unsigned long op; + void *buf; + int buf_size; +} privcmd_blkmsg_t; + +/* + * @cmd: IOCTL_PRIVCMD_HYPERCALL + * @arg: &privcmd_hypercall_t + * Return: Value returned from execution of the specified hypercall. + */ +#define IOCTL_PRIVCMD_HYPERCALL \ + _IOWR('P', 0, privcmd_hypercall_t) + +#if defined(_KERNEL) +/* compat */ +#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN_OLD \ + _IO('P', 1) +#endif /* defined(_KERNEL) */ + +#define IOCTL_PRIVCMD_MMAP \ + _IOW('P', 2, privcmd_mmap_t) +#define IOCTL_PRIVCMD_MMAPBATCH \ + _IOW('P', 3, privcmd_mmapbatch_t) +#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \ + _IOR('P', 4, unsigned long) + +/* + * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN + * @arg: n/a + * Return: Port associated with domain-controller end of control event channel + * for the initial domain. + */ +#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \ + _IOR('P', 5, int) + +/* Interface to /dev/xenevt */ +/* EVTCHN_RESET: Clear and reinit the event buffer. Clear error condition. */ +#define EVTCHN_RESET _IO('E', 1) +/* EVTCHN_BIND: Bind to the specified event-channel port. */ +#define EVTCHN_BIND _IOW('E', 2, unsigned long) +/* EVTCHN_UNBIND: Unbind from the specified event-channel port. */ +#define EVTCHN_UNBIND _IOW('E', 3, unsigned long) + +#endif /* __NetBSD_PRIVCMD_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 Jun 27 17:01:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tU9-0000gP-Qz; Sat, 27 Jun 2015 17:01:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tU8-0000gF-Ru for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:45 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id CF/91-06739-8F6DE855; Sat, 27 Jun 2015 17:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1435424502!27191939!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24309 invoked from network); 27 Jun 2015 17:01:42 -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; 27 Jun 2015 17:01:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tU5-0007MQ-Ra for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tU5-0000C5-Px for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:41 +0000 Date: Sat, 27 Jun 2015 17:01:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] NetBSDRump: provide evtchn.h and privcmd.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 d2de2a1a5c3d546ab8dcc807a5bb6f507e3ebff0 Author: Wei Liu AuthorDate: Wed Jun 24 11:10:09 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 12:10:01 2015 +0100 NetBSDRump: provide evtchn.h and privcmd.h Xen's build system has a target for rump kernel called NetBSDRump. We want to build libxc against rump kernel, so we need to copy NetBSD's evtchn.h and privcmd.h to NetBSDRump. These copies is not very likely to diverge from NetBSD's copies, but we don't preclude such possibility. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/include/xen-sys/NetBSDRump/evtchn.h | 86 ++++++++++++++++++++++++++++ tools/include/xen-sys/NetBSDRump/privcmd.h | 81 +++++++++++++++++++++++++- 2 files changed, 164 insertions(+), 3 deletions(-) diff --git a/tools/include/xen-sys/NetBSDRump/evtchn.h b/tools/include/xen-sys/NetBSDRump/evtchn.h new file mode 100644 index 0000000..2d8a1f9 --- /dev/null +++ b/tools/include/xen-sys/NetBSDRump/evtchn.h @@ -0,0 +1,86 @@ +/* $NetBSD: evtchn.h,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $ */ +/****************************************************************************** + * evtchn.h + * + * Interface to /dev/xen/evtchn. + * + * Copyright (c) 2003-2005, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __NetBSD_EVTCHN_H__ +#define __NetBSD_EVTCHN_H__ + +/* + * Bind a fresh port to VIRQ @virq. + */ +#define IOCTL_EVTCHN_BIND_VIRQ \ + _IOWR('E', 4, struct ioctl_evtchn_bind_virq) +struct ioctl_evtchn_bind_virq { + unsigned int virq; + unsigned int port; +}; + +/* + * Bind a fresh port to remote <@remote_domain, @remote_port>. + */ +#define IOCTL_EVTCHN_BIND_INTERDOMAIN \ + _IOWR('E', 5, struct ioctl_evtchn_bind_interdomain) +struct ioctl_evtchn_bind_interdomain { + unsigned int remote_domain, remote_port; + unsigned int port; +}; + +/* + * Allocate a fresh port for binding to @remote_domain. + */ +#define IOCTL_EVTCHN_BIND_UNBOUND_PORT \ + _IOWR('E', 6, struct ioctl_evtchn_bind_unbound_port) +struct ioctl_evtchn_bind_unbound_port { + unsigned int remote_domain; + unsigned int port; +}; + +/* + * Unbind previously allocated @port. + */ +#define IOCTL_EVTCHN_UNBIND \ + _IOW('E', 7, struct ioctl_evtchn_unbind) +struct ioctl_evtchn_unbind { + unsigned int port; +}; + +/* + * Send event to previously allocated @port. + */ +#define IOCTL_EVTCHN_NOTIFY \ + _IOW('E', 8, struct ioctl_evtchn_notify) +struct ioctl_evtchn_notify { + unsigned int port; +}; + +/* Clear and reinitialise the event buffer. Clear error condition. */ +#define IOCTL_EVTCHN_RESET \ + _IO('E', 9) + +#endif /* __NetBSD_EVTCHN_H__ */ diff --git a/tools/include/xen-sys/NetBSDRump/privcmd.h b/tools/include/xen-sys/NetBSDRump/privcmd.h index efdcae9..1296b30 100644 --- a/tools/include/xen-sys/NetBSDRump/privcmd.h +++ b/tools/include/xen-sys/NetBSDRump/privcmd.h @@ -1,6 +1,36 @@ +/* NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $ */ -#ifndef __NetBSDRump_PRIVCMD_H__ -#define __NetBSDRump_PRIVCMD_H__ +/****************************************************************************** + * privcmd.h + * + * Copyright (c) 2003-2004, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __NetBSD_PRIVCMD_H__ +#define __NetBSD_PRIVCMD_H__ + +/* Interface to /proc/xen/privcmd */ typedef struct privcmd_hypercall { @@ -28,4 +58,49 @@ typedef struct privcmd_mmapbatch { unsigned long *arr; /* array of mfns - top nibble set on err */ } privcmd_mmapbatch_t; -#endif +typedef struct privcmd_blkmsg +{ + unsigned long op; + void *buf; + int buf_size; +} privcmd_blkmsg_t; + +/* + * @cmd: IOCTL_PRIVCMD_HYPERCALL + * @arg: &privcmd_hypercall_t + * Return: Value returned from execution of the specified hypercall. + */ +#define IOCTL_PRIVCMD_HYPERCALL \ + _IOWR('P', 0, privcmd_hypercall_t) + +#if defined(_KERNEL) +/* compat */ +#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN_OLD \ + _IO('P', 1) +#endif /* defined(_KERNEL) */ + +#define IOCTL_PRIVCMD_MMAP \ + _IOW('P', 2, privcmd_mmap_t) +#define IOCTL_PRIVCMD_MMAPBATCH \ + _IOW('P', 3, privcmd_mmapbatch_t) +#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \ + _IOR('P', 4, unsigned long) + +/* + * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN + * @arg: n/a + * Return: Port associated with domain-controller end of control event channel + * for the initial domain. + */ +#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \ + _IOR('P', 5, int) + +/* Interface to /dev/xenevt */ +/* EVTCHN_RESET: Clear and reinit the event buffer. Clear error condition. */ +#define EVTCHN_RESET _IO('E', 1) +/* EVTCHN_BIND: Bind to the specified event-channel port. */ +#define EVTCHN_BIND _IOW('E', 2, unsigned long) +/* EVTCHN_UNBIND: Unbind from the specified event-channel port. */ +#define EVTCHN_UNBIND _IOW('E', 3, unsigned long) + +#endif /* __NetBSD_PRIVCMD_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 Jun 27 17:01:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tUI-0000hw-TV; Sat, 27 Jun 2015 17:01:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUI-0000hj-6U for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:54 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 25/E7-21074-107DE855; Sat, 27 Jun 2015 17:01:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435424512!12018595!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22681 invoked from network); 27 Jun 2015 17:01:52 -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; 27 Jun 2015 17:01:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUF-0007Mf-Vc for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUF-0000CX-UP for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:51 +0000 Date: Sat, 27 Jun 2015 17:01:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_netbsd.c for rump kernel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12b46b0a41b6293c171f95d591583da062650e8c Author: Wei Liu AuthorDate: Wed Jun 24 11:10:10 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 12:10:01 2015 +0100 libxc: use xc_netbsd.c for rump kernel Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 55782c8..153b79e 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -48,6 +48,7 @@ CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c xc_linux_osdep.c CTRL_SRCS-$(CONFIG_FreeBSD) += xc_freebsd.c xc_freebsd_osdep.c CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c CTRL_SRCS-$(CONFIG_NetBSD) += xc_netbsd.c +CTRL_SRCS-$(CONFIG_NetBSDRump) += xc_netbsd.c CTRL_SRCS-$(CONFIG_MiniOS) += xc_minios.c GUEST_SRCS-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 Jun 27 17:01:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:01: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 1Z8tUI-0000hw-TV; Sat, 27 Jun 2015 17:01:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUI-0000hj-6U for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:54 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 25/E7-21074-107DE855; Sat, 27 Jun 2015 17:01:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435424512!12018595!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22681 invoked from network); 27 Jun 2015 17:01:52 -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; 27 Jun 2015 17:01:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUF-0007Mf-Vc for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUF-0000CX-UP for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:01:51 +0000 Date: Sat, 27 Jun 2015 17:01:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_netbsd.c for rump kernel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12b46b0a41b6293c171f95d591583da062650e8c Author: Wei Liu AuthorDate: Wed Jun 24 11:10:10 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 12:10:01 2015 +0100 libxc: use xc_netbsd.c for rump kernel Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 55782c8..153b79e 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -48,6 +48,7 @@ CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c xc_linux_osdep.c CTRL_SRCS-$(CONFIG_FreeBSD) += xc_freebsd.c xc_freebsd_osdep.c CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c CTRL_SRCS-$(CONFIG_NetBSD) += xc_netbsd.c +CTRL_SRCS-$(CONFIG_NetBSDRump) += xc_netbsd.c CTRL_SRCS-$(CONFIG_MiniOS) += xc_minios.c GUEST_SRCS-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 Jun 27 17:02:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02: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 1Z8tUY-0000ju-0H; Sat, 27 Jun 2015 17:02:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUW-0000jb-9w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:08 +0000 Content-Length: 6409 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B2/25-27764-F07DE855; Sat, 27 Jun 2015 17:02:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435424525!27227597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20639 invoked from network); 27 Jun 2015 17:02:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:02:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUQ-0007NJ-7D for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUQ-0000Dm-42 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:02 +0000 Date: Sat, 27 Jun 2015 17:02:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen{trace/analyze}: don't use 64bit versions of libc 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: multipart/mixed; boundary="===============5803786467925137129==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5803786467925137129== Content-Length: 6152 Content-Transfer-Encoding: quoted-printable commit 8c21339be42352c2ecd5da49cf3ed4b50279a647 Author: Roger Pau Monne AuthorDate: Fri Jun 19 10:58:24 2015 +0200 Commit: Ian Campbell CommitDate: Thu Jun 25 12:12:21 2015 +0100 xen{trace/analyze}: don't use 64bit versions of libc functions This is not needed, neither encouraged. Configure already checks _FILE_OFFSET_BITS and appends it when needed, so that the right functions are used. Also remove the usage of loff_t and O_LARGEFILE for the same reason. Signed-off-by: Roger Pau Monn=C3=A9 Cc: George Dunlap Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Cc: Olaf Hering Acked-by: Wei Liu Acked-by: George Dunlap --- tools/xentrace/mread.c | 8 ++++---- tools/xentrace/mread.h | 6 +++--- tools/xentrace/xenalyze.c | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/xentrace/mread.c b/tools/xentrace/mread.c index a63d16c..a22c4ea 100644 --- a/tools/xentrace/mread.c +++ b/tools/xentrace/mread.c @@ -9,7 +9,7 @@ mread_handle_t mread_init(int fd) { - struct stat64 s; + struct stat s; mread_handle_t h; h=3Dmalloc(sizeof(struct mread_ctrl)); @@ -24,13 +24,13 @@ mread_handle_t mread_init(int fd) h->fd =3D fd; - fstat64(fd, &s); + fstat(fd, &s); h->file_size =3D s.st_size; return h; } -ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, loff_t offset) +ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, off_t offset) { /* Idea: have a "cache" of N mmaped regions. If the offset is * in one of the regions, just copy it. If not, evict one of the @@ -45,7 +45,7 @@ ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, loff_t offset) */ char * b=3DNULL; int bind=3D-1; - loff_t boffset=3D0; + off_t boffset=3D0; ssize_t bsize; #define dprintf(x...) diff --git a/tools/xentrace/mread.h b/tools/xentrace/mread.h index 8df41a8..443814f 100644 --- a/tools/xentrace/mread.h +++ b/tools/xentrace/mread.h @@ -5,14 +5,14 @@ #define MREAD_BUF_MASK (~(MREAD_BUF_SIZE-1)) typedef struct mread_ctrl { int fd; - loff_t file_size; + off_t file_size; struct mread_buffer { char * buffer; - loff_t start_offset; + off_t start_offset; int accessed; } map[MREAD_MAPS]; int clock, last; } *mread_handle_t; mread_handle_t mread_init(int fd); -ssize_t mread64(mread_handle_t h, void *dst, ssize_t len, loff_t offset); +ssize_t mread64(mread_handle_t h, void *dst, ssize_t len, off_t offset); diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index a8e73eb..dc89ffe 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -70,9 +70,9 @@ struct { char * symbol_file; char * trace_file; int output_defined; - loff_t file_size; + off_t file_size; struct { - loff_t update_offset; + off_t update_offset; int pipe[2]; FILE* out; int pid; @@ -1853,8 +1853,8 @@ struct pcpu_info { /* Information related to scanning thru the file */ tsc_t first_tsc, last_tsc, order_tsc; - loff_t file_offset; - loff_t next_cpu_change_offset; + off_t file_offset; + off_t next_cpu_change_offset; struct record_info ri; int last_cpu_change_pid; int power_state; @@ -1898,7 +1898,7 @@ void __fill_in_record_info(struct pcpu_info *p); struct { int max_active_pcpu; - loff_t last_epoch_offset; + off_t last_epoch_offset; int early_eof; int lost_cpus; tsc_t now; @@ -1937,7 +1937,7 @@ char * pcpu_string(int pcpu); void pcpu_string_draw(struct pcpu_info *p); void process_generic(struct record_info *ri); void dump_generic(FILE *f, struct record_info *ri); -ssize_t __read_record(struct trace_record *rec, loff_t offset); +ssize_t __read_record(struct trace_record *rec, off_t offset); void error(enum error_level l, struct record_info *ri); void update_io_address(struct io_address ** list, unsigned int pa, int dir, tsc_t arc_cycles, unsigned int va); @@ -8512,7 +8512,7 @@ void activate_early_eof(void) { } } -loff_t scan_for_new_pcpu(loff_t offset) { +off_t scan_for_new_pcpu(off_t offset) { ssize_t r; struct trace_record rec; struct cpu_change_data *cd; @@ -9051,7 +9051,7 @@ void progress_init(void) { } -void progress_update(loff_t offset) { +void progress_update(off_t offset) { long long p; p =3D ( offset * 100 ) / G.file_size; @@ -9089,7 +9089,7 @@ void progress_finish(void) { } } -ssize_t __read_record(struct trace_record *rec, loff_t offset) +ssize_t __read_record(struct trace_record *rec, off_t offset) { ssize_t r, rsize; @@ -9172,7 +9172,7 @@ void __fill_in_record_info(struct pcpu_info *p) } ssize_t read_record(struct pcpu_info * p) { - loff_t * offset; + off_t * offset; struct record_info *ri; offset =3D &p->file_offset; @@ -9489,7 +9489,7 @@ void report_pcpu(void) { void init_pcpus(void) { int i=3D0; - loff_t offset =3D 0; + off_t offset =3D 0; for(i=3D0; i Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02: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 1Z8tUY-0000ju-0H; Sat, 27 Jun 2015 17:02:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUW-0000jb-9w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:08 +0000 Content-Length: 6409 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B2/25-27764-F07DE855; Sat, 27 Jun 2015 17:02:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435424525!27227597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20639 invoked from network); 27 Jun 2015 17:02:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:02:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUQ-0007NJ-7D for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUQ-0000Dm-42 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:02 +0000 Date: Sat, 27 Jun 2015 17:02:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen{trace/analyze}: don't use 64bit versions of libc 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: multipart/mixed; boundary="===============5803786467925137129==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5803786467925137129== Content-Length: 6152 Content-Transfer-Encoding: quoted-printable commit 8c21339be42352c2ecd5da49cf3ed4b50279a647 Author: Roger Pau Monne AuthorDate: Fri Jun 19 10:58:24 2015 +0200 Commit: Ian Campbell CommitDate: Thu Jun 25 12:12:21 2015 +0100 xen{trace/analyze}: don't use 64bit versions of libc functions This is not needed, neither encouraged. Configure already checks _FILE_OFFSET_BITS and appends it when needed, so that the right functions are used. Also remove the usage of loff_t and O_LARGEFILE for the same reason. Signed-off-by: Roger Pau Monn=C3=A9 Cc: George Dunlap Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Cc: Olaf Hering Acked-by: Wei Liu Acked-by: George Dunlap --- tools/xentrace/mread.c | 8 ++++---- tools/xentrace/mread.h | 6 +++--- tools/xentrace/xenalyze.c | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/xentrace/mread.c b/tools/xentrace/mread.c index a63d16c..a22c4ea 100644 --- a/tools/xentrace/mread.c +++ b/tools/xentrace/mread.c @@ -9,7 +9,7 @@ mread_handle_t mread_init(int fd) { - struct stat64 s; + struct stat s; mread_handle_t h; h=3Dmalloc(sizeof(struct mread_ctrl)); @@ -24,13 +24,13 @@ mread_handle_t mread_init(int fd) h->fd =3D fd; - fstat64(fd, &s); + fstat(fd, &s); h->file_size =3D s.st_size; return h; } -ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, loff_t offset) +ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, off_t offset) { /* Idea: have a "cache" of N mmaped regions. If the offset is * in one of the regions, just copy it. If not, evict one of the @@ -45,7 +45,7 @@ ssize_t mread64(mread_handle_t h, void *rec, ssize_t len, loff_t offset) */ char * b=3DNULL; int bind=3D-1; - loff_t boffset=3D0; + off_t boffset=3D0; ssize_t bsize; #define dprintf(x...) diff --git a/tools/xentrace/mread.h b/tools/xentrace/mread.h index 8df41a8..443814f 100644 --- a/tools/xentrace/mread.h +++ b/tools/xentrace/mread.h @@ -5,14 +5,14 @@ #define MREAD_BUF_MASK (~(MREAD_BUF_SIZE-1)) typedef struct mread_ctrl { int fd; - loff_t file_size; + off_t file_size; struct mread_buffer { char * buffer; - loff_t start_offset; + off_t start_offset; int accessed; } map[MREAD_MAPS]; int clock, last; } *mread_handle_t; mread_handle_t mread_init(int fd); -ssize_t mread64(mread_handle_t h, void *dst, ssize_t len, loff_t offset); +ssize_t mread64(mread_handle_t h, void *dst, ssize_t len, off_t offset); diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index a8e73eb..dc89ffe 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -70,9 +70,9 @@ struct { char * symbol_file; char * trace_file; int output_defined; - loff_t file_size; + off_t file_size; struct { - loff_t update_offset; + off_t update_offset; int pipe[2]; FILE* out; int pid; @@ -1853,8 +1853,8 @@ struct pcpu_info { /* Information related to scanning thru the file */ tsc_t first_tsc, last_tsc, order_tsc; - loff_t file_offset; - loff_t next_cpu_change_offset; + off_t file_offset; + off_t next_cpu_change_offset; struct record_info ri; int last_cpu_change_pid; int power_state; @@ -1898,7 +1898,7 @@ void __fill_in_record_info(struct pcpu_info *p); struct { int max_active_pcpu; - loff_t last_epoch_offset; + off_t last_epoch_offset; int early_eof; int lost_cpus; tsc_t now; @@ -1937,7 +1937,7 @@ char * pcpu_string(int pcpu); void pcpu_string_draw(struct pcpu_info *p); void process_generic(struct record_info *ri); void dump_generic(FILE *f, struct record_info *ri); -ssize_t __read_record(struct trace_record *rec, loff_t offset); +ssize_t __read_record(struct trace_record *rec, off_t offset); void error(enum error_level l, struct record_info *ri); void update_io_address(struct io_address ** list, unsigned int pa, int dir, tsc_t arc_cycles, unsigned int va); @@ -8512,7 +8512,7 @@ void activate_early_eof(void) { } } -loff_t scan_for_new_pcpu(loff_t offset) { +off_t scan_for_new_pcpu(off_t offset) { ssize_t r; struct trace_record rec; struct cpu_change_data *cd; @@ -9051,7 +9051,7 @@ void progress_init(void) { } -void progress_update(loff_t offset) { +void progress_update(off_t offset) { long long p; p =3D ( offset * 100 ) / G.file_size; @@ -9089,7 +9089,7 @@ void progress_finish(void) { } } -ssize_t __read_record(struct trace_record *rec, loff_t offset) +ssize_t __read_record(struct trace_record *rec, off_t offset) { ssize_t r, rsize; @@ -9172,7 +9172,7 @@ void __fill_in_record_info(struct pcpu_info *p) } ssize_t read_record(struct pcpu_info * p) { - loff_t * offset; + off_t * offset; struct record_info *ri; offset =3D &p->file_offset; @@ -9489,7 +9489,7 @@ void report_pcpu(void) { void init_pcpus(void) { int i=3D0; - loff_t offset =3D 0; + off_t offset =3D 0; for(i=3D0; i Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUh-0000lF-2r; Sat, 27 Jun 2015 17:02:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUg-0000l5-2u for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:18 +0000 Content-Length: 4702 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 01/99-30658-917DE855; Sat, 27 Jun 2015 17:02:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1435424535!27207336!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12036 invoked from network); 27 Jun 2015 17:02:16 -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; 27 Jun 2015 17:02:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUd-0007NR-Oc for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUd-0000EE-NM for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:15 +0000 Date: Sat, 27 Jun 2015 17:02:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: check for argp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3085328145881419824==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3085328145881419824== Content-Length: 4389 Content-Transfer-Encoding: quoted-printable commit 4b950fbb2a86573076f9f9ae7a73632be1c2bfed Author: Roger Pau Monne AuthorDate: Fri Jun 19 10:58:25 2015 +0200 Commit: Ian Campbell CommitDate: Thu Jun 25 12:12:38 2015 +0100 configure: check for argp argp is only present in the GNU C library, so add a specific check for it in configure. Also check if -largp is needed for linking against it. Please run autoconf after applying. Signed-off-by: Roger Pau Monn=C3=A9 Cc: George Dunlap Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Cc: Olaf Hering Acked-by: Wei Liu Acked-by: George Dunlap [ ijc -- ran autogen.sh ] --- config/Tools.mk.in | 1 + tools/configure | 51 +++++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 4 +++ tools/xentrace/Makefile | 2 +- 4 files changed, 57 insertions(+), 1 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index aef9ed6..9bd5f6c 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -78,5 +78,6 @@ CONFIG_GCRYPT :=3D @libgcrypt@ EXTFS_LIBS :=3D @EXTFS_LIBS@ CURSES_LIBS :=3D @CURSES_LIBS@ TINFO_LIBS :=3D @TINFO_LIBS@ +ARGP_LDFLAGS :=3D @argp_ldflags@ FILE_OFFSET_BITS :=3D @FILE_OFFSET_BITS@ diff --git a/tools/configure b/tools/configure index 9e87e90..c940dd1 100755 --- a/tools/configure +++ b/tools/configure @@ -632,6 +632,7 @@ systemd remus_netbuf LIBNL3_LIBS LIBNL3_CFLAGS +argp_ldflags libiconv PTYFUNCS_LIBS PTHREAD_LIBS @@ -8793,6 +8794,56 @@ else fi +ac_fn_c_check_header_mongrel "$LINENO" "argp.h" "ac_cv_header_argp_h" "$ac_includes_default" +if test "x$ac_cv_header_argp_h" =3D xyes; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for argp_usage in -largp" >&5 +$as_echo_n "checking for argp_usage in -largp... " >&6; } +if ${ac_cv_lib_argp_argp_usage+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=3D$LIBS +LIBS=3D"-largp $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char argp_usage (); +int +main () +{ +return argp_usage (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_argp_argp_usage=3Dyes +else + ac_cv_lib_argp_argp_usage=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=3D$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_argp_argp_usage" >&5 +$as_echo "$ac_cv_lib_argp_argp_usage" >&6; } +if test "x$ac_cv_lib_argp_argp_usage" =3D xyes; then : + argp_ldflags=3D"-largp" +fi + + +else + as_fn_error $=3F "Could not find argp" "$LINENO" 5 +fi + + + # FDT is needed only on ARM case "$host_cpu" in diff --git a/tools/configure.ac b/tools/configure.ac index 2886cb5..2d371f4 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -356,6 +356,10 @@ AC_CHECK_LIB([yajl], [yajl_alloc], [], AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) AC_CHECK_LIB([iconv], [libiconv_open], [libiconv=3D"y"], [libiconv=3D"n"]) AC_SUBST(libiconv) +AC_CHECK_HEADER([argp.h], [ +AC_CHECK_LIB([argp], [argp_usage], [argp_ldflags=3D"-largp"]) +], [AC_MSG_ERROR([Could not find argp])]) +AC_SUBST(argp_ldflags) # FDT is needed only on ARM case "$host_cpu" in diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 7d874a3..2f57bda 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenctrl) -LDLIBS +=3D $(LDLIBS_libxenctrl) +LDLIBS +=3D $(LDLIBS_libxenctrl) $(ARGP_LDFLAGS) BIN-$(CONFIG_X86) =3D xenalyze BIN =3D $(BIN-y) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3085328145881419824== 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 --===============3085328145881419824==-- From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:02:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUh-0000lF-2r; Sat, 27 Jun 2015 17:02:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUg-0000l5-2u for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:18 +0000 Content-Length: 4702 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 01/99-30658-917DE855; Sat, 27 Jun 2015 17:02:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1435424535!27207336!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12036 invoked from network); 27 Jun 2015 17:02:16 -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; 27 Jun 2015 17:02:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUd-0007NR-Oc for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUd-0000EE-NM for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:15 +0000 Date: Sat, 27 Jun 2015 17:02:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: check for argp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3085328145881419824==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3085328145881419824== Content-Length: 4389 Content-Transfer-Encoding: quoted-printable commit 4b950fbb2a86573076f9f9ae7a73632be1c2bfed Author: Roger Pau Monne AuthorDate: Fri Jun 19 10:58:25 2015 +0200 Commit: Ian Campbell CommitDate: Thu Jun 25 12:12:38 2015 +0100 configure: check for argp argp is only present in the GNU C library, so add a specific check for it in configure. Also check if -largp is needed for linking against it. Please run autoconf after applying. Signed-off-by: Roger Pau Monn=C3=A9 Cc: George Dunlap Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Cc: Olaf Hering Acked-by: Wei Liu Acked-by: George Dunlap [ ijc -- ran autogen.sh ] --- config/Tools.mk.in | 1 + tools/configure | 51 +++++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 4 +++ tools/xentrace/Makefile | 2 +- 4 files changed, 57 insertions(+), 1 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index aef9ed6..9bd5f6c 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -78,5 +78,6 @@ CONFIG_GCRYPT :=3D @libgcrypt@ EXTFS_LIBS :=3D @EXTFS_LIBS@ CURSES_LIBS :=3D @CURSES_LIBS@ TINFO_LIBS :=3D @TINFO_LIBS@ +ARGP_LDFLAGS :=3D @argp_ldflags@ FILE_OFFSET_BITS :=3D @FILE_OFFSET_BITS@ diff --git a/tools/configure b/tools/configure index 9e87e90..c940dd1 100755 --- a/tools/configure +++ b/tools/configure @@ -632,6 +632,7 @@ systemd remus_netbuf LIBNL3_LIBS LIBNL3_CFLAGS +argp_ldflags libiconv PTYFUNCS_LIBS PTHREAD_LIBS @@ -8793,6 +8794,56 @@ else fi +ac_fn_c_check_header_mongrel "$LINENO" "argp.h" "ac_cv_header_argp_h" "$ac_includes_default" +if test "x$ac_cv_header_argp_h" =3D xyes; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for argp_usage in -largp" >&5 +$as_echo_n "checking for argp_usage in -largp... " >&6; } +if ${ac_cv_lib_argp_argp_usage+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=3D$LIBS +LIBS=3D"-largp $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char argp_usage (); +int +main () +{ +return argp_usage (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_argp_argp_usage=3Dyes +else + ac_cv_lib_argp_argp_usage=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=3D$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_argp_argp_usage" >&5 +$as_echo "$ac_cv_lib_argp_argp_usage" >&6; } +if test "x$ac_cv_lib_argp_argp_usage" =3D xyes; then : + argp_ldflags=3D"-largp" +fi + + +else + as_fn_error $=3F "Could not find argp" "$LINENO" 5 +fi + + + # FDT is needed only on ARM case "$host_cpu" in diff --git a/tools/configure.ac b/tools/configure.ac index 2886cb5..2d371f4 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -356,6 +356,10 @@ AC_CHECK_LIB([yajl], [yajl_alloc], [], AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) AC_CHECK_LIB([iconv], [libiconv_open], [libiconv=3D"y"], [libiconv=3D"n"]) AC_SUBST(libiconv) +AC_CHECK_HEADER([argp.h], [ +AC_CHECK_LIB([argp], [argp_usage], [argp_ldflags=3D"-largp"]) +], [AC_MSG_ERROR([Could not find argp])]) +AC_SUBST(argp_ldflags) # FDT is needed only on ARM case "$host_cpu" in diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 7d874a3..2f57bda 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenctrl) -LDLIBS +=3D $(LDLIBS_libxenctrl) +LDLIBS +=3D $(LDLIBS_libxenctrl) $(ARGP_LDFLAGS) BIN-$(CONFIG_X86) =3D xenalyze BIN =3D $(BIN-y) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3085328145881419824== 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 --===============3085328145881419824==-- From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:02:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02: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 1Z8tUs-0000my-7S; Sat, 27 Jun 2015 17:02:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUq-0000mn-KX for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:28 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 67/05-00727-327DE855; Sat, 27 Jun 2015 17:02:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435424546!15973971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26544 invoked from network); 27 Jun 2015 17:02:27 -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; 27 Jun 2015 17:02:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUn-0007NZ-UO for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUn-0000Ec-Sa for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:25 +0000 Date: Sat, 27 Jun 2015 17:02:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: delete sent_last_iter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 15d248048e1baf3efcb437156d1529ad5595013c Author: Wei Liu AuthorDate: Thu Jun 18 17:37:37 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 13:01:22 2015 +0100 libxc: delete sent_last_iter It's set in code but never used. Detected by -Wunused-but-set-variable. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/xc_domain_save.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 301e770..3222473 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -811,7 +811,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter int live = (flags & XCFLAGS_LIVE); int debug = (flags & XCFLAGS_DEBUG); int superpages = !!hvm; - int race = 0, sent_last_iter, skip_this_iter = 0; + int race = 0, skip_this_iter = 0; unsigned int sent_this_iter = 0; int tmem_saved = 0; @@ -1014,9 +1014,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter last_iter = !live; - /* pretend we sent all the pages last iteration */ - sent_last_iter = dinfo->p2m_size; - /* Setup to_send / to_fix and to_skip bitmaps */ to_send = xc_hypercall_buffer_alloc_pages(xch, to_send, NRPAGES(bitmap_size(dinfo->p2m_size))); to_skip = xc_hypercall_buffer_alloc_pages(xch, to_skip, NRPAGES(bitmap_size(dinfo->p2m_size))); @@ -1586,8 +1583,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter goto out; } - sent_last_iter = sent_this_iter; - print_stats(xch, dom, sent_this_iter, &time_stats, &shadow_stats, 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 Jun 27 17:02:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02: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 1Z8tUs-0000my-7S; Sat, 27 Jun 2015 17:02:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUq-0000mn-KX for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:28 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 67/05-00727-327DE855; Sat, 27 Jun 2015 17:02:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435424546!15973971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26544 invoked from network); 27 Jun 2015 17:02:27 -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; 27 Jun 2015 17:02:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUn-0007NZ-UO for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUn-0000Ec-Sa for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:25 +0000 Date: Sat, 27 Jun 2015 17:02:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: delete sent_last_iter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 15d248048e1baf3efcb437156d1529ad5595013c Author: Wei Liu AuthorDate: Thu Jun 18 17:37:37 2015 +0100 Commit: Ian Campbell CommitDate: Thu Jun 25 13:01:22 2015 +0100 libxc: delete sent_last_iter It's set in code but never used. Detected by -Wunused-but-set-variable. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/xc_domain_save.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 301e770..3222473 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -811,7 +811,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter int live = (flags & XCFLAGS_LIVE); int debug = (flags & XCFLAGS_DEBUG); int superpages = !!hvm; - int race = 0, sent_last_iter, skip_this_iter = 0; + int race = 0, skip_this_iter = 0; unsigned int sent_this_iter = 0; int tmem_saved = 0; @@ -1014,9 +1014,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter last_iter = !live; - /* pretend we sent all the pages last iteration */ - sent_last_iter = dinfo->p2m_size; - /* Setup to_send / to_fix and to_skip bitmaps */ to_send = xc_hypercall_buffer_alloc_pages(xch, to_send, NRPAGES(bitmap_size(dinfo->p2m_size))); to_skip = xc_hypercall_buffer_alloc_pages(xch, to_skip, NRPAGES(bitmap_size(dinfo->p2m_size))); @@ -1586,8 +1583,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter goto out; } - sent_last_iter = sent_this_iter; - print_stats(xch, dom, sent_this_iter, &time_stats, &shadow_stats, 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 Jun 27 17:02:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02: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 1Z8tV2-0000oc-9z; Sat, 27 Jun 2015 17:02:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tV0-0000oL-MW for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:38 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id AE/DA-18733-E27DE855; Sat, 27 Jun 2015 17:02:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435424556!15796993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8861 invoked from network); 27 Jun 2015 17:02:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:02:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUy-0007Nj-9k for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUy-0000F7-2H for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:36 +0000 Date: Sat, 27 Jun 2015 17:02:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: special-case DOMID_IDLE handling for %pv X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 319e431e40139e27d871cbe53976b423301a6af0 Author: Andrew Cooper AuthorDate: Thu Jun 25 14:56:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:56:26 2015 +0200 common/vsprintf: special-case DOMID_IDLE handling for %pv Prints IDLEv0 as opposed to d32767v0 Signed-off-by: Andrew Cooper --- xen/common/vsprintf.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 065cc42..51b5e4e 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -336,9 +336,14 @@ static char *pointer(char *str, char *end, const char **fmt_ptr, const struct vcpu *v = arg; ++*fmt_ptr; - if ( str < end ) - *str = 'd'; - str = number(str + 1, end, v->domain->domain_id, 10, -1, -1, 0); + if ( unlikely(v->domain->domain_id == DOMID_IDLE) ) + str = string(str, end, "IDLE", -1, -1, 0); + else + { + if ( str < end ) + *str = 'd'; + str = number(str + 1, end, v->domain->domain_id, 10, -1, -1, 0); + } if ( str < end ) *str = 'v'; return number(str + 1, end, v->vcpu_id, 10, -1, -1, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:02:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02: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 1Z8tV2-0000oc-9z; Sat, 27 Jun 2015 17:02:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tV0-0000oL-MW for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:38 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id AE/DA-18733-E27DE855; Sat, 27 Jun 2015 17:02:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435424556!15796993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8861 invoked from network); 27 Jun 2015 17:02:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:02:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tUy-0007Nj-9k for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tUy-0000F7-2H for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:36 +0000 Date: Sat, 27 Jun 2015 17:02:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: special-case DOMID_IDLE handling for %pv X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 319e431e40139e27d871cbe53976b423301a6af0 Author: Andrew Cooper AuthorDate: Thu Jun 25 14:56:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:56:26 2015 +0200 common/vsprintf: special-case DOMID_IDLE handling for %pv Prints IDLEv0 as opposed to d32767v0 Signed-off-by: Andrew Cooper --- xen/common/vsprintf.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 065cc42..51b5e4e 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -336,9 +336,14 @@ static char *pointer(char *str, char *end, const char **fmt_ptr, const struct vcpu *v = arg; ++*fmt_ptr; - if ( str < end ) - *str = 'd'; - str = number(str + 1, end, v->domain->domain_id, 10, -1, -1, 0); + if ( unlikely(v->domain->domain_id == DOMID_IDLE) ) + str = string(str, end, "IDLE", -1, -1, 0); + else + { + if ( str < end ) + *str = 'd'; + str = number(str + 1, end, v->domain->domain_id, 10, -1, -1, 0); + } if ( str < end ) *str = 'v'; return number(str + 1, end, v->vcpu_id, 10, -1, -1, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:02:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVC-0000qD-CQ; Sat, 27 Jun 2015 17:02:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVA-0000px-PK for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:48 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 7E/5E-16518-737DE855; Sat, 27 Jun 2015 17:02:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435424566!20414304!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15212 invoked from network); 27 Jun 2015 17:02:47 -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; 27 Jun 2015 17:02:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tV8-0007Nr-FZ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tV8-0000Fa-EU for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:46 +0000 Date: Sat, 27 Jun 2015 17:02:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: avoid using current too early on boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 142473cfce41a565898e0fa33dc98a1f5e41abe4 Author: Andrew Cooper AuthorDate: Thu Jun 25 14:57:04 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:57:04 2015 +0200 x86/traps: avoid using current too early on boot Early on boot, current has the sentinel value 0xfffff000. Blindly using it in show_registers() causes a nested failure and no useful information printed from an early crash. Signed-off-by: Andrew Cooper --- xen/arch/x86/x86_64/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 117a133..61bd053 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -86,7 +86,7 @@ void show_registers(const struct cpu_user_regs *regs) struct cpu_user_regs fault_regs = *regs; unsigned long fault_crs[8]; enum context context; - struct vcpu *v = current; + struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; if ( guest_mode(regs) && has_hvm_container_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 Sat Jun 27 17:02:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:02:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVC-0000qD-CQ; Sat, 27 Jun 2015 17:02:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVA-0000px-PK for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:48 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 7E/5E-16518-737DE855; Sat, 27 Jun 2015 17:02:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435424566!20414304!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15212 invoked from network); 27 Jun 2015 17:02:47 -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; 27 Jun 2015 17:02:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tV8-0007Nr-FZ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tV8-0000Fa-EU for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:46 +0000 Date: Sat, 27 Jun 2015 17:02:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: avoid using current too early on boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 142473cfce41a565898e0fa33dc98a1f5e41abe4 Author: Andrew Cooper AuthorDate: Thu Jun 25 14:57:04 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:57:04 2015 +0200 x86/traps: avoid using current too early on boot Early on boot, current has the sentinel value 0xfffff000. Blindly using it in show_registers() causes a nested failure and no useful information printed from an early crash. Signed-off-by: Andrew Cooper --- xen/arch/x86/x86_64/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 117a133..61bd053 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -86,7 +86,7 @@ void show_registers(const struct cpu_user_regs *regs) struct cpu_user_regs fault_regs = *regs; unsigned long fault_crs[8]; enum context context; - struct vcpu *v = current; + struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; if ( guest_mode(regs) && has_hvm_container_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 Sat Jun 27 17:03:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tVM-0000rt-F1; Sat, 27 Jun 2015 17:03:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVL-0000rc-5U for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:59 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 80/50-16813-247DE855; Sat, 27 Jun 2015 17:02:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435424576!27216631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22266 invoked from network); 27 Jun 2015 17:02:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:02:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVI-0007O2-K8 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVI-0000GS-J1 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:56 +0000 Date: Sat, 27 Jun 2015 17:02:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/setup: initialise CR4 before creating idle_vcpu[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 a06ab1e37f43145933b854c0d5ed28ad7183c8aa Author: Andrew Cooper AuthorDate: Thu Jun 25 14:57:31 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:57:31 2015 +0200 x86/setup: initialise CR4 before creating idle_vcpu[0] PV vcpu initialise has CR4 seeded from mmu_cr4_features. Adjust the order of basic CR4 setup and creation of the idle domain, such that idle_vcpu[0] is not wildly different from the other idle vcpus. Signed-off-by: Andrew Cooper --- xen/arch/x86/setup.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c32e49f..ff34670 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1284,20 +1284,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) timer_init(); - init_idle_domain(); - - this_cpu(stubs.addr) = alloc_stub_page(smp_processor_id(), - &this_cpu(stubs).mfn); - BUG_ON(!this_cpu(stubs.addr)); - - trap_init(); - - rcu_init(); - - early_time_init(); - - arch_init_memory(); - identify_cpu(&boot_cpu_data); if ( cpu_has_fxsr ) @@ -1318,6 +1304,20 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( cpu_has_fsgsbase ) set_in_cr4(X86_CR4_FSGSBASE); + init_idle_domain(); + + this_cpu(stubs.addr) = alloc_stub_page(smp_processor_id(), + &this_cpu(stubs).mfn); + BUG_ON(!this_cpu(stubs.addr)); + + trap_init(); + + rcu_init(); + + early_time_init(); + + arch_init_memory(); + alternative_instructions(); local_irq_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 Jun 27 17:03:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tVM-0000rt-F1; Sat, 27 Jun 2015 17:03:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVL-0000rc-5U for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:59 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 80/50-16813-247DE855; Sat, 27 Jun 2015 17:02:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435424576!27216631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22266 invoked from network); 27 Jun 2015 17:02:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Jun 2015 17:02:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVI-0007O2-K8 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVI-0000GS-J1 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:02:56 +0000 Date: Sat, 27 Jun 2015 17:02:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/setup: initialise CR4 before creating idle_vcpu[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 a06ab1e37f43145933b854c0d5ed28ad7183c8aa Author: Andrew Cooper AuthorDate: Thu Jun 25 14:57:31 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:57:31 2015 +0200 x86/setup: initialise CR4 before creating idle_vcpu[0] PV vcpu initialise has CR4 seeded from mmu_cr4_features. Adjust the order of basic CR4 setup and creation of the idle domain, such that idle_vcpu[0] is not wildly different from the other idle vcpus. Signed-off-by: Andrew Cooper --- xen/arch/x86/setup.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c32e49f..ff34670 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1284,20 +1284,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) timer_init(); - init_idle_domain(); - - this_cpu(stubs.addr) = alloc_stub_page(smp_processor_id(), - &this_cpu(stubs).mfn); - BUG_ON(!this_cpu(stubs.addr)); - - trap_init(); - - rcu_init(); - - early_time_init(); - - arch_init_memory(); - identify_cpu(&boot_cpu_data); if ( cpu_has_fxsr ) @@ -1318,6 +1304,20 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( cpu_has_fsgsbase ) set_in_cr4(X86_CR4_FSGSBASE); + init_idle_domain(); + + this_cpu(stubs.addr) = alloc_stub_page(smp_processor_id(), + &this_cpu(stubs).mfn); + BUG_ON(!this_cpu(stubs.addr)); + + trap_init(); + + rcu_init(); + + early_time_init(); + + arch_init_memory(); + alternative_instructions(); local_irq_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 Jun 27 17:03:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVW-0000tc-IL; Sat, 27 Jun 2015 17:03:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVV-0000tL-2z for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:09 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 6B/03-03895-C47DE855; Sat, 27 Jun 2015 17:03:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435424586!20273899!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18540 invoked from network); 27 Jun 2015 17:03:07 -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; 27 Jun 2015 17:03:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVS-0007Od-Pv for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVS-0000H1-O8 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:06 +0000 Date: Sat, 27 Jun 2015 17:03:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: clean up CR4 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 9c9c72c3f71c878c220cbaac54fc18c014ccde3e Author: Andrew Cooper AuthorDate: Thu Jun 25 14:57:58 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:57:58 2015 +0200 x86: clean up CR4 definitions And add PKE as it is architecturally defined now. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/processor.h | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index cb36f0c..2a3b3d9 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -71,24 +71,25 @@ /* * Intel CPU features in CR4 */ -#define X86_CR4_VME 0x0001 /* enable vm86 extensions */ -#define X86_CR4_PVI 0x0002 /* virtual interrupts flag enable */ -#define X86_CR4_TSD 0x0004 /* disable time stamp at ipl 3 */ -#define X86_CR4_DE 0x0008 /* enable debugging extensions */ -#define X86_CR4_PSE 0x0010 /* enable page size extensions */ -#define X86_CR4_PAE 0x0020 /* enable physical address extensions */ -#define X86_CR4_MCE 0x0040 /* Machine check enable */ -#define X86_CR4_PGE 0x0080 /* enable global pages */ -#define X86_CR4_PCE 0x0100 /* enable performance counters at ipl 3 */ -#define X86_CR4_OSFXSR 0x0200 /* enable fast FPU save and restore */ -#define X86_CR4_OSXMMEXCPT 0x0400 /* enable unmasked SSE exceptions */ -#define X86_CR4_VMXE 0x2000 /* enable VMX */ -#define X86_CR4_SMXE 0x4000 /* enable SMX */ -#define X86_CR4_FSGSBASE 0x10000 /* enable {rd,wr}{fs,gs}base */ -#define X86_CR4_PCIDE 0x20000 /* enable PCID */ -#define X86_CR4_OSXSAVE 0x40000 /* enable XSAVE/XRSTOR */ -#define X86_CR4_SMEP 0x100000/* enable SMEP */ -#define X86_CR4_SMAP 0x200000/* enable SMAP */ +#define X86_CR4_VME 0x00000001 /* enable vm86 extensions */ +#define X86_CR4_PVI 0x00000002 /* virtual interrupts flag enable */ +#define X86_CR4_TSD 0x00000004 /* disable time stamp at ipl 3 */ +#define X86_CR4_DE 0x00000008 /* enable debugging extensions */ +#define X86_CR4_PSE 0x00000010 /* enable page size extensions */ +#define X86_CR4_PAE 0x00000020 /* enable physical address extensions */ +#define X86_CR4_MCE 0x00000040 /* Machine check enable */ +#define X86_CR4_PGE 0x00000080 /* enable global pages */ +#define X86_CR4_PCE 0x00000100 /* enable performance counters at ipl 3 */ +#define X86_CR4_OSFXSR 0x00000200 /* enable fast FPU save and restore */ +#define X86_CR4_OSXMMEXCPT 0x00000400 /* enable unmasked SSE exceptions */ +#define X86_CR4_VMXE 0x00002000 /* enable VMX */ +#define X86_CR4_SMXE 0x00004000 /* enable SMX */ +#define X86_CR4_FSGSBASE 0x00010000 /* enable {rd,wr}{fs,gs}base */ +#define X86_CR4_PCIDE 0x00020000 /* enable PCID */ +#define X86_CR4_OSXSAVE 0x00040000 /* enable XSAVE/XRSTOR */ +#define X86_CR4_SMEP 0x00100000 /* enable SMEP */ +#define X86_CR4_SMAP 0x00200000 /* enable SMAP */ +#define X86_CR4_PKE 0x00400000 /* enable PKE */ /* * Trap/fault mnemonics. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:03:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVW-0000tc-IL; Sat, 27 Jun 2015 17:03:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVV-0000tL-2z for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:09 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 6B/03-03895-C47DE855; Sat, 27 Jun 2015 17:03:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435424586!20273899!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18540 invoked from network); 27 Jun 2015 17:03:07 -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; 27 Jun 2015 17:03:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVS-0007Od-Pv for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVS-0000H1-O8 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:06 +0000 Date: Sat, 27 Jun 2015 17:03:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: clean up CR4 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 9c9c72c3f71c878c220cbaac54fc18c014ccde3e Author: Andrew Cooper AuthorDate: Thu Jun 25 14:57:58 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:57:58 2015 +0200 x86: clean up CR4 definitions And add PKE as it is architecturally defined now. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/processor.h | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index cb36f0c..2a3b3d9 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -71,24 +71,25 @@ /* * Intel CPU features in CR4 */ -#define X86_CR4_VME 0x0001 /* enable vm86 extensions */ -#define X86_CR4_PVI 0x0002 /* virtual interrupts flag enable */ -#define X86_CR4_TSD 0x0004 /* disable time stamp at ipl 3 */ -#define X86_CR4_DE 0x0008 /* enable debugging extensions */ -#define X86_CR4_PSE 0x0010 /* enable page size extensions */ -#define X86_CR4_PAE 0x0020 /* enable physical address extensions */ -#define X86_CR4_MCE 0x0040 /* Machine check enable */ -#define X86_CR4_PGE 0x0080 /* enable global pages */ -#define X86_CR4_PCE 0x0100 /* enable performance counters at ipl 3 */ -#define X86_CR4_OSFXSR 0x0200 /* enable fast FPU save and restore */ -#define X86_CR4_OSXMMEXCPT 0x0400 /* enable unmasked SSE exceptions */ -#define X86_CR4_VMXE 0x2000 /* enable VMX */ -#define X86_CR4_SMXE 0x4000 /* enable SMX */ -#define X86_CR4_FSGSBASE 0x10000 /* enable {rd,wr}{fs,gs}base */ -#define X86_CR4_PCIDE 0x20000 /* enable PCID */ -#define X86_CR4_OSXSAVE 0x40000 /* enable XSAVE/XRSTOR */ -#define X86_CR4_SMEP 0x100000/* enable SMEP */ -#define X86_CR4_SMAP 0x200000/* enable SMAP */ +#define X86_CR4_VME 0x00000001 /* enable vm86 extensions */ +#define X86_CR4_PVI 0x00000002 /* virtual interrupts flag enable */ +#define X86_CR4_TSD 0x00000004 /* disable time stamp at ipl 3 */ +#define X86_CR4_DE 0x00000008 /* enable debugging extensions */ +#define X86_CR4_PSE 0x00000010 /* enable page size extensions */ +#define X86_CR4_PAE 0x00000020 /* enable physical address extensions */ +#define X86_CR4_MCE 0x00000040 /* Machine check enable */ +#define X86_CR4_PGE 0x00000080 /* enable global pages */ +#define X86_CR4_PCE 0x00000100 /* enable performance counters at ipl 3 */ +#define X86_CR4_OSFXSR 0x00000200 /* enable fast FPU save and restore */ +#define X86_CR4_OSXMMEXCPT 0x00000400 /* enable unmasked SSE exceptions */ +#define X86_CR4_VMXE 0x00002000 /* enable VMX */ +#define X86_CR4_SMXE 0x00004000 /* enable SMX */ +#define X86_CR4_FSGSBASE 0x00010000 /* enable {rd,wr}{fs,gs}base */ +#define X86_CR4_PCIDE 0x00020000 /* enable PCID */ +#define X86_CR4_OSXSAVE 0x00040000 /* enable XSAVE/XRSTOR */ +#define X86_CR4_SMEP 0x00100000 /* enable SMEP */ +#define X86_CR4_SMAP 0x00200000 /* enable SMAP */ +#define X86_CR4_PKE 0x00400000 /* enable PKE */ /* * Trap/fault mnemonics. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:03:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tVg-0000v7-Kx; Sat, 27 Jun 2015 17:03:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVf-0000uu-DJ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:19 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 01/52-30151-657DE855; Sat, 27 Jun 2015 17:03:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435424597!27227729!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24137 invoked from network); 27 Jun 2015 17:03:17 -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; 27 Jun 2015 17:03:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVc-0007Ol-VU for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVc-0000HP-Td for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:16 +0000 Date: Sat, 27 Jun 2015 17:03:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop PSE from XEN_MINIMAL_CR4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca7f96c3b2b222177332a2488b226835701a6c66 Author: Andrew Cooper AuthorDate: Thu Jun 25 14:58:39 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:58:39 2015 +0200 x86: drop PSE from XEN_MINIMAL_CR4 CR4.PSE is ignored if CR4.PAE is set, which will unconditionally will be. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/processor.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 2a3b3d9..b9a00aa 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -143,7 +143,7 @@ #define PFEC_page_paged (1U<<5) #define PFEC_page_shared (1U<<6) -#define XEN_MINIMAL_CR4 (X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE) +#define XEN_MINIMAL_CR4 (X86_CR4_PGE | X86_CR4_PAE) #define XEN_SYSCALL_MASK (X86_EFLAGS_AC|X86_EFLAGS_VM|X86_EFLAGS_RF| \ X86_EFLAGS_NT|X86_EFLAGS_DF|X86_EFLAGS_IF| \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:03:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tVg-0000v7-Kx; Sat, 27 Jun 2015 17:03:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVf-0000uu-DJ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:19 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 01/52-30151-657DE855; Sat, 27 Jun 2015 17:03:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435424597!27227729!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24137 invoked from network); 27 Jun 2015 17:03:17 -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; 27 Jun 2015 17:03:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVc-0007Ol-VU for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVc-0000HP-Td for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:16 +0000 Date: Sat, 27 Jun 2015 17:03:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop PSE from XEN_MINIMAL_CR4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca7f96c3b2b222177332a2488b226835701a6c66 Author: Andrew Cooper AuthorDate: Thu Jun 25 14:58:39 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 25 14:58:39 2015 +0200 x86: drop PSE from XEN_MINIMAL_CR4 CR4.PSE is ignored if CR4.PAE is set, which will unconditionally will be. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/processor.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 2a3b3d9..b9a00aa 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -143,7 +143,7 @@ #define PFEC_page_paged (1U<<5) #define PFEC_page_shared (1U<<6) -#define XEN_MINIMAL_CR4 (X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE) +#define XEN_MINIMAL_CR4 (X86_CR4_PGE | X86_CR4_PAE) #define XEN_SYSCALL_MASK (X86_EFLAGS_AC|X86_EFLAGS_VM|X86_EFLAGS_RF| \ X86_EFLAGS_NT|X86_EFLAGS_DF|X86_EFLAGS_IF| \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:03:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tVq-0000xn-Nq; Sat, 27 Jun 2015 17:03:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVp-0000xX-9w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:29 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 80/33-03895-067DE855; Sat, 27 Jun 2015 17:03:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1435424607!19141436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5533 invoked from network); 27 Jun 2015 17:03:28 -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; 27 Jun 2015 17:03:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVn-0007Ot-5G for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVn-0000Hl-3Q for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:27 +0000 Date: Sat, 27 Jun 2015 17:03:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update to SeaBIOS rel-1.8.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46bc4edd8c85f6a230939be0600f13e29d9a0d0e Author: Ian Campbell AuthorDate: Mon Jun 22 14:51:08 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 26 12:56:59 2015 +0100 Update to SeaBIOS rel-1.8.2 Signed-off-by: Ian Campbell Acked-by: Wei Liu --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 969a581..d9568d3 100644 --- a/Config.mk +++ b/Config.mk @@ -259,9 +259,9 @@ MINIOS_UPSTREAM_REVISION ?= edfd5aae6ec5ba7d0a8834a3e9dfe5e69424150a # Thu Mar 12 19:08:05 2015 +0100 # Fix accidentally removed brace causing a build error. -SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 -# Wed Feb 18 12:49:59 2015 -0500 -# docs: Note v1.8.0 release +SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 +# Tue Mar 17 10:52:16 2015 -0400 +# vgabios: On bda_save_restore() the saved vbe_mode also has flags in it 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 Sat Jun 27 17:03:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tVq-0000xn-Nq; Sat, 27 Jun 2015 17:03:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVp-0000xX-9w for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:29 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 80/33-03895-067DE855; Sat, 27 Jun 2015 17:03:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1435424607!19141436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5533 invoked from network); 27 Jun 2015 17:03:28 -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; 27 Jun 2015 17:03:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVn-0007Ot-5G for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVn-0000Hl-3Q for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:27 +0000 Date: Sat, 27 Jun 2015 17:03:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update to SeaBIOS rel-1.8.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46bc4edd8c85f6a230939be0600f13e29d9a0d0e Author: Ian Campbell AuthorDate: Mon Jun 22 14:51:08 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 26 12:56:59 2015 +0100 Update to SeaBIOS rel-1.8.2 Signed-off-by: Ian Campbell Acked-by: Wei Liu --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 969a581..d9568d3 100644 --- a/Config.mk +++ b/Config.mk @@ -259,9 +259,9 @@ MINIOS_UPSTREAM_REVISION ?= edfd5aae6ec5ba7d0a8834a3e9dfe5e69424150a # Thu Mar 12 19:08:05 2015 +0100 # Fix accidentally removed brace causing a build error. -SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 -# Wed Feb 18 12:49:59 2015 -0500 -# docs: Note v1.8.0 release +SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 +# Tue Mar 17 10:52:16 2015 -0400 +# vgabios: On bda_save_restore() the saved vbe_mode also has flags in it 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 Sat Jun 27 17:03:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tW1-0000zX-Qi; Sat, 27 Jun 2015 17:03:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVz-0000zG-Oc for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:39 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 3D/51-23832-B67DE855; Sat, 27 Jun 2015 17:03:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435424617!20414407!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16829 invoked from network); 27 Jun 2015 17:03:38 -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; 27 Jun 2015 17:03:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVx-0007P8-9c for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVx-0000IB-8e for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:37 +0000 Date: Sat, 27 Jun 2015 17:03:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: Take the userdata lock around maxmem changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f33fa2bca6354fad1decfeda723c046311e85cc Author: Ian Campbell AuthorDate: Tue Jun 23 15:58:32 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 26 12:59:10 2015 +0100 tools: libxl: Take the userdata lock around maxmem changes There is an issue in libxl_set_memory_target whereby the target and the max mem can get out of sync, this is because the call the xc_domain_setmaxmem is not tied in any way to the xenstore transaction which controls updates to the xenstore side of things. Consider a domain with 1M of RAM (==target and maxmem for the sake of argument) and two simultaneous calls to libxl_set_memory_target, both with relative=0 and enforce=1, one with target=3 and the other with target=5. target=5 call target=3 call transaction start transaction start write target=5 to xenstore write target=3 to xenstore setmaxmem(5) setmaxmem(3) transaction commit = success transaction commit = EAGAIN At this point maxmem=3 while target=5. In reality the target=3 case will the retry and eventually (hopefully) succeed with target=maxmem=3, however the bad state will persist for some window which is undesirable. On failure other than EAGAIN all bets are off anyway, but in that case we will likely stick in the bad state until someone else sets the memory). To fix this we slightly abuse the userdata lock which is used to protect updates to the domain's json configuration. Abused because maxmem is not actually stored in there, but is kept by Xen. However the lock protects some semantically similar things and is convenient to use here too. libxl_domain_setmaxmem also takes the lock, since it reads memory/target from xenstore before calling xc_domain_setmaxmem there is a small (but perhaps not very interesting) race there too. There is on more use of xc_domain_setmaxmem in libxl__build_pre. However taking a lock around this would be tricky since the xenstore parts are not done until libxl__build_post. I think this one could be argued to be OK since the domid is not "public" yet, that is it has not been returned to the application yet (as the result of the create operation). Toolstacks which go round fiddling with random domid's which they find lying on the floor should be taught to do better. Add a doc note that taking the userdata lock requires the CTX_LOCK to be held. Signed-off-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl.c | 22 ++++++++++++++++++++++ tools/libxl/libxl_internal.h | 1 + 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index cfc2623..ed50d32 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4621,6 +4621,15 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) uint32_t memorykb; char *dompath = libxl__xs_get_dompath(gc, domid); int rc = 1; + libxl__domain_userdata_lock *lock = NULL; + + CTX_LOCK; + + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } mem = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/memory/target", dompath)); if (!mem) { @@ -4647,6 +4656,8 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) rc = 0; out: + if (lock) libxl__unlock_domain_userdata(lock); + CTX_UNLOCK; GC_FREE; return rc; } @@ -4746,6 +4757,15 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, libxl_dominfo ptr; char *uuid; xs_transaction_t t; + libxl__domain_userdata_lock *lock; + + CTX_LOCK; + + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out_no_transaction; + } retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4867,6 +4887,8 @@ out: goto retry_transaction; out_no_transaction: + if (lock) libxl__unlock_domain_userdata(lock); + CTX_UNLOCK; GC_FREE; return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e96d6b5..5594b54 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3600,6 +3600,7 @@ typedef struct { libxl__carefd *carefd; char *path; /* path of the lock file itself */ } libxl__domain_userdata_lock; +/* The CTX_LOCK must be held around uses of this lock */ libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:03:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tW1-0000zX-Qi; Sat, 27 Jun 2015 17:03:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVz-0000zG-Oc for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:39 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 3D/51-23832-B67DE855; Sat, 27 Jun 2015 17:03:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1435424617!20414407!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16829 invoked from network); 27 Jun 2015 17:03:38 -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; 27 Jun 2015 17:03:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tVx-0007P8-9c for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tVx-0000IB-8e for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:37 +0000 Date: Sat, 27 Jun 2015 17:03:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: Take the userdata lock around maxmem changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f33fa2bca6354fad1decfeda723c046311e85cc Author: Ian Campbell AuthorDate: Tue Jun 23 15:58:32 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 26 12:59:10 2015 +0100 tools: libxl: Take the userdata lock around maxmem changes There is an issue in libxl_set_memory_target whereby the target and the max mem can get out of sync, this is because the call the xc_domain_setmaxmem is not tied in any way to the xenstore transaction which controls updates to the xenstore side of things. Consider a domain with 1M of RAM (==target and maxmem for the sake of argument) and two simultaneous calls to libxl_set_memory_target, both with relative=0 and enforce=1, one with target=3 and the other with target=5. target=5 call target=3 call transaction start transaction start write target=5 to xenstore write target=3 to xenstore setmaxmem(5) setmaxmem(3) transaction commit = success transaction commit = EAGAIN At this point maxmem=3 while target=5. In reality the target=3 case will the retry and eventually (hopefully) succeed with target=maxmem=3, however the bad state will persist for some window which is undesirable. On failure other than EAGAIN all bets are off anyway, but in that case we will likely stick in the bad state until someone else sets the memory). To fix this we slightly abuse the userdata lock which is used to protect updates to the domain's json configuration. Abused because maxmem is not actually stored in there, but is kept by Xen. However the lock protects some semantically similar things and is convenient to use here too. libxl_domain_setmaxmem also takes the lock, since it reads memory/target from xenstore before calling xc_domain_setmaxmem there is a small (but perhaps not very interesting) race there too. There is on more use of xc_domain_setmaxmem in libxl__build_pre. However taking a lock around this would be tricky since the xenstore parts are not done until libxl__build_post. I think this one could be argued to be OK since the domid is not "public" yet, that is it has not been returned to the application yet (as the result of the create operation). Toolstacks which go round fiddling with random domid's which they find lying on the floor should be taught to do better. Add a doc note that taking the userdata lock requires the CTX_LOCK to be held. Signed-off-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl.c | 22 ++++++++++++++++++++++ tools/libxl/libxl_internal.h | 1 + 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index cfc2623..ed50d32 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4621,6 +4621,15 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) uint32_t memorykb; char *dompath = libxl__xs_get_dompath(gc, domid); int rc = 1; + libxl__domain_userdata_lock *lock = NULL; + + CTX_LOCK; + + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } mem = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/memory/target", dompath)); if (!mem) { @@ -4647,6 +4656,8 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) rc = 0; out: + if (lock) libxl__unlock_domain_userdata(lock); + CTX_UNLOCK; GC_FREE; return rc; } @@ -4746,6 +4757,15 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, libxl_dominfo ptr; char *uuid; xs_transaction_t t; + libxl__domain_userdata_lock *lock; + + CTX_LOCK; + + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out_no_transaction; + } retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4867,6 +4887,8 @@ out: goto retry_transaction; out_no_transaction: + if (lock) libxl__unlock_domain_userdata(lock); + CTX_UNLOCK; GC_FREE; return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e96d6b5..5594b54 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3600,6 +3600,7 @@ typedef struct { libxl__carefd *carefd; char *path; /* path of the lock file itself */ } libxl__domain_userdata_lock; +/* The CTX_LOCK must be held around uses of this lock */ libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:03:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tWB-00011M-V5; Sat, 27 Jun 2015 17:03:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWA-000118-KY for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:50 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id C2/63-01068-577DE855; Sat, 27 Jun 2015 17:03:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435424628!20339770!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.5 required=7.0 tests=BODY_FWORD X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14001 invoked from network); 27 Jun 2015 17:03:49 -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; 27 Jun 2015 17:03:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tW8-0007PG-BQ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tW8-0000In-77 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:48 +0000 Date: Sat, 27 Jun 2015 17:03:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD: also print TOM2 when printing MTRR state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 637c2646e27848222b9f2c94d663449678b1d7f1 Author: Jan Beulich AuthorDate: Fri Jun 26 15:05:50 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 26 15:05:50 2015 +0200 x86/AMD: also print TOM2 when printing MTRR state ... to have a complete picture of cachability settings. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/mtrr/generic.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index 493830b..935f0a0 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -182,6 +182,18 @@ static void __init print_mtrr_state(const char *level) else printk("%s %u disabled\n", level, i); } + + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD + && boot_cpu_data.x86 >= 0xf) { + uint64_t syscfg, tom2; + + rdmsrl(MSR_K8_SYSCFG, syscfg); + if (syscfg & (1 << 21)) { + rdmsrl(MSR_K8_TOP_MEM2, tom2); + printk("%sTOM2: %012"PRIx64"%s\n", level, tom2, + syscfg & (1 << 22) ? " (WB)" : ""); + } + } } /* Some BIOS's are fucked and don't set all MTRRs the same! */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:03:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:03: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 1Z8tWB-00011M-V5; Sat, 27 Jun 2015 17:03:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWA-000118-KY for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:50 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id C2/63-01068-577DE855; Sat, 27 Jun 2015 17:03:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435424628!20339770!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.5 required=7.0 tests=BODY_FWORD X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14001 invoked from network); 27 Jun 2015 17:03:49 -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; 27 Jun 2015 17:03:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tW8-0007PG-BQ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tW8-0000In-77 for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:48 +0000 Date: Sat, 27 Jun 2015 17:03:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD: also print TOM2 when printing MTRR state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 637c2646e27848222b9f2c94d663449678b1d7f1 Author: Jan Beulich AuthorDate: Fri Jun 26 15:05:50 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 26 15:05:50 2015 +0200 x86/AMD: also print TOM2 when printing MTRR state ... to have a complete picture of cachability settings. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/mtrr/generic.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index 493830b..935f0a0 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -182,6 +182,18 @@ static void __init print_mtrr_state(const char *level) else printk("%s %u disabled\n", level, i); } + + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD + && boot_cpu_data.x86 >= 0xf) { + uint64_t syscfg, tom2; + + rdmsrl(MSR_K8_SYSCFG, syscfg); + if (syscfg & (1 << 21)) { + rdmsrl(MSR_K8_TOP_MEM2, tom2); + printk("%sTOM2: %012"PRIx64"%s\n", level, tom2, + syscfg & (1 << 22) ? " (WB)" : ""); + } + } } /* Some BIOS's are fucked and don't set all MTRRs the same! */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:04:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:04:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWN-00012n-1I; Sat, 27 Jun 2015 17:04:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWK-00012Z-Pq for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:04:00 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 43/1A-11060-087DE855; Sat, 27 Jun 2015 17:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435424638!15974128!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30880 invoked from network); 27 Jun 2015 17:03:59 -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; 27 Jun 2015 17:03:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWI-0007PR-GZ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tWI-0000Js-EO for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:58 +0000 Date: Sat, 27 Jun 2015 17:03:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdf741bf4d014eec18f251576c1182ae264397bb Merge: 5f33fa2bca6354fad1decfeda723c046311e85cc 637c2646e27848222b9f2c94d663449678b1d7f1 Author: Ian Campbell AuthorDate: Fri Jun 26 14:49:27 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 26 14:49:27 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/cpu/mtrr/generic.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 27 17:04:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 27 Jun 2015 17:04:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWN-00012n-1I; Sat, 27 Jun 2015 17:04:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWK-00012Z-Pq for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:04:00 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 43/1A-11060-087DE855; Sat, 27 Jun 2015 17:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435424638!15974128!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30880 invoked from network); 27 Jun 2015 17:03:59 -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; 27 Jun 2015 17:03:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z8tWI-0007PR-GZ for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z8tWI-0000Js-EO for xen-changelog@lists.xensource.com; Sat, 27 Jun 2015 17:03:58 +0000 Date: Sat, 27 Jun 2015 17:03:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdf741bf4d014eec18f251576c1182ae264397bb Merge: 5f33fa2bca6354fad1decfeda723c046311e85cc 637c2646e27848222b9f2c94d663449678b1d7f1 Author: Ian Campbell AuthorDate: Fri Jun 26 14:49:27 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jun 26 14:49:27 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/cpu/mtrr/generic.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:00:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9OMj-00075L-02; Mon, 29 Jun 2015 02:00:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMh-00075D-LT for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:07 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id DA/FE-01469-6A6A0955; Mon, 29 Jun 2015 02:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543204!27442302!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28586 invoked from network); 29 Jun 2015 02:00: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; 29 Jun 2015 02:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMe-0002CP-Fu for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OMe-00057k-2o for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:04 +0000 Date: Mon, 29 Jun 2015 02:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use ticket locks for spin locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e10784ac424405c82accd0542fcc84cf468c53dc Author: David Vrabel AuthorDate: Fri Jun 26 17:33:34 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 26 17:33:34 2015 +0200 use ticket locks for spin locks Replace the byte locks with ticket locks. Ticket locks are: a) fair; and b) peform better when contented since they spin without an atomic operation. The lock is split into two ticket values: head and tail. A locker acquires a ticket by (atomically) increasing tail and using the previous tail value. A CPU holds the lock if its ticket == head. The lock is released by increasing head. spin_lock_irq() and spin_lock_irqsave() now spin with irqs disabled (previously, they would spin with irqs enabled if possible). This is required to prevent deadlocks when the irq handler tries to take the same lock with a higher ticket. Architectures need only provide arch_fetch_and_add() and two barriers: arch_lock_acquire_barrier() and arch_lock_release_barrier(). Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/common/spinlock.c | 116 ++++++++++++++++++++++++------------------ xen/include/asm-arm/system.h | 3 + xen/include/asm-x86/system.h | 11 ++++ xen/include/xen/spinlock.h | 18 +++++-- 4 files changed, 94 insertions(+), 54 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 5fd8b1c..29149d1 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -115,125 +115,134 @@ void spin_debug_disable(void) #endif +static always_inline spinlock_tickets_t observe_lock(spinlock_tickets_t *t) +{ + spinlock_tickets_t v; + + smp_rmb(); + v.head_tail = read_atomic(&t->head_tail); + return v; +} + +static always_inline u16 observe_head(spinlock_tickets_t *t) +{ + smp_rmb(); + return read_atomic(&t->head); +} + void _spin_lock(spinlock_t *lock) { + spinlock_tickets_t tickets = SPINLOCK_TICKET_INC; LOCK_PROFILE_VAR; check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + tickets.head_tail = arch_fetch_and_add(&lock->tickets.head_tail, + tickets.head_tail); + while ( tickets.tail != observe_head(&lock->tickets) ) { LOCK_PROFILE_BLOCK; - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); + cpu_relax(); } LOCK_PROFILE_GOT; preempt_disable(); + arch_lock_acquire_barrier(); } void _spin_lock_irq(spinlock_t *lock) { - LOCK_PROFILE_VAR; - ASSERT(local_irq_is_enabled()); local_irq_disable(); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_enable(); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); } unsigned long _spin_lock_irqsave(spinlock_t *lock) { unsigned long flags; - LOCK_PROFILE_VAR; local_irq_save(flags); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_restore(flags); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); return flags; } void _spin_unlock(spinlock_t *lock) { + arch_lock_release_barrier(); preempt_enable(); LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + add_sized(&lock->tickets.head, 1); } void _spin_unlock_irq(spinlock_t *lock) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_enable(); } void _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_restore(flags); } int _spin_is_locked(spinlock_t *lock) { check_lock(&lock->debug); - return _raw_spin_is_locked(&lock->raw); + return lock->tickets.head != lock->tickets.tail; } int _spin_trylock(spinlock_t *lock) { + spinlock_tickets_t old, new; + check_lock(&lock->debug); - if ( !_raw_spin_trylock(&lock->raw) ) + old = observe_lock(&lock->tickets); + if ( old.head != old.tail ) + return 0; + new = old; + new.tail++; + if ( cmpxchg(&lock->tickets.head_tail, + old.head_tail, new.head_tail) != old.head_tail ) return 0; #ifdef LOCK_PROFILE if (lock->profile) lock->profile->time_locked = NOW(); #endif preempt_disable(); + /* + * cmpxchg() is a full barrier so no need for an + * arch_lock_acquire_barrier(). + */ return 1; } void _spin_barrier(spinlock_t *lock) { + spinlock_tickets_t sample; #ifdef LOCK_PROFILE s_time_t block = NOW(); - u64 loop = 0; +#endif check_barrier(&lock->debug); - do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); - if ((loop > 1) && lock->profile) + smp_mb(); + sample = observe_lock(&lock->tickets); + if ( sample.head != sample.tail ) { - lock->profile->time_block += NOW() - block; - lock->profile->block_cnt++; - } -#else - check_barrier(&lock->debug); - do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); + while ( observe_head(&lock->tickets) == sample.head ) + cpu_relax(); +#ifdef LOCK_PROFILE + if ( lock->profile ) + { + lock->profile->time_block += NOW() - block; + lock->profile->block_cnt++; + } #endif + } smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) { - int cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); /* Don't allow overflow of recurse_cpu field. */ BUILD_BUG_ON(NR_CPUS > 0xfffu); @@ -256,8 +265,17 @@ int _spin_trylock_recursive(spinlock_t *lock) void _spin_lock_recursive(spinlock_t *lock) { - while ( !spin_trylock_recursive(lock) ) - cpu_relax(); + unsigned int cpu = smp_processor_id(); + + if ( likely(lock->recurse_cpu != cpu) ) + { + _spin_lock(lock); + lock->recurse_cpu = cpu; + } + + /* We support only fairly shallow recursion, else the counter overflows. */ + ASSERT(lock->recurse_cnt < 0xfu); + lock->recurse_cnt++; } void _spin_unlock_recursive(spinlock_t *lock) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 2eb96e8..f0e222f 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,6 +53,9 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) +#define arch_lock_acquire_barrier() smp_mb() +#define arch_lock_release_barrier() smp_mb() + extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 9fb70f5..25a6a2a 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,6 +185,17 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) +/* + * On x86 the only reordering is of reads with older writes. In the + * lock case, the read in observe_head() can only be reordered with + * writes that precede it, and moving a write _into_ a locked section + * is OK. In the release case, the write in add_sized() can only be + * reordered with reads that follow it, and hoisting a read _into_ a + * locked region is OK. + */ +#define arch_lock_acquire_barrier() barrier() +#define arch_lock_release_barrier() barrier() + #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index eda9b2e..fb0438e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -80,8 +80,7 @@ struct lock_profile_qhead { static struct lock_profile *__lock_profile_##name \ __used_section(".lockprofile.data") = \ &__lock_profile_data_##name -#define _SPIN_LOCK_UNLOCKED(x) { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, \ - _LOCK_DEBUG, x } +#define _SPIN_LOCK_UNLOCKED(x) { { 0 }, 0xfffu, 0, _LOCK_DEBUG, x } #define SPIN_LOCK_UNLOCKED _SPIN_LOCK_UNLOCKED(NULL) #define DEFINE_SPINLOCK(l) \ spinlock_t l = _SPIN_LOCK_UNLOCKED(NULL); \ @@ -117,8 +116,7 @@ extern void spinlock_profile_reset(unsigned char key); struct lock_profile_qhead { }; -#define SPIN_LOCK_UNLOCKED \ - { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, _LOCK_DEBUG } +#define SPIN_LOCK_UNLOCKED { { 0 }, 0xfffu, 0, _LOCK_DEBUG } #define DEFINE_SPINLOCK(l) spinlock_t l = SPIN_LOCK_UNLOCKED #define spin_lock_init_prof(s, l) spin_lock_init(&((s)->l)) @@ -127,8 +125,18 @@ struct lock_profile_qhead { }; #endif +typedef union { + u32 head_tail; + struct { + u16 head; + u16 tail; + }; +} spinlock_tickets_t; + +#define SPINLOCK_TICKET_INC { .head_tail = 0x10000, } + typedef struct spinlock { - raw_spinlock_t raw; + spinlock_tickets_t tickets; u16 recurse_cpu:12; u16 recurse_cnt:4; struct lock_debug debug; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:00:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9OMj-00075L-02; Mon, 29 Jun 2015 02:00:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMh-00075D-LT for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:07 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id DA/FE-01469-6A6A0955; Mon, 29 Jun 2015 02:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543204!27442302!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28586 invoked from network); 29 Jun 2015 02:00: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; 29 Jun 2015 02:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMe-0002CP-Fu for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OMe-00057k-2o for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:04 +0000 Date: Mon, 29 Jun 2015 02:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use ticket locks for spin locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e10784ac424405c82accd0542fcc84cf468c53dc Author: David Vrabel AuthorDate: Fri Jun 26 17:33:34 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 26 17:33:34 2015 +0200 use ticket locks for spin locks Replace the byte locks with ticket locks. Ticket locks are: a) fair; and b) peform better when contented since they spin without an atomic operation. The lock is split into two ticket values: head and tail. A locker acquires a ticket by (atomically) increasing tail and using the previous tail value. A CPU holds the lock if its ticket == head. The lock is released by increasing head. spin_lock_irq() and spin_lock_irqsave() now spin with irqs disabled (previously, they would spin with irqs enabled if possible). This is required to prevent deadlocks when the irq handler tries to take the same lock with a higher ticket. Architectures need only provide arch_fetch_and_add() and two barriers: arch_lock_acquire_barrier() and arch_lock_release_barrier(). Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/common/spinlock.c | 116 ++++++++++++++++++++++++------------------ xen/include/asm-arm/system.h | 3 + xen/include/asm-x86/system.h | 11 ++++ xen/include/xen/spinlock.h | 18 +++++-- 4 files changed, 94 insertions(+), 54 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 5fd8b1c..29149d1 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -115,125 +115,134 @@ void spin_debug_disable(void) #endif +static always_inline spinlock_tickets_t observe_lock(spinlock_tickets_t *t) +{ + spinlock_tickets_t v; + + smp_rmb(); + v.head_tail = read_atomic(&t->head_tail); + return v; +} + +static always_inline u16 observe_head(spinlock_tickets_t *t) +{ + smp_rmb(); + return read_atomic(&t->head); +} + void _spin_lock(spinlock_t *lock) { + spinlock_tickets_t tickets = SPINLOCK_TICKET_INC; LOCK_PROFILE_VAR; check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + tickets.head_tail = arch_fetch_and_add(&lock->tickets.head_tail, + tickets.head_tail); + while ( tickets.tail != observe_head(&lock->tickets) ) { LOCK_PROFILE_BLOCK; - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); + cpu_relax(); } LOCK_PROFILE_GOT; preempt_disable(); + arch_lock_acquire_barrier(); } void _spin_lock_irq(spinlock_t *lock) { - LOCK_PROFILE_VAR; - ASSERT(local_irq_is_enabled()); local_irq_disable(); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_enable(); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); } unsigned long _spin_lock_irqsave(spinlock_t *lock) { unsigned long flags; - LOCK_PROFILE_VAR; local_irq_save(flags); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_restore(flags); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); return flags; } void _spin_unlock(spinlock_t *lock) { + arch_lock_release_barrier(); preempt_enable(); LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + add_sized(&lock->tickets.head, 1); } void _spin_unlock_irq(spinlock_t *lock) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_enable(); } void _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_restore(flags); } int _spin_is_locked(spinlock_t *lock) { check_lock(&lock->debug); - return _raw_spin_is_locked(&lock->raw); + return lock->tickets.head != lock->tickets.tail; } int _spin_trylock(spinlock_t *lock) { + spinlock_tickets_t old, new; + check_lock(&lock->debug); - if ( !_raw_spin_trylock(&lock->raw) ) + old = observe_lock(&lock->tickets); + if ( old.head != old.tail ) + return 0; + new = old; + new.tail++; + if ( cmpxchg(&lock->tickets.head_tail, + old.head_tail, new.head_tail) != old.head_tail ) return 0; #ifdef LOCK_PROFILE if (lock->profile) lock->profile->time_locked = NOW(); #endif preempt_disable(); + /* + * cmpxchg() is a full barrier so no need for an + * arch_lock_acquire_barrier(). + */ return 1; } void _spin_barrier(spinlock_t *lock) { + spinlock_tickets_t sample; #ifdef LOCK_PROFILE s_time_t block = NOW(); - u64 loop = 0; +#endif check_barrier(&lock->debug); - do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); - if ((loop > 1) && lock->profile) + smp_mb(); + sample = observe_lock(&lock->tickets); + if ( sample.head != sample.tail ) { - lock->profile->time_block += NOW() - block; - lock->profile->block_cnt++; - } -#else - check_barrier(&lock->debug); - do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); + while ( observe_head(&lock->tickets) == sample.head ) + cpu_relax(); +#ifdef LOCK_PROFILE + if ( lock->profile ) + { + lock->profile->time_block += NOW() - block; + lock->profile->block_cnt++; + } #endif + } smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) { - int cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); /* Don't allow overflow of recurse_cpu field. */ BUILD_BUG_ON(NR_CPUS > 0xfffu); @@ -256,8 +265,17 @@ int _spin_trylock_recursive(spinlock_t *lock) void _spin_lock_recursive(spinlock_t *lock) { - while ( !spin_trylock_recursive(lock) ) - cpu_relax(); + unsigned int cpu = smp_processor_id(); + + if ( likely(lock->recurse_cpu != cpu) ) + { + _spin_lock(lock); + lock->recurse_cpu = cpu; + } + + /* We support only fairly shallow recursion, else the counter overflows. */ + ASSERT(lock->recurse_cnt < 0xfu); + lock->recurse_cnt++; } void _spin_unlock_recursive(spinlock_t *lock) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 2eb96e8..f0e222f 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,6 +53,9 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) +#define arch_lock_acquire_barrier() smp_mb() +#define arch_lock_release_barrier() smp_mb() + extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 9fb70f5..25a6a2a 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,6 +185,17 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) +/* + * On x86 the only reordering is of reads with older writes. In the + * lock case, the read in observe_head() can only be reordered with + * writes that precede it, and moving a write _into_ a locked section + * is OK. In the release case, the write in add_sized() can only be + * reordered with reads that follow it, and hoisting a read _into_ a + * locked region is OK. + */ +#define arch_lock_acquire_barrier() barrier() +#define arch_lock_release_barrier() barrier() + #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index eda9b2e..fb0438e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -80,8 +80,7 @@ struct lock_profile_qhead { static struct lock_profile *__lock_profile_##name \ __used_section(".lockprofile.data") = \ &__lock_profile_data_##name -#define _SPIN_LOCK_UNLOCKED(x) { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, \ - _LOCK_DEBUG, x } +#define _SPIN_LOCK_UNLOCKED(x) { { 0 }, 0xfffu, 0, _LOCK_DEBUG, x } #define SPIN_LOCK_UNLOCKED _SPIN_LOCK_UNLOCKED(NULL) #define DEFINE_SPINLOCK(l) \ spinlock_t l = _SPIN_LOCK_UNLOCKED(NULL); \ @@ -117,8 +116,7 @@ extern void spinlock_profile_reset(unsigned char key); struct lock_profile_qhead { }; -#define SPIN_LOCK_UNLOCKED \ - { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, _LOCK_DEBUG } +#define SPIN_LOCK_UNLOCKED { { 0 }, 0xfffu, 0, _LOCK_DEBUG } #define DEFINE_SPINLOCK(l) spinlock_t l = SPIN_LOCK_UNLOCKED #define spin_lock_init_prof(s, l) spin_lock_init(&((s)->l)) @@ -127,8 +125,18 @@ struct lock_profile_qhead { }; #endif +typedef union { + u32 head_tail; + struct { + u16 head; + u16 tail; + }; +} spinlock_tickets_t; + +#define SPINLOCK_TICKET_INC { .head_tail = 0x10000, } + typedef struct spinlock { - raw_spinlock_t raw; + spinlock_tickets_t tickets; u16 recurse_cpu:12; u16 recurse_cnt:4; struct lock_debug debug; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:00:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9OMt-0007Bb-4D; Mon, 29 Jun 2015 02:00:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMr-00075s-QF for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:18 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id F8/92-25925-1B6A0955; Mon, 29 Jun 2015 02:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1435543215!17469095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2248 invoked from network); 29 Jun 2015 02:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMo-0002LE-Ow for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OMo-00058B-K8 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:14 +0000 Date: Mon, 29 Jun 2015 02:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, arm: remove asm/spinlock.h from all architectures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 902d1b5c310fb63b511f0b967cf5f32d3f605f3d Author: David Vrabel AuthorDate: Fri Jun 26 17:35:27 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 26 17:35:27 2015 +0200 x86,arm: remove asm/spinlock.h from all architectures Now that all architecture use a common ticket lock implementation for spinlocks, remove the architecture specific byte lock implementations. Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/README.LinuxPrimitives | 28 -------------- xen/include/asm-arm/arm32/spinlock.h | 66 ---------------------------------- xen/include/asm-arm/arm64/spinlock.h | 63 -------------------------------- xen/include/asm-arm/spinlock.h | 23 ------------ xen/include/asm-x86/spinlock.h | 37 ------------------- xen/include/xen/spinlock.h | 1 - 6 files changed, 0 insertions(+), 218 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 7f33fc7..3115f51 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -25,16 +25,6 @@ linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- -spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) - -linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h - -Skipped: - 5686b06 arm64: lockref: add support for lockless lockrefs using cmpxchg - 52ea2a5 arm64: locks: introduce ticket-based spinlock implementation - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S @@ -103,24 +93,6 @@ linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h --------------------------------------------------------------------- -spinlocks: last sync: 15e7e5c1ebf5 - -linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h - -*** Linux has switched to ticket locks but we still use bitlocks. - -resync to v3.14-rc7: - - 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev - 0cbad9c ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64 - 9bb17be ARM: locks: prefetch the destination word for write prior to strex - 27a8479 ARM: smp_on_up: move inline asm ALT_SMP patching macro out of spinlock. - 00efaa0 ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lo - afa31d8 ARM: 7811/1: locks: use early clobber in arch_spin_trylock - 73a6fdc ARM: spinlock: use inner-shareable dsb variant prior to sev instruction - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h deleted file mode 100644 index bc0343c..0000000 --- a/xen/include/asm-arm/arm32/spinlock.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef __ASM_ARM32_SPINLOCK_H -#define __ASM_ARM32_SPINLOCK_H - -static inline void dsb_sev(void) -{ - __asm__ __volatile__ ( - "dsb\n" - "sev\n" - ); -} - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - smp_mb(); - - __asm__ __volatile__( -" str %1, [%0]\n" - : - : "r" (&lock->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned long contended, res; - - do { - __asm__ __volatile__( - " ldrex %0, [%2]\n" - " teq %0, #0\n" - " strexeq %1, %3, [%2]\n" - " movne %1, #0\n" - : "=&r" (contended), "=r" (res) - : "r" (&lock->lock), "r" (1) - : "cc"); - } while (res); - - if (!contended) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h deleted file mode 100644 index 5ae034d..0000000 --- a/xen/include/asm-arm/arm64/spinlock.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Derived from Linux arch64 spinlock.h which is: - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __ASM_ARM64_SPINLOCK_H -#define __ASM_ARM64_SPINLOCK_H - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - asm volatile( - " stlr %w1, %0\n" - : "=Q" (lock->lock) : "r" (0) : "memory"); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned int tmp; - - asm volatile( - "2: ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - " cbnz %w0, 2b\n" - "1:\n" - : "=&r" (tmp), "+Q" (lock->lock) - : "r" (1) - : "cc", "memory"); - - return !tmp; -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h deleted file mode 100644 index a064f73..0000000 --- a/xen/include/asm-arm/spinlock.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include - -#if defined(CONFIG_ARM_32) -# include -#elif defined(CONFIG_ARM_64) -# include -#else -# error "unknown ARM variant" -#endif - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h deleted file mode 100644 index 757e20b..0000000 --- a/xen/include/asm-x86/spinlock.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include -#include - -typedef struct { - volatile s16 lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED /*(raw_spinlock_t)*/ { 1 } - -#define _raw_spin_is_locked(x) ((x)->lock <= 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - asm volatile ( - "movw $1,%0" - : "=m" (lock->lock) : : "memory" ); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - s16 oldval; - asm volatile ( - "xchgw %w0,%1" - :"=r" (oldval), "=m" (lock->lock) - :"0" ((s16)0) : "memory" ); - return (oldval > 0); -} - -#define _raw_read_unlock(l) \ - asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) - -#endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index fb0438e..9286543 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,7 +2,6 @@ #define __SPINLOCK_H__ #include -#include #ifndef NDEBUG struct lock_debug { -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:00:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9OMt-0007Bb-4D; Mon, 29 Jun 2015 02:00:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMr-00075s-QF for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:18 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id F8/92-25925-1B6A0955; Mon, 29 Jun 2015 02:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1435543215!17469095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2248 invoked from network); 29 Jun 2015 02:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMo-0002LE-Ow for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OMo-00058B-K8 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:14 +0000 Date: Mon, 29 Jun 2015 02:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, arm: remove asm/spinlock.h from all architectures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 902d1b5c310fb63b511f0b967cf5f32d3f605f3d Author: David Vrabel AuthorDate: Fri Jun 26 17:35:27 2015 +0200 Commit: Jan Beulich CommitDate: Fri Jun 26 17:35:27 2015 +0200 x86,arm: remove asm/spinlock.h from all architectures Now that all architecture use a common ticket lock implementation for spinlocks, remove the architecture specific byte lock implementations. Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/README.LinuxPrimitives | 28 -------------- xen/include/asm-arm/arm32/spinlock.h | 66 ---------------------------------- xen/include/asm-arm/arm64/spinlock.h | 63 -------------------------------- xen/include/asm-arm/spinlock.h | 23 ------------ xen/include/asm-x86/spinlock.h | 37 ------------------- xen/include/xen/spinlock.h | 1 - 6 files changed, 0 insertions(+), 218 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 7f33fc7..3115f51 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -25,16 +25,6 @@ linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- -spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) - -linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h - -Skipped: - 5686b06 arm64: lockref: add support for lockless lockrefs using cmpxchg - 52ea2a5 arm64: locks: introduce ticket-based spinlock implementation - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S @@ -103,24 +93,6 @@ linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h --------------------------------------------------------------------- -spinlocks: last sync: 15e7e5c1ebf5 - -linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h - -*** Linux has switched to ticket locks but we still use bitlocks. - -resync to v3.14-rc7: - - 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev - 0cbad9c ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64 - 9bb17be ARM: locks: prefetch the destination word for write prior to strex - 27a8479 ARM: smp_on_up: move inline asm ALT_SMP patching macro out of spinlock. - 00efaa0 ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lo - afa31d8 ARM: 7811/1: locks: use early clobber in arch_spin_trylock - 73a6fdc ARM: spinlock: use inner-shareable dsb variant prior to sev instruction - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h deleted file mode 100644 index bc0343c..0000000 --- a/xen/include/asm-arm/arm32/spinlock.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef __ASM_ARM32_SPINLOCK_H -#define __ASM_ARM32_SPINLOCK_H - -static inline void dsb_sev(void) -{ - __asm__ __volatile__ ( - "dsb\n" - "sev\n" - ); -} - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - smp_mb(); - - __asm__ __volatile__( -" str %1, [%0]\n" - : - : "r" (&lock->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned long contended, res; - - do { - __asm__ __volatile__( - " ldrex %0, [%2]\n" - " teq %0, #0\n" - " strexeq %1, %3, [%2]\n" - " movne %1, #0\n" - : "=&r" (contended), "=r" (res) - : "r" (&lock->lock), "r" (1) - : "cc"); - } while (res); - - if (!contended) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h deleted file mode 100644 index 5ae034d..0000000 --- a/xen/include/asm-arm/arm64/spinlock.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Derived from Linux arch64 spinlock.h which is: - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __ASM_ARM64_SPINLOCK_H -#define __ASM_ARM64_SPINLOCK_H - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - asm volatile( - " stlr %w1, %0\n" - : "=Q" (lock->lock) : "r" (0) : "memory"); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned int tmp; - - asm volatile( - "2: ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - " cbnz %w0, 2b\n" - "1:\n" - : "=&r" (tmp), "+Q" (lock->lock) - : "r" (1) - : "cc", "memory"); - - return !tmp; -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h deleted file mode 100644 index a064f73..0000000 --- a/xen/include/asm-arm/spinlock.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include - -#if defined(CONFIG_ARM_32) -# include -#elif defined(CONFIG_ARM_64) -# include -#else -# error "unknown ARM variant" -#endif - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h deleted file mode 100644 index 757e20b..0000000 --- a/xen/include/asm-x86/spinlock.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include -#include - -typedef struct { - volatile s16 lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED /*(raw_spinlock_t)*/ { 1 } - -#define _raw_spin_is_locked(x) ((x)->lock <= 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - asm volatile ( - "movw $1,%0" - : "=m" (lock->lock) : : "memory" ); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - s16 oldval; - asm volatile ( - "xchgw %w0,%1" - :"=r" (oldval), "=m" (lock->lock) - :"0" ((s16)0) : "memory" ); - return (oldval > 0); -} - -#define _raw_read_unlock(l) \ - asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) - -#endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index fb0438e..9286543 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,7 +2,6 @@ #define __SPINLOCK_H__ #include -#include #ifndef NDEBUG struct lock_debug { -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:00:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9ON4-0007Ob-6p; Mon, 29 Jun 2015 02:00:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ON2-0007OP-1P for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:28 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id D9/CA-03895-BB6A0955; Mon, 29 Jun 2015 02:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1435543225!20582632!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7565 invoked from network); 29 Jun 2015 02:00:26 -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; 29 Jun 2015 02:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMz-0002LQ-2N for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OMy-00058X-Sx for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:24 +0000 Date: Mon, 29 Jun 2015 02:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao internal API docs: Mention synchronous ao completion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee644ba982b98e83781ee15d1c3603f577baf918 Author: Ian Jackson AuthorDate: Wed Apr 8 12:22:38 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao internal API docs: Mention synchronous ao completion This doc comment about ao lifecycle failed to mention the option of completing the ao during the initiator function. (Indeed, the most obvious reading would forbid it.) Restructure the comment, describe this situation, and generally improve the wording. Also, fix a grammar problem (missing word `a'). Reported-by: Koushik Chakravarty Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_internal.h | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5594b54..6120d78 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1954,28 +1954,41 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); * must be copied into the per-operation structure using * libxl__ao_progress_gethow. * - * - If initiation is successful, the initiating function needs - * to run libxl__ao_inprogress right before unlocking and - * returning, and return whatever it returns (AO_INPROGRESS macro). - * * - If the initiation is unsuccessful, the initiating function must * call libxl__ao_abort before unlocking and returning whatever * error code is appropriate (AO_ABORT macro). * + * If initiation is successful: + * + * - The initiating function must run libxl__ao_inprogress right + * before unlocking and returning, and return whatever it returns. + * This is best achieved with the AO_INPROGRESS macro. + * * - If the operation supports progress reports, it may generate * suitable events with NEW_EVENT and report them with * libxl__ao_progress_report (with the ctx locked). * - * - Later, some callback function, whose callback has been requested - * directly or indirectly, should call libxl__ao_complete (with the - * ctx locked, as it will generally already be in any event callback - * function). This must happen exactly once for each ao (and not if - * the ao has been destroyed, obviously). + * - Eventually, some callback function, whose callback has been + * requested directly or indirectly, should call libxl__ao_complete + * (with the ctx locked, as it will generally already be in any + * event callback function). This must happen exactly once for each + * ao, as the last that happens with that ao. + * + * - However, it is permissible for the initiating function to call + * libxl__ao_inprogress and/or libxl__ao_complete (directly or + * indirectly), before it uses AO_INPROGRESS to return. (The ao + * infrastructure will arrange to defer destruction of the ao, etc., + * until the proper time.) An initiating function should do this + * if it takes a codepath which completes synchronously. + * + * - Conversely it is forbidden to call libxl__ao_complete in the + * initiating function _after_ AO_INPROGRESS, because + * libxl__ao_complete requires the ctx to be locked. * * - Note that during callback functions, two gcs are available: * - The one in egc, whose lifetime is only this callback * - The one in ao, whose lifetime is the asynchronous operation - * Usually callback function should use CONTAINER_OF to obtain its + * Usually a callback function should use CONTAINER_OF to obtain its * own state structure, containing a pointer to the ao. It should * then obtain the ao and use the ao's gc; this is most easily done * using the convenience macro STATE_AO_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 Mon Jun 29 02:00:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9ON4-0007Ob-6p; Mon, 29 Jun 2015 02:00:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ON2-0007OP-1P for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:28 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id D9/CA-03895-BB6A0955; Mon, 29 Jun 2015 02:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1435543225!20582632!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7565 invoked from network); 29 Jun 2015 02:00:26 -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; 29 Jun 2015 02:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OMz-0002LQ-2N for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OMy-00058X-Sx for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:24 +0000 Date: Mon, 29 Jun 2015 02:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao internal API docs: Mention synchronous ao completion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee644ba982b98e83781ee15d1c3603f577baf918 Author: Ian Jackson AuthorDate: Wed Apr 8 12:22:38 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao internal API docs: Mention synchronous ao completion This doc comment about ao lifecycle failed to mention the option of completing the ao during the initiator function. (Indeed, the most obvious reading would forbid it.) Restructure the comment, describe this situation, and generally improve the wording. Also, fix a grammar problem (missing word `a'). Reported-by: Koushik Chakravarty Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_internal.h | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5594b54..6120d78 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1954,28 +1954,41 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); * must be copied into the per-operation structure using * libxl__ao_progress_gethow. * - * - If initiation is successful, the initiating function needs - * to run libxl__ao_inprogress right before unlocking and - * returning, and return whatever it returns (AO_INPROGRESS macro). - * * - If the initiation is unsuccessful, the initiating function must * call libxl__ao_abort before unlocking and returning whatever * error code is appropriate (AO_ABORT macro). * + * If initiation is successful: + * + * - The initiating function must run libxl__ao_inprogress right + * before unlocking and returning, and return whatever it returns. + * This is best achieved with the AO_INPROGRESS macro. + * * - If the operation supports progress reports, it may generate * suitable events with NEW_EVENT and report them with * libxl__ao_progress_report (with the ctx locked). * - * - Later, some callback function, whose callback has been requested - * directly or indirectly, should call libxl__ao_complete (with the - * ctx locked, as it will generally already be in any event callback - * function). This must happen exactly once for each ao (and not if - * the ao has been destroyed, obviously). + * - Eventually, some callback function, whose callback has been + * requested directly or indirectly, should call libxl__ao_complete + * (with the ctx locked, as it will generally already be in any + * event callback function). This must happen exactly once for each + * ao, as the last that happens with that ao. + * + * - However, it is permissible for the initiating function to call + * libxl__ao_inprogress and/or libxl__ao_complete (directly or + * indirectly), before it uses AO_INPROGRESS to return. (The ao + * infrastructure will arrange to defer destruction of the ao, etc., + * until the proper time.) An initiating function should do this + * if it takes a codepath which completes synchronously. + * + * - Conversely it is forbidden to call libxl__ao_complete in the + * initiating function _after_ AO_INPROGRESS, because + * libxl__ao_complete requires the ctx to be locked. * * - Note that during callback functions, two gcs are available: * - The one in egc, whose lifetime is only this callback * - The one in ao, whose lifetime is the asynchronous operation - * Usually callback function should use CONTAINER_OF to obtain its + * Usually a callback function should use CONTAINER_OF to obtain its * own state structure, containing a pointer to the ao. It should * then obtain the ao and use the ao's gc; this is most easily done * using the convenience macro STATE_AO_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 Mon Jun 29 02:00:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONC-0007Pq-Ak; Mon, 29 Jun 2015 02:00:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONB-0007Pd-Ke for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:37 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 6C/14-21074-5C6A0955; Mon, 29 Jun 2015 02:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435543235!17428049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22947 invoked from network); 29 Jun 2015 02:00:36 -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; 29 Jun 2015 02:00:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ON9-0002La-7d for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ON9-0005A5-6W for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:35 +0000 Date: Mon, 29 Jun 2015 02:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: switch_logdirty_done takes rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52d860d78fd38f5a0cedff771d66313b42e8b801 Author: Ian Jackson AuthorDate: Fri Dec 20 12:34:09 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: suspend: switch_logdirty_done takes rc switch_logdirty_done used to take the value to pass to libxl__xc_domain_saverestore_async_callback_done (ie, the return value from the callback). (This was mistakenly described as "ok" in the prototype, but in the definition it is "broke" and all the call sites passed 0 for success or -1 for error.) Instead, make it take a libxl error code (rc). Convert this to the suspend callback value at the end. No functional change in this patch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 600393d..fcfc5d1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1166,7 +1166,7 @@ static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, const char *watch_path, const char *event_path); static void switch_logdirty_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok); + libxl__domain_suspend_state *dss, int rc); static void logdirty_init(libxl__logdirty_switch *lds) { @@ -1244,7 +1244,7 @@ static void domain_suspend_switch_qemu_xen_traditional_logdirty out: LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); libxl__xs_transaction_abort(gc, &t); - switch_logdirty_done(egc,dss,-1); + switch_logdirty_done(egc,dss,rc); } static void domain_suspend_switch_qemu_xen_logdirty @@ -1292,7 +1292,7 @@ static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, logdirty.timeout); STATE_AO_GC(dss->ao); LOG(ERROR,"logdirty switch: wait for device model timed out"); - switch_logdirty_done(egc,dss,-1); + switch_logdirty_done(egc,dss,ERROR_FAIL); } static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, @@ -1344,17 +1344,16 @@ static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, */ libxl__xs_transaction_abort(gc, &t); - if (!rc) { - switch_logdirty_done(egc,dss,0); - } else if (rc < 0) { - LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); - switch_logdirty_done(egc,dss,-1); + if (rc <= 0) { + if (rc < 0) + LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); + switch_logdirty_done(egc,dss,rc); } } static void switch_logdirty_done(libxl__egc *egc, libxl__domain_suspend_state *dss, - int broke) + int rc) { STATE_AO_GC(dss->ao); libxl__logdirty_switch *lds = &dss->logdirty; @@ -1362,6 +1361,12 @@ static void switch_logdirty_done(libxl__egc *egc, libxl__ev_xswatch_deregister(gc, &lds->watch); libxl__ev_time_deregister(gc, &lds->timeout); + int broke; + if (rc) { + broke = -1; + } else { + broke = 0; + } libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, broke); } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:00:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONC-0007Pq-Ak; Mon, 29 Jun 2015 02:00:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONB-0007Pd-Ke for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:37 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 6C/14-21074-5C6A0955; Mon, 29 Jun 2015 02:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435543235!17428049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22947 invoked from network); 29 Jun 2015 02:00:36 -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; 29 Jun 2015 02:00:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ON9-0002La-7d for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ON9-0005A5-6W for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:35 +0000 Date: Mon, 29 Jun 2015 02:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: switch_logdirty_done takes rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52d860d78fd38f5a0cedff771d66313b42e8b801 Author: Ian Jackson AuthorDate: Fri Dec 20 12:34:09 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: suspend: switch_logdirty_done takes rc switch_logdirty_done used to take the value to pass to libxl__xc_domain_saverestore_async_callback_done (ie, the return value from the callback). (This was mistakenly described as "ok" in the prototype, but in the definition it is "broke" and all the call sites passed 0 for success or -1 for error.) Instead, make it take a libxl error code (rc). Convert this to the suspend callback value at the end. No functional change in this patch. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 600393d..fcfc5d1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1166,7 +1166,7 @@ static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, const char *watch_path, const char *event_path); static void switch_logdirty_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok); + libxl__domain_suspend_state *dss, int rc); static void logdirty_init(libxl__logdirty_switch *lds) { @@ -1244,7 +1244,7 @@ static void domain_suspend_switch_qemu_xen_traditional_logdirty out: LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); libxl__xs_transaction_abort(gc, &t); - switch_logdirty_done(egc,dss,-1); + switch_logdirty_done(egc,dss,rc); } static void domain_suspend_switch_qemu_xen_logdirty @@ -1292,7 +1292,7 @@ static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, logdirty.timeout); STATE_AO_GC(dss->ao); LOG(ERROR,"logdirty switch: wait for device model timed out"); - switch_logdirty_done(egc,dss,-1); + switch_logdirty_done(egc,dss,ERROR_FAIL); } static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, @@ -1344,17 +1344,16 @@ static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, */ libxl__xs_transaction_abort(gc, &t); - if (!rc) { - switch_logdirty_done(egc,dss,0); - } else if (rc < 0) { - LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); - switch_logdirty_done(egc,dss,-1); + if (rc <= 0) { + if (rc < 0) + LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); + switch_logdirty_done(egc,dss,rc); } } static void switch_logdirty_done(libxl__egc *egc, libxl__domain_suspend_state *dss, - int broke) + int rc) { STATE_AO_GC(dss->ao); libxl__logdirty_switch *lds = &dss->logdirty; @@ -1362,6 +1361,12 @@ static void switch_logdirty_done(libxl__egc *egc, libxl__ev_xswatch_deregister(gc, &lds->watch); libxl__ev_time_deregister(gc, &lds->timeout); + int broke; + if (rc) { + broke = -1; + } else { + broke = 0; + } libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, broke); } -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:00:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9ONO-0007SK-Ff; Mon, 29 Jun 2015 02:00:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONN-0007S1-7X for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:49 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 0A/6F-06457-0D6A0955; Mon, 29 Jun 2015 02:00:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435543246!20487728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27156 invoked from network); 29 Jun 2015 02:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONK-0002Li-GI for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONJ-0005AS-BJ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:45 +0000 Date: Mon, 29 Jun 2015 02:00:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: common suspend callbacks take rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cceade9fed78425019ffaf192b1254f50f2d79c Author: Ian Jackson AuthorDate: Fri Dec 20 12:43:17 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: suspend: common suspend callbacks take rc Change the following functions to take a libxl error code rather than a boolean "ok" value, and translate that value to the boolean expected by libxc at the last moment: domain_suspend_callback_common_done } dss->callback_common_done remus_domain_suspend_callback_common_done } domain_suspend_common_done Also, abolish domain_suspend_common_failed as domain_suspend_common_done can easily do its job and the call sites now have to supply the right rc value anyway. In domain_suspend_common_guest_suspended, change "ret" to "rc" as it contains a libxl error code. There is no functional change in this patch: the proper rc value now propagates further, but is still eventually smashed to a boolean. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Fix a leftover comment referring to domain_suspend_common_failed --- tools/libxl/libxl_dom.c | 54 ++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 30 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index fcfc5d1..72cee27 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1149,7 +1149,7 @@ out: static void domain_suspend_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc); static void domain_suspend_callback_common_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok); + libxl__domain_suspend_state *dss, int rc); /*----- complicated callback, called by xc_domain_save -----*/ @@ -1437,11 +1437,9 @@ static void suspend_common_wait_guest_check(libxl__egc *egc, static void suspend_common_wait_guest_timeout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs); -static void domain_suspend_common_failed(libxl__egc *egc, - libxl__domain_suspend_state *dss); static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, - bool ok); + int rc); static bool domain_suspend_pvcontrol_acked(const char *state) { /* any value other than "suspend", including ENOENT (i.e. !state), is OK */ @@ -1471,6 +1469,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, ret = xc_evtchn_notify(CTX->xce, dss->guest_evtchn.port); if (ret < 0) { LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); + rc = ERROR_FAIL; goto err; } @@ -1491,6 +1490,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, ret = xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); if (ret < 0) { LOGE(ERROR, "xc_domain_shutdown failed"); + rc = ERROR_FAIL; goto err; } /* The guest does not (need to) respond to this sort of request. */ @@ -1505,7 +1505,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); dss->pvcontrol.path = libxl__domain_pvcontrol_xspath(gc, domid); - if (!dss->pvcontrol.path) goto err; + if (!dss->pvcontrol.path) { rc = ERROR_FAIL; goto err; } dss->pvcontrol.ao = ao; dss->pvcontrol.what = "guest acknowledgement of suspend request"; @@ -1515,7 +1515,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, return; err: - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, rc); } static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, @@ -1525,8 +1525,8 @@ static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, STATE_AO_GC(dss->ao); /* If we should be done waiting, suspend_common_wait_guest_check * will end up calling domain_suspend_common_guest_suspended or - * domain_suspend_common_failed, both of which cancel the evtchn - * wait. So re-enable it now. */ + * domain_suspend_common_done, both of which cancel the evtchn + * wait as needed. So re-enable it now. */ libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); suspend_common_wait_guest_check(egc, dss); } @@ -1591,7 +1591,7 @@ static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, err: libxl__xs_transaction_abort(gc, &t); - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, rc); return; } @@ -1615,7 +1615,7 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, return; err: - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, rc); } static void suspend_common_wait_guest_watch(libxl__egc *egc, @@ -1665,7 +1665,7 @@ static void suspend_common_wait_guest_check(libxl__egc *egc, return; err: - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, ERROR_FAIL); } static void suspend_common_wait_guest_timeout(libxl__egc *egc, @@ -1674,46 +1674,40 @@ static void suspend_common_wait_guest_timeout(libxl__egc *egc, libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, guest_timeout); STATE_AO_GC(dss->ao); LOG(ERROR, "guest did not suspend, timed out"); - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, ERROR_GUEST_TIMEDOUT); } static void domain_suspend_common_guest_suspended(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); - int ret; + int rc; libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); if (dss->hvm) { - ret = libxl__domain_suspend_device_model(gc, dss); - if (ret) { - LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); - domain_suspend_common_failed(egc, dss); + rc = libxl__domain_suspend_device_model(gc, dss); + if (rc) { + LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", rc); + domain_suspend_common_done(egc, dss, rc); return; } } - domain_suspend_common_done(egc, dss, 1); -} - -static void domain_suspend_common_failed(libxl__egc *egc, - libxl__domain_suspend_state *dss) -{ domain_suspend_common_done(egc, dss, 0); } static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, - bool ok) + int rc) { EGC_GC; assert(!libxl__xswait_inuse(&dss->pvcontrol)); libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); - dss->callback_common_done(egc, dss, ok); + dss->callback_common_done(egc, dss, rc); } static inline char *physmap_path(libxl__gc *gc, uint32_t dm_domid, @@ -1830,9 +1824,9 @@ static void libxl__domain_suspend_callback(void *data) } static void domain_suspend_callback_common_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok) + libxl__domain_suspend_state *dss, int rc) { - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } /*----- remus callbacks -----*/ @@ -1856,9 +1850,9 @@ static void libxl__remus_domain_suspend_callback(void *data) } static void remus_domain_suspend_callback_common_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok) + libxl__domain_suspend_state *dss, int rc) { - if (!ok) + if (rc) goto out; libxl__remus_devices_state *const rds = &dss->rds; @@ -1867,7 +1861,7 @@ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, return; out: - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } static void remus_devices_postsuspend_cb(libxl__egc *egc, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:00:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:00: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 1Z9ONO-0007SK-Ff; Mon, 29 Jun 2015 02:00:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONN-0007S1-7X for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:49 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 0A/6F-06457-0D6A0955; Mon, 29 Jun 2015 02:00:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435543246!20487728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27156 invoked from network); 29 Jun 2015 02:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONK-0002Li-GI for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONJ-0005AS-BJ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:45 +0000 Date: Mon, 29 Jun 2015 02:00:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: common suspend callbacks take rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cceade9fed78425019ffaf192b1254f50f2d79c Author: Ian Jackson AuthorDate: Fri Dec 20 12:43:17 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: suspend: common suspend callbacks take rc Change the following functions to take a libxl error code rather than a boolean "ok" value, and translate that value to the boolean expected by libxc at the last moment: domain_suspend_callback_common_done } dss->callback_common_done remus_domain_suspend_callback_common_done } domain_suspend_common_done Also, abolish domain_suspend_common_failed as domain_suspend_common_done can easily do its job and the call sites now have to supply the right rc value anyway. In domain_suspend_common_guest_suspended, change "ret" to "rc" as it contains a libxl error code. There is no functional change in this patch: the proper rc value now propagates further, but is still eventually smashed to a boolean. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Fix a leftover comment referring to domain_suspend_common_failed --- tools/libxl/libxl_dom.c | 54 ++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 30 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index fcfc5d1..72cee27 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1149,7 +1149,7 @@ out: static void domain_suspend_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc); static void domain_suspend_callback_common_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok); + libxl__domain_suspend_state *dss, int rc); /*----- complicated callback, called by xc_domain_save -----*/ @@ -1437,11 +1437,9 @@ static void suspend_common_wait_guest_check(libxl__egc *egc, static void suspend_common_wait_guest_timeout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs); -static void domain_suspend_common_failed(libxl__egc *egc, - libxl__domain_suspend_state *dss); static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, - bool ok); + int rc); static bool domain_suspend_pvcontrol_acked(const char *state) { /* any value other than "suspend", including ENOENT (i.e. !state), is OK */ @@ -1471,6 +1469,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, ret = xc_evtchn_notify(CTX->xce, dss->guest_evtchn.port); if (ret < 0) { LOG(ERROR, "xc_evtchn_notify failed ret=%d", ret); + rc = ERROR_FAIL; goto err; } @@ -1491,6 +1490,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, ret = xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); if (ret < 0) { LOGE(ERROR, "xc_domain_shutdown failed"); + rc = ERROR_FAIL; goto err; } /* The guest does not (need to) respond to this sort of request. */ @@ -1505,7 +1505,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, libxl__domain_pvcontrol_write(gc, XBT_NULL, domid, "suspend"); dss->pvcontrol.path = libxl__domain_pvcontrol_xspath(gc, domid); - if (!dss->pvcontrol.path) goto err; + if (!dss->pvcontrol.path) { rc = ERROR_FAIL; goto err; } dss->pvcontrol.ao = ao; dss->pvcontrol.what = "guest acknowledgement of suspend request"; @@ -1515,7 +1515,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, return; err: - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, rc); } static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, @@ -1525,8 +1525,8 @@ static void domain_suspend_common_wait_guest_evtchn(libxl__egc *egc, STATE_AO_GC(dss->ao); /* If we should be done waiting, suspend_common_wait_guest_check * will end up calling domain_suspend_common_guest_suspended or - * domain_suspend_common_failed, both of which cancel the evtchn - * wait. So re-enable it now. */ + * domain_suspend_common_done, both of which cancel the evtchn + * wait as needed. So re-enable it now. */ libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); suspend_common_wait_guest_check(egc, dss); } @@ -1591,7 +1591,7 @@ static void domain_suspend_common_pvcontrol_suspending(libxl__egc *egc, err: libxl__xs_transaction_abort(gc, &t); - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, rc); return; } @@ -1615,7 +1615,7 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, return; err: - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, rc); } static void suspend_common_wait_guest_watch(libxl__egc *egc, @@ -1665,7 +1665,7 @@ static void suspend_common_wait_guest_check(libxl__egc *egc, return; err: - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, ERROR_FAIL); } static void suspend_common_wait_guest_timeout(libxl__egc *egc, @@ -1674,46 +1674,40 @@ static void suspend_common_wait_guest_timeout(libxl__egc *egc, libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, guest_timeout); STATE_AO_GC(dss->ao); LOG(ERROR, "guest did not suspend, timed out"); - domain_suspend_common_failed(egc, dss); + domain_suspend_common_done(egc, dss, ERROR_GUEST_TIMEDOUT); } static void domain_suspend_common_guest_suspended(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); - int ret; + int rc; libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); if (dss->hvm) { - ret = libxl__domain_suspend_device_model(gc, dss); - if (ret) { - LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", ret); - domain_suspend_common_failed(egc, dss); + rc = libxl__domain_suspend_device_model(gc, dss); + if (rc) { + LOG(ERROR, "libxl__domain_suspend_device_model failed ret=%d", rc); + domain_suspend_common_done(egc, dss, rc); return; } } - domain_suspend_common_done(egc, dss, 1); -} - -static void domain_suspend_common_failed(libxl__egc *egc, - libxl__domain_suspend_state *dss) -{ domain_suspend_common_done(egc, dss, 0); } static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, - bool ok) + int rc) { EGC_GC; assert(!libxl__xswait_inuse(&dss->pvcontrol)); libxl__ev_evtchn_cancel(gc, &dss->guest_evtchn); libxl__ev_xswatch_deregister(gc, &dss->guest_watch); libxl__ev_time_deregister(gc, &dss->guest_timeout); - dss->callback_common_done(egc, dss, ok); + dss->callback_common_done(egc, dss, rc); } static inline char *physmap_path(libxl__gc *gc, uint32_t dm_domid, @@ -1830,9 +1824,9 @@ static void libxl__domain_suspend_callback(void *data) } static void domain_suspend_callback_common_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok) + libxl__domain_suspend_state *dss, int rc) { - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } /*----- remus callbacks -----*/ @@ -1856,9 +1850,9 @@ static void libxl__remus_domain_suspend_callback(void *data) } static void remus_domain_suspend_callback_common_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int ok) + libxl__domain_suspend_state *dss, int rc) { - if (!ok) + if (rc) goto out; libxl__remus_devices_state *const rds = &dss->rds; @@ -1867,7 +1861,7 @@ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, return; out: - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } static void remus_devices_postsuspend_cb(libxl__egc *egc, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:01:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONY-0007Th-IG; Mon, 29 Jun 2015 02:01:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONX-0007TU-N0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:59 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 1F/6F-01469-BD6A0955; Mon, 29 Jun 2015 02:00:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1435543256!26515473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7229 invoked from network); 29 Jun 2015 02:00:57 -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; 29 Jun 2015 02:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONU-0002Lp-NW for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONU-0005As-KX for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:56 +0000 Date: Mon, 29 Jun 2015 02:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Return correct error from callbacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72e00fb6c9e5a93f4001cf98fd3a7064be53a9a0 Author: Ian Jackson AuthorDate: Fri Dec 20 12:49:53 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: suspend: Return correct error from callbacks If a suspend callback fails, it has a libxl error code in its hand. However we must return to libxc the values that libxc expects. So we stash the libxl error code in dss->rc and fish it out again after libxc returns from the suspend call. While we're here, abolish the now-redundant `ok' variable in remus_devices_postsuspend_cb. The overall functional change is that libxl_domain_save now completes with the correct error code as determined when the underlying failure happened. (Usually this is, still, ERROR_FAIL.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Add cleanup in remus_devices_postsuspend_cb. --- tools/libxl/libxl_dom.c | 22 ++++++++++++++++------ tools/libxl/libxl_internal.h | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 72cee27..54908fb 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1261,6 +1261,7 @@ static void domain_suspend_switch_qemu_xen_logdirty libxl__xc_domain_saverestore_async_callback_done(egc, shs, 0); } else { LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1); } } @@ -1283,6 +1284,7 @@ void libxl__domain_suspend_common_switch_qemu_logdirty default: LOG(ERROR,"logdirty switch failed" ", no valid device model version found, aborting suspend"); + dss->rc = ERROR_FAIL; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1); } } @@ -1364,6 +1366,7 @@ static void switch_logdirty_done(libxl__egc *egc, int broke; if (rc) { broke = -1; + dss->rc = rc; } else { broke = 0; } @@ -1826,6 +1829,7 @@ static void libxl__domain_suspend_callback(void *data) static void domain_suspend_callback_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { + dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } @@ -1861,6 +1865,7 @@ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, return; out: + dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } @@ -1868,16 +1873,17 @@ static void remus_devices_postsuspend_cb(libxl__egc *egc, libxl__remus_devices_state *rds, int rc) { - int ok = 0; libxl__domain_suspend_state *dss = CONTAINER_OF(rds, *dss, rds); if (rc) goto out; - ok = 1; + rc = 0; out: - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + if (rc) + dss->rc = rc; + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } static void libxl__remus_domain_resume_callback(void *data) @@ -1896,7 +1902,6 @@ static void remus_devices_preresume_cb(libxl__egc *egc, libxl__remus_devices_state *rds, int rc) { - int ok = 0; libxl__domain_suspend_state *dss = CONTAINER_OF(rds, *dss, rds); STATE_AO_GC(dss->ao); @@ -1908,10 +1913,12 @@ static void remus_devices_preresume_cb(libxl__egc *egc, if (rc) goto out; - ok = 1; + rc = 0; out: - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + if (rc) + dss->rc = rc; + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } /*----- remus asynchronous checkpoint callback -----*/ @@ -2029,6 +2036,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) libxl__srm_save_autogen_callbacks *const callbacks = &dss->shs.callbacks.save.a; + dss->rc = 0; logdirty_init(&dss->logdirty); libxl__xswait_init(&dss->pvcontrol); libxl__ev_evtchn_init(&dss->guest_evtchn); @@ -2117,6 +2125,8 @@ void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, "domain did not respond to suspend request"); if ( !dss->guest_responded ) rc = ERROR_GUEST_TIMEDOUT; + else if (dss->rc) + rc = dss->rc; else rc = ERROR_FAIL; goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6120d78..a60e54a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2863,6 +2863,7 @@ struct libxl__domain_suspend_state { int debug; const libxl_domain_remus_info *remus; /* private */ + int rc; libxl__ev_evtchn guest_evtchn; int guest_evtchn_lockfd; int hvm; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONY-0007Th-IG; Mon, 29 Jun 2015 02:01:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONX-0007TU-N0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:59 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 1F/6F-01469-BD6A0955; Mon, 29 Jun 2015 02:00:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1435543256!26515473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7229 invoked from network); 29 Jun 2015 02:00:57 -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; 29 Jun 2015 02:00:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONU-0002Lp-NW for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONU-0005As-KX for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:00:56 +0000 Date: Mon, 29 Jun 2015 02:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suspend: Return correct error from callbacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72e00fb6c9e5a93f4001cf98fd3a7064be53a9a0 Author: Ian Jackson AuthorDate: Fri Dec 20 12:49:53 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: suspend: Return correct error from callbacks If a suspend callback fails, it has a libxl error code in its hand. However we must return to libxc the values that libxc expects. So we stash the libxl error code in dss->rc and fish it out again after libxc returns from the suspend call. While we're here, abolish the now-redundant `ok' variable in remus_devices_postsuspend_cb. The overall functional change is that libxl_domain_save now completes with the correct error code as determined when the underlying failure happened. (Usually this is, still, ERROR_FAIL.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Add cleanup in remus_devices_postsuspend_cb. --- tools/libxl/libxl_dom.c | 22 ++++++++++++++++------ tools/libxl/libxl_internal.h | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 72cee27..54908fb 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1261,6 +1261,7 @@ static void domain_suspend_switch_qemu_xen_logdirty libxl__xc_domain_saverestore_async_callback_done(egc, shs, 0); } else { LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1); } } @@ -1283,6 +1284,7 @@ void libxl__domain_suspend_common_switch_qemu_logdirty default: LOG(ERROR,"logdirty switch failed" ", no valid device model version found, aborting suspend"); + dss->rc = ERROR_FAIL; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1); } } @@ -1364,6 +1366,7 @@ static void switch_logdirty_done(libxl__egc *egc, int broke; if (rc) { broke = -1; + dss->rc = rc; } else { broke = 0; } @@ -1826,6 +1829,7 @@ static void libxl__domain_suspend_callback(void *data) static void domain_suspend_callback_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { + dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } @@ -1861,6 +1865,7 @@ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, return; out: + dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } @@ -1868,16 +1873,17 @@ static void remus_devices_postsuspend_cb(libxl__egc *egc, libxl__remus_devices_state *rds, int rc) { - int ok = 0; libxl__domain_suspend_state *dss = CONTAINER_OF(rds, *dss, rds); if (rc) goto out; - ok = 1; + rc = 0; out: - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + if (rc) + dss->rc = rc; + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } static void libxl__remus_domain_resume_callback(void *data) @@ -1896,7 +1902,6 @@ static void remus_devices_preresume_cb(libxl__egc *egc, libxl__remus_devices_state *rds, int rc) { - int ok = 0; libxl__domain_suspend_state *dss = CONTAINER_OF(rds, *dss, rds); STATE_AO_GC(dss->ao); @@ -1908,10 +1913,12 @@ static void remus_devices_preresume_cb(libxl__egc *egc, if (rc) goto out; - ok = 1; + rc = 0; out: - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, ok); + if (rc) + dss->rc = rc; + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } /*----- remus asynchronous checkpoint callback -----*/ @@ -2029,6 +2036,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) libxl__srm_save_autogen_callbacks *const callbacks = &dss->shs.callbacks.save.a; + dss->rc = 0; logdirty_init(&dss->logdirty); libxl__xswait_init(&dss->pvcontrol); libxl__ev_evtchn_init(&dss->guest_evtchn); @@ -2117,6 +2125,8 @@ void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, "domain did not respond to suspend request"); if ( !dss->guest_responded ) rc = ERROR_GUEST_TIMEDOUT; + else if (dss->rc) + rc = dss->rc; else rc = ERROR_FAIL; goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6120d78..a60e54a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2863,6 +2863,7 @@ struct libxl__domain_suspend_state { int debug; const libxl_domain_remus_info *remus; /* private */ + int rc; libxl__ev_evtchn guest_evtchn; int guest_evtchn_lockfd; int hvm; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONi-0007V2-Ks; Mon, 29 Jun 2015 02:01:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONh-0007Us-SO for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:10 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id C1/D9-28408-5E6A0955; Mon, 29 Jun 2015 02:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1435543267!19355351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26247 invoked from network); 29 Jun 2015 02:01:07 -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; 29 Jun 2015 02:01:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONe-0002MT-TT for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONe-0005Bj-SU for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:06 +0000 Date: Mon, 29 Jun 2015 02:01:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use libxl__xswait* in libxl__ao_device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 082397e5bf5c9e28d233074093239652f1f58d33 Author: Ian Jackson AuthorDate: Fri Dec 20 14:49:21 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Use libxl__xswait* in libxl__ao_device Replace the separate timeout and xenstore watch with use of libxl__xswait*. Different control flow, but no ultimate functional change apart from slight changes to the text of error messages. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 64 ++++++++++++------------------------------ tools/libxl/libxl_internal.h | 2 +- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 93bb41e..8352cfb 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -450,7 +450,7 @@ void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev) * Initialize xs_watch, because it's not used on all possible * execution paths, but it's unconditionally destroyed when finished. */ - libxl__ev_xswatch_init(&aodev->xs_watch); + libxl__xswait_init(&aodev->xswait); aodev->active = 1; /* We init this here because we might call device_hotplug_done * without actually calling any hotplug script */ @@ -731,13 +731,9 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__async_exec_state *aes, int status); -static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); - static void device_destroy_be_watch_cb(libxl__egc *egc, - libxl__ev_xswatch *watch, - const char *watch_path, - const char *event_path); + libxl__xswait_state *xswait, + int rc, const char *data); static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); @@ -988,22 +984,14 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->action != LIBXL__DEVICE_ACTION_REMOVE) goto out; - rc = libxl__ev_time_register_rel(gc, &aodev->timeout, - device_destroy_be_timeout_cb, - LIBXL_DESTROY_TIMEOUT * 1000); - if (rc) { - LOG(ERROR, "setup of xs watch timeout failed"); - goto out; - } - - rc = libxl__ev_xswatch_register(gc, &aodev->xs_watch, - device_destroy_be_watch_cb, - be_path); - if (rc) { - LOG(ERROR, "setup of xs watch for %s failed", be_path); - libxl__ev_time_deregister(gc, &aodev->timeout); + aodev->xswait.ao = ao; + aodev->xswait.what = "removal of backend path"; + aodev->xswait.path = be_path; + aodev->xswait.timeout_ms = LIBXL_DESTROY_TIMEOUT * 1000; + aodev->xswait.callback = device_destroy_be_watch_cb; + rc = libxl__xswait_start(gc, &aodev->xswait); + if (rc) goto out; - } return; } @@ -1101,37 +1089,21 @@ error: device_hotplug_done(egc, aodev); } -static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) -{ - libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); - STATE_AO_GC(aodev->ao); - - LOG(ERROR, "timed out while waiting for %s to be removed", - libxl__device_backend_path(gc, aodev->dev)); - - aodev->rc = ERROR_TIMEDOUT; - - device_hotplug_done(egc, aodev); - return; -} - static void device_destroy_be_watch_cb(libxl__egc *egc, - libxl__ev_xswatch *watch, - const char *watch_path, - const char *event_path) + libxl__xswait_state *xswait, + int rc, const char *dir) { - libxl__ao_device *aodev = CONTAINER_OF(watch, *aodev, xs_watch); + libxl__ao_device *aodev = CONTAINER_OF(xswait, *aodev, xswait); STATE_AO_GC(aodev->ao); - const char *dir; - int rc; - rc = libxl__xs_read_checked(gc, XBT_NULL, watch_path, &dir); if (rc) { - LOG(ERROR, "unable to read backend path: %s", watch_path); + if (rc == ERROR_TIMEDOUT) + LOG(ERROR, "timed out while waiting for %s to be removed", + xswait->path); aodev->rc = rc; goto out; } + if (dir) { /* backend path still exists, wait a little longer... */ return; @@ -1164,7 +1136,7 @@ static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev) { /* Clean events and check reentrancy */ libxl__ev_time_deregister(gc, &aodev->timeout); - libxl__ev_xswatch_deregister(gc, &aodev->xs_watch); + libxl__xswait_stop(gc, &aodev->xswait); assert(!libxl__async_exec_inuse(&aodev->aes)); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a60e54a..b590966 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2210,7 +2210,7 @@ struct libxl__ao_device { /* Bodge for Qemu devices */ libxl__ev_time timeout; /* xenstore watch for backend path of driver domains */ - libxl__ev_xswatch xs_watch; + libxl__xswait_state xswait; int num_exec; /* for calling hotplug scripts */ libxl__async_exec_state aes; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONi-0007V2-Ks; Mon, 29 Jun 2015 02:01:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONh-0007Us-SO for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:10 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id C1/D9-28408-5E6A0955; Mon, 29 Jun 2015 02:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1435543267!19355351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26247 invoked from network); 29 Jun 2015 02:01:07 -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; 29 Jun 2015 02:01:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONe-0002MT-TT for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONe-0005Bj-SU for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:06 +0000 Date: Mon, 29 Jun 2015 02:01:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use libxl__xswait* in libxl__ao_device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 082397e5bf5c9e28d233074093239652f1f58d33 Author: Ian Jackson AuthorDate: Fri Dec 20 14:49:21 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Use libxl__xswait* in libxl__ao_device Replace the separate timeout and xenstore watch with use of libxl__xswait*. Different control flow, but no ultimate functional change apart from slight changes to the text of error messages. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 64 ++++++++++++------------------------------ tools/libxl/libxl_internal.h | 2 +- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 93bb41e..8352cfb 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -450,7 +450,7 @@ void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev) * Initialize xs_watch, because it's not used on all possible * execution paths, but it's unconditionally destroyed when finished. */ - libxl__ev_xswatch_init(&aodev->xs_watch); + libxl__xswait_init(&aodev->xswait); aodev->active = 1; /* We init this here because we might call device_hotplug_done * without actually calling any hotplug script */ @@ -731,13 +731,9 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__async_exec_state *aes, int status); -static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); - static void device_destroy_be_watch_cb(libxl__egc *egc, - libxl__ev_xswatch *watch, - const char *watch_path, - const char *event_path); + libxl__xswait_state *xswait, + int rc, const char *data); static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); @@ -988,22 +984,14 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->action != LIBXL__DEVICE_ACTION_REMOVE) goto out; - rc = libxl__ev_time_register_rel(gc, &aodev->timeout, - device_destroy_be_timeout_cb, - LIBXL_DESTROY_TIMEOUT * 1000); - if (rc) { - LOG(ERROR, "setup of xs watch timeout failed"); - goto out; - } - - rc = libxl__ev_xswatch_register(gc, &aodev->xs_watch, - device_destroy_be_watch_cb, - be_path); - if (rc) { - LOG(ERROR, "setup of xs watch for %s failed", be_path); - libxl__ev_time_deregister(gc, &aodev->timeout); + aodev->xswait.ao = ao; + aodev->xswait.what = "removal of backend path"; + aodev->xswait.path = be_path; + aodev->xswait.timeout_ms = LIBXL_DESTROY_TIMEOUT * 1000; + aodev->xswait.callback = device_destroy_be_watch_cb; + rc = libxl__xswait_start(gc, &aodev->xswait); + if (rc) goto out; - } return; } @@ -1101,37 +1089,21 @@ error: device_hotplug_done(egc, aodev); } -static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) -{ - libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); - STATE_AO_GC(aodev->ao); - - LOG(ERROR, "timed out while waiting for %s to be removed", - libxl__device_backend_path(gc, aodev->dev)); - - aodev->rc = ERROR_TIMEDOUT; - - device_hotplug_done(egc, aodev); - return; -} - static void device_destroy_be_watch_cb(libxl__egc *egc, - libxl__ev_xswatch *watch, - const char *watch_path, - const char *event_path) + libxl__xswait_state *xswait, + int rc, const char *dir) { - libxl__ao_device *aodev = CONTAINER_OF(watch, *aodev, xs_watch); + libxl__ao_device *aodev = CONTAINER_OF(xswait, *aodev, xswait); STATE_AO_GC(aodev->ao); - const char *dir; - int rc; - rc = libxl__xs_read_checked(gc, XBT_NULL, watch_path, &dir); if (rc) { - LOG(ERROR, "unable to read backend path: %s", watch_path); + if (rc == ERROR_TIMEDOUT) + LOG(ERROR, "timed out while waiting for %s to be removed", + xswait->path); aodev->rc = rc; goto out; } + if (dir) { /* backend path still exists, wait a little longer... */ return; @@ -1164,7 +1136,7 @@ static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev) { /* Clean events and check reentrancy */ libxl__ev_time_deregister(gc, &aodev->timeout); - libxl__ev_xswatch_deregister(gc, &aodev->xs_watch); + libxl__xswait_stop(gc, &aodev->xswait); assert(!libxl__async_exec_inuse(&aodev->aes)); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a60e54a..b590966 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2210,7 +2210,7 @@ struct libxl__ao_device { /* Bodge for Qemu devices */ libxl__ev_time timeout; /* xenstore watch for backend path of driver domains */ - libxl__ev_xswatch xs_watch; + libxl__xswait_state xswait; int num_exec; /* for calling hotplug scripts */ libxl__async_exec_state aes; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONs-0007Wd-NM; Mon, 29 Jun 2015 02:01:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONr-0007WS-NI for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:19 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 70/97-16518-EE6A0955; Mon, 29 Jun 2015 02:01:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1435543277!20582763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11930 invoked from network); 29 Jun 2015 02:01:18 -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; 29 Jun 2015 02:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONp-0002Mb-5J for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONp-0005C8-1G for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:17 +0000 Date: Mon, 29 Jun 2015 02:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: xswait/devstate: Move xswait to before devstate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 66cd5879f5a67a59c3263eaa9ad2e219d8001680 Author: Ian Jackson AuthorDate: Fri Dec 20 14:55:57 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: xswait/devstate: Move xswait to before devstate Pure code motion. We are going to make devstate use xswait. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 109 +++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 54 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index b590966..af2111f 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1116,6 +1116,61 @@ _hidden const char *libxl__device_nic_devname(libxl__gc *gc, _hidden int libxl__get_domid(libxl__gc *gc, uint32_t *domid); +/*----- xswait: wait for a xenstore node to be suitable -----*/ + +typedef struct libxl__xswait_state libxl__xswait_state; + +/* + * rc describes the circumstances of this callback: + * + * rc==0 + * + * The xenstore path (may have) changed. It has been read for + * you. The result is in data (allocated from the ao gc). + * data may be NULL, which means that the xenstore read gave + * ENOENT. + * + * If you are satisfied, you MUST call libxl__xswait_stop. + * Otherwise, xswait will continue waiting and watching and + * will call you back later. + * + * rc==ERROR_TIMEDOUT + * + * The specified timeout was reached. + * This has NOT been logged (except to the debug log). + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + * rc!=0, !=ERROR_TIMEDOUT + * + * Some other error occurred. + * This HAS been logged. + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + * xswait.path may start with with '@', in which case no read is done + * and the callback will always get data==0. + */ +typedef void libxl__xswait_callback(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *data); + +struct libxl__xswait_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + const char *what; /* for error msgs: noun phrase, what we're waiting for */ + const char *path; + int timeout_ms; /* as for poll(2) */ + libxl__xswait_callback *callback; + /* remaining fields are private to xswait */ + libxl__ev_time time_ev; + libxl__ev_xswatch watch_ev; +}; + +void libxl__xswait_init(libxl__xswait_state*); +void libxl__xswait_stop(libxl__gc*, libxl__xswait_state*); /*idempotent*/ +bool libxl__xswait_inuse(const libxl__xswait_state *ss); + +int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); + + /* * libxl__ev_devstate - waits a given time for a device to * reach a given state. Follows the libxl_ev_* conventions. @@ -1213,60 +1268,6 @@ _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); _hidden int libxl__device_dt_add(libxl__gc *gc, uint32_t domid, const libxl_device_dtdev *dtdev); -/*----- xswait: wait for a xenstore node to be suitable -----*/ - -typedef struct libxl__xswait_state libxl__xswait_state; - -/* - * rc describes the circumstances of this callback: - * - * rc==0 - * - * The xenstore path (may have) changed. It has been read for - * you. The result is in data (allocated from the ao gc). - * data may be NULL, which means that the xenstore read gave - * ENOENT. - * - * If you are satisfied, you MUST call libxl__xswait_stop. - * Otherwise, xswait will continue waiting and watching and - * will call you back later. - * - * rc==ERROR_TIMEDOUT - * - * The specified timeout was reached. - * This has NOT been logged (except to the debug log). - * xswait will not continue (but calling libxl__xswait_stop is OK). - * - * rc!=0, !=ERROR_TIMEDOUT - * - * Some other error occurred. - * This HAS been logged. - * xswait will not continue (but calling libxl__xswait_stop is OK). - * - * xswait.path may start with with '@', in which case no read is done - * and the callback will always get data==0. - */ -typedef void libxl__xswait_callback(libxl__egc *egc, - libxl__xswait_state *xswa, int rc, const char *data); - -struct libxl__xswait_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - const char *what; /* for error msgs: noun phrase, what we're waiting for */ - const char *path; - int timeout_ms; /* as for poll(2) */ - libxl__xswait_callback *callback; - /* remaining fields are private to xswait */ - libxl__ev_time time_ev; - libxl__ev_xswatch watch_ev; -}; - -void libxl__xswait_init(libxl__xswait_state*); -void libxl__xswait_stop(libxl__gc*, libxl__xswait_state*); /*idempotent*/ -bool libxl__xswait_inuse(const libxl__xswait_state *ss); - -int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); - /* *----- spawn ----- * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:01:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONs-0007Wd-NM; Mon, 29 Jun 2015 02:01:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONr-0007WS-NI for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:19 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 70/97-16518-EE6A0955; Mon, 29 Jun 2015 02:01:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1435543277!20582763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11930 invoked from network); 29 Jun 2015 02:01:18 -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; 29 Jun 2015 02:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONp-0002Mb-5J for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONp-0005C8-1G for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:17 +0000 Date: Mon, 29 Jun 2015 02:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: xswait/devstate: Move xswait to before devstate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 66cd5879f5a67a59c3263eaa9ad2e219d8001680 Author: Ian Jackson AuthorDate: Fri Dec 20 14:55:57 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: xswait/devstate: Move xswait to before devstate Pure code motion. We are going to make devstate use xswait. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 109 +++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 54 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index b590966..af2111f 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1116,6 +1116,61 @@ _hidden const char *libxl__device_nic_devname(libxl__gc *gc, _hidden int libxl__get_domid(libxl__gc *gc, uint32_t *domid); +/*----- xswait: wait for a xenstore node to be suitable -----*/ + +typedef struct libxl__xswait_state libxl__xswait_state; + +/* + * rc describes the circumstances of this callback: + * + * rc==0 + * + * The xenstore path (may have) changed. It has been read for + * you. The result is in data (allocated from the ao gc). + * data may be NULL, which means that the xenstore read gave + * ENOENT. + * + * If you are satisfied, you MUST call libxl__xswait_stop. + * Otherwise, xswait will continue waiting and watching and + * will call you back later. + * + * rc==ERROR_TIMEDOUT + * + * The specified timeout was reached. + * This has NOT been logged (except to the debug log). + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + * rc!=0, !=ERROR_TIMEDOUT + * + * Some other error occurred. + * This HAS been logged. + * xswait will not continue (but calling libxl__xswait_stop is OK). + * + * xswait.path may start with with '@', in which case no read is done + * and the callback will always get data==0. + */ +typedef void libxl__xswait_callback(libxl__egc *egc, + libxl__xswait_state *xswa, int rc, const char *data); + +struct libxl__xswait_state { + /* caller must fill these in, and they must all remain valid */ + libxl__ao *ao; + const char *what; /* for error msgs: noun phrase, what we're waiting for */ + const char *path; + int timeout_ms; /* as for poll(2) */ + libxl__xswait_callback *callback; + /* remaining fields are private to xswait */ + libxl__ev_time time_ev; + libxl__ev_xswatch watch_ev; +}; + +void libxl__xswait_init(libxl__xswait_state*); +void libxl__xswait_stop(libxl__gc*, libxl__xswait_state*); /*idempotent*/ +bool libxl__xswait_inuse(const libxl__xswait_state *ss); + +int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); + + /* * libxl__ev_devstate - waits a given time for a device to * reach a given state. Follows the libxl_ev_* conventions. @@ -1213,60 +1268,6 @@ _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); _hidden int libxl__device_dt_add(libxl__gc *gc, uint32_t domid, const libxl_device_dtdev *dtdev); -/*----- xswait: wait for a xenstore node to be suitable -----*/ - -typedef struct libxl__xswait_state libxl__xswait_state; - -/* - * rc describes the circumstances of this callback: - * - * rc==0 - * - * The xenstore path (may have) changed. It has been read for - * you. The result is in data (allocated from the ao gc). - * data may be NULL, which means that the xenstore read gave - * ENOENT. - * - * If you are satisfied, you MUST call libxl__xswait_stop. - * Otherwise, xswait will continue waiting and watching and - * will call you back later. - * - * rc==ERROR_TIMEDOUT - * - * The specified timeout was reached. - * This has NOT been logged (except to the debug log). - * xswait will not continue (but calling libxl__xswait_stop is OK). - * - * rc!=0, !=ERROR_TIMEDOUT - * - * Some other error occurred. - * This HAS been logged. - * xswait will not continue (but calling libxl__xswait_stop is OK). - * - * xswait.path may start with with '@', in which case no read is done - * and the callback will always get data==0. - */ -typedef void libxl__xswait_callback(libxl__egc *egc, - libxl__xswait_state *xswa, int rc, const char *data); - -struct libxl__xswait_state { - /* caller must fill these in, and they must all remain valid */ - libxl__ao *ao; - const char *what; /* for error msgs: noun phrase, what we're waiting for */ - const char *path; - int timeout_ms; /* as for poll(2) */ - libxl__xswait_callback *callback; - /* remaining fields are private to xswait */ - libxl__ev_time time_ev; - libxl__ev_xswatch watch_ev; -}; - -void libxl__xswait_init(libxl__xswait_state*); -void libxl__xswait_stop(libxl__gc*, libxl__xswait_state*); /*idempotent*/ -bool libxl__xswait_inuse(const libxl__xswait_state *ss); - -int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); - /* *----- spawn ----- * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:01:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01: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 1Z9OO2-0007YS-Rx; Mon, 29 Jun 2015 02:01:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OO1-0007YB-Qt for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:30 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 88/A5-21325-9F6A0955; Mon, 29 Jun 2015 02:01:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1435543287!13324459!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12350 invoked from network); 29 Jun 2015 02:01:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:01:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONz-0002Mj-B7 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONz-0005Cx-9p for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:27 +0000 Date: Mon, 29 Jun 2015 02:01:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: devstate: Use libxl__xswait* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfcace69513fd657cf04316dcd03d71ce27b13a7 Author: Ian Jackson AuthorDate: Fri Dec 20 15:04:34 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: devstate: Use libxl__xswait* Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: Initialise ds->w.ao --- tools/libxl/libxl_device.c | 4 +- tools/libxl/libxl_event.c | 79 ++++++++++++++++++----------------------- tools/libxl/libxl_internal.h | 11 ++---- 3 files changed, 41 insertions(+), 53 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 8352cfb..951d125 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -758,7 +758,7 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) return; } - rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + rc = libxl__ev_devstate_wait(ao, &aodev->backend_ds, device_backend_callback, state_path, XenbusStateInitWait, LIBXL_INIT_TIMEOUT * 1000); @@ -859,7 +859,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, if (rc < 0) goto out; } - rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + rc = libxl__ev_devstate_wait(ao, &aodev->backend_ds, device_backend_callback, state_path, XenbusStateClosed, LIBXL_DESTROY_TIMEOUT * 1000); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 9ff4e78..3b45148 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -816,68 +816,59 @@ void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev) * waiting for device state */ -static void devstate_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, - const char *watch_path, const char *event_path) +static void devstate_callback(libxl__egc *egc, libxl__xswait_state *xsw, + int rc, const char *sstate) { EGC_GC; - libxl__ev_devstate *ds = CONTAINER_OF(watch, *ds, watch); - int rc; + libxl__ev_devstate *ds = CONTAINER_OF(xsw, *ds, w); - char *sstate = libxl__xs_read(gc, XBT_NULL, watch_path); + if (rc) { + if (rc == ERROR_TIMEDOUT) + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d " + " timed out", ds->w.path, ds->wanted); + goto out; + } if (!sstate) { - if (errno == ENOENT) { - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" - " but it was removed", watch_path, ds->wanted); - rc = ERROR_INVAL; - } else { - LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "backend %s wanted state" - " %d but read failed", watch_path, ds->wanted); - rc = ERROR_FAIL; - } + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " but it was removed", ds->w.path, ds->wanted); + rc = ERROR_INVAL; + goto out; + } + + int got = atoi(sstate); + if (got == ds->wanted) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d ok", + ds->w.path, ds->wanted); + rc = 0; } else { - int got = atoi(sstate); - if (got == ds->wanted) { - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d ok", - watch_path, ds->wanted); - rc = 0; - } else { - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" - " still waiting state %d", watch_path, ds->wanted, got); - return; - } + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " still waiting state %d", ds->w.path, ds->wanted, got); + return; } - libxl__ev_devstate_cancel(gc, ds); - ds->callback(egc, ds, rc); -} -static void devstate_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) -{ - EGC_GC; - libxl__ev_devstate *ds = CONTAINER_OF(ev, *ds, timeout); - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d " - " timed out", ds->watch.path, ds->wanted); + out: libxl__ev_devstate_cancel(gc, ds); - ds->callback(egc, ds, ERROR_TIMEDOUT); + ds->callback(egc, ds, rc); } -int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, +int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, libxl__ev_devstate_callback cb, const char *state_path, int state, int milliseconds) { + AO_GC; int rc; - libxl__ev_time_init(&ds->timeout); - libxl__ev_xswatch_init(&ds->watch); + libxl__xswait_init(&ds->w); ds->wanted = state; ds->callback = cb; - rc = libxl__ev_time_register_rel(gc, &ds->timeout, devstate_timeout, - milliseconds); - if (rc) goto out; - - rc = libxl__ev_xswatch_register(gc, &ds->watch, devstate_watch_callback, - state_path); + ds->w.ao = ao; + ds->w.what = GCSPRINTF("backend %s (hoping for state change to %d)", + state_path, state); + ds->w.path = state_path; + ds->w.timeout_ms = milliseconds; + ds->w.callback = devstate_callback; + rc = libxl__xswait_start(gc, &ds->w); if (rc) goto out; return 0; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index af2111f..de36c7a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1189,24 +1189,21 @@ struct libxl__ev_devstate { libxl__ev_devstate_callback *callback; /* as for the remainder, read-only public parts may also be * read by the caller (notably, watch.path), but only when waiting: */ - libxl__ev_xswatch watch; - libxl__ev_time timeout; + libxl__xswait_state w; }; static inline void libxl__ev_devstate_init(libxl__ev_devstate *ds) { - libxl__ev_time_init(&ds->timeout); - libxl__ev_xswatch_init(&ds->watch); + libxl__xswait_init(&ds->w); } static inline void libxl__ev_devstate_cancel(libxl__gc *gc, libxl__ev_devstate *ds) { - libxl__ev_time_deregister(gc,&ds->timeout); - libxl__ev_xswatch_deregister(gc,&ds->watch); + libxl__xswait_stop(gc,&ds->w); } -_hidden int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, +_hidden int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, libxl__ev_devstate_callback cb, const char *state_path, int state, int milliseconds); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01: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 1Z9OO2-0007YS-Rx; Mon, 29 Jun 2015 02:01:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OO1-0007YB-Qt for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:30 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 88/A5-21325-9F6A0955; Mon, 29 Jun 2015 02:01:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1435543287!13324459!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12350 invoked from network); 29 Jun 2015 02:01:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:01:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ONz-0002Mj-B7 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ONz-0005Cx-9p for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:27 +0000 Date: Mon, 29 Jun 2015 02:01:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: devstate: Use libxl__xswait* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfcace69513fd657cf04316dcd03d71ce27b13a7 Author: Ian Jackson AuthorDate: Fri Dec 20 15:04:34 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: devstate: Use libxl__xswait* Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v3: Initialise ds->w.ao --- tools/libxl/libxl_device.c | 4 +- tools/libxl/libxl_event.c | 79 ++++++++++++++++++----------------------- tools/libxl/libxl_internal.h | 11 ++---- 3 files changed, 41 insertions(+), 53 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 8352cfb..951d125 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -758,7 +758,7 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) return; } - rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + rc = libxl__ev_devstate_wait(ao, &aodev->backend_ds, device_backend_callback, state_path, XenbusStateInitWait, LIBXL_INIT_TIMEOUT * 1000); @@ -859,7 +859,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, if (rc < 0) goto out; } - rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds, + rc = libxl__ev_devstate_wait(ao, &aodev->backend_ds, device_backend_callback, state_path, XenbusStateClosed, LIBXL_DESTROY_TIMEOUT * 1000); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 9ff4e78..3b45148 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -816,68 +816,59 @@ void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev) * waiting for device state */ -static void devstate_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, - const char *watch_path, const char *event_path) +static void devstate_callback(libxl__egc *egc, libxl__xswait_state *xsw, + int rc, const char *sstate) { EGC_GC; - libxl__ev_devstate *ds = CONTAINER_OF(watch, *ds, watch); - int rc; + libxl__ev_devstate *ds = CONTAINER_OF(xsw, *ds, w); - char *sstate = libxl__xs_read(gc, XBT_NULL, watch_path); + if (rc) { + if (rc == ERROR_TIMEDOUT) + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d " + " timed out", ds->w.path, ds->wanted); + goto out; + } if (!sstate) { - if (errno == ENOENT) { - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" - " but it was removed", watch_path, ds->wanted); - rc = ERROR_INVAL; - } else { - LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "backend %s wanted state" - " %d but read failed", watch_path, ds->wanted); - rc = ERROR_FAIL; - } + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " but it was removed", ds->w.path, ds->wanted); + rc = ERROR_INVAL; + goto out; + } + + int got = atoi(sstate); + if (got == ds->wanted) { + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d ok", + ds->w.path, ds->wanted); + rc = 0; } else { - int got = atoi(sstate); - if (got == ds->wanted) { - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d ok", - watch_path, ds->wanted); - rc = 0; - } else { - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" - " still waiting state %d", watch_path, ds->wanted, got); - return; - } + LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d" + " still waiting state %d", ds->w.path, ds->wanted, got); + return; } - libxl__ev_devstate_cancel(gc, ds); - ds->callback(egc, ds, rc); -} -static void devstate_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) -{ - EGC_GC; - libxl__ev_devstate *ds = CONTAINER_OF(ev, *ds, timeout); - LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "backend %s wanted state %d " - " timed out", ds->watch.path, ds->wanted); + out: libxl__ev_devstate_cancel(gc, ds); - ds->callback(egc, ds, ERROR_TIMEDOUT); + ds->callback(egc, ds, rc); } -int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, +int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, libxl__ev_devstate_callback cb, const char *state_path, int state, int milliseconds) { + AO_GC; int rc; - libxl__ev_time_init(&ds->timeout); - libxl__ev_xswatch_init(&ds->watch); + libxl__xswait_init(&ds->w); ds->wanted = state; ds->callback = cb; - rc = libxl__ev_time_register_rel(gc, &ds->timeout, devstate_timeout, - milliseconds); - if (rc) goto out; - - rc = libxl__ev_xswatch_register(gc, &ds->watch, devstate_watch_callback, - state_path); + ds->w.ao = ao; + ds->w.what = GCSPRINTF("backend %s (hoping for state change to %d)", + state_path, state); + ds->w.path = state_path; + ds->w.timeout_ms = milliseconds; + ds->w.callback = devstate_callback; + rc = libxl__xswait_start(gc, &ds->w); if (rc) goto out; return 0; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index af2111f..de36c7a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1189,24 +1189,21 @@ struct libxl__ev_devstate { libxl__ev_devstate_callback *callback; /* as for the remainder, read-only public parts may also be * read by the caller (notably, watch.path), but only when waiting: */ - libxl__ev_xswatch watch; - libxl__ev_time timeout; + libxl__xswait_state w; }; static inline void libxl__ev_devstate_init(libxl__ev_devstate *ds) { - libxl__ev_time_init(&ds->timeout); - libxl__ev_xswatch_init(&ds->watch); + libxl__xswait_init(&ds->w); } static inline void libxl__ev_devstate_cancel(libxl__gc *gc, libxl__ev_devstate *ds) { - libxl__ev_time_deregister(gc,&ds->timeout); - libxl__ev_xswatch_deregister(gc,&ds->watch); + libxl__xswait_stop(gc,&ds->w); } -_hidden int libxl__ev_devstate_wait(libxl__gc *gc, libxl__ev_devstate *ds, +_hidden int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, libxl__ev_devstate_callback cb, const char *state_path, int state, int milliseconds); -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01: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 1Z9OOD-0007a0-UY; Mon, 29 Jun 2015 02:01:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOC-0007Zk-I0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:40 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 8A/C9-21300-307A0955; Mon, 29 Jun 2015 02:01:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435543297!16012062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23869 invoked from network); 29 Jun 2015 02:01:38 -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; 29 Jun 2015 02:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OO9-0002Mt-IB for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OO9-0005Dt-Fu for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:37 +0000 Date: Mon, 29 Jun 2015 02:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Rename AO_ABORT to AO_CREATE_FAIL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a8c62608383b7c492026125ed529cb8656e7f25 Author: Ian Jackson AuthorDate: Thu Jun 25 16:33:02 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Rename AO_ABORT to AO_CREATE_FAIL We are going to introduce a new meaning for aborting an ao, so rename this to avoid confusion. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl.c | 10 +++++----- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ed50d32..cfbae7c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -901,7 +901,7 @@ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, return AO_INPROGRESS; out: - return AO_ABORT(rc); + return AO_CREATE_FAIL(rc); } static void libxl__remus_setup_done(libxl__egc *egc, @@ -982,7 +982,7 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, return AO_INPROGRESS; out_err: - return AO_ABORT(rc); + return AO_CREATE_FAIL(rc); } int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid) @@ -3008,7 +3008,7 @@ out: if (lock) libxl__unlock_domain_userdata(lock); - if (rc) return AO_ABORT(rc); + if (rc) return AO_CREATE_FAIL(rc); return AO_INPROGRESS; } @@ -4198,7 +4198,7 @@ out: libxl__initiate_device_remove(egc, aodev); \ \ out: \ - if (rc) return AO_ABORT(rc); \ + if (rc) return AO_CREATE_FAIL(rc); \ return AO_INPROGRESS; \ } @@ -4609,7 +4609,7 @@ int libxl_device_events_handler(libxl_ctx *ctx, return AO_INPROGRESS; out: - return AO_ABORT(rc); + return AO_CREATE_FAIL(rc); } /******************************************************************************/ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 3b45148..4b234a3 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1735,10 +1735,10 @@ void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) free(ao); } -void libxl__ao_abort(libxl__ao *ao) +void libxl__ao_create_fail(libxl__ao *ao) { AO_GC; - LOG(DEBUG,"ao %p: abort",ao); + LOG(DEBUG,"ao %p: create fail",ao); assert(ao->magic == LIBXL__AO_MAGIC); assert(ao->in_initiator); assert(!ao->complete); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index de36c7a..e2c5299 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1953,8 +1953,8 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); * libxl__ao_progress_gethow. * * - If the initiation is unsuccessful, the initiating function must - * call libxl__ao_abort before unlocking and returning whatever - * error code is appropriate (AO_ABORT macro). + * call libxl__ao_create_fail before unlocking and returning whatever + * error code is appropriate (AO_CREATE_FAIL macro). * * If initiation is successful: * @@ -2011,10 +2011,10 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); (ao__rc); \ }) -#define AO_ABORT(rc) ({ \ +#define AO_CREATE_FAIL(rc) ({ \ libxl_ctx *ao__ctx = libxl__gc_owner(&ao->gc); \ assert(rc); \ - libxl__ao_abort(ao); \ + libxl__ao_create_fail(ao); \ libxl__ctx_unlock(ao__ctx); /* gc is now invalid */ \ EGC_FREE; \ (rc); \ @@ -2035,7 +2035,7 @@ _hidden libxl__ao *libxl__ao_create(libxl_ctx*, uint32_t domid, const char *file, int line, const char *func); _hidden int libxl__ao_inprogress(libxl__ao *ao, const char *file, int line, const char *func); /* temporarily unlocks */ -_hidden void libxl__ao_abort(libxl__ao *ao); +_hidden void libxl__ao_create_fail(libxl__ao *ao); _hidden void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc); _hidden libxl__gc *libxl__ao_inprogress_gc(libxl__ao *ao); @@ -2064,7 +2064,7 @@ _hidden void libxl__ao_complete_check_progress_reports(libxl__egc*, libxl__ao*); * The returned sub-ao is suitable for passing to gc-related functions * and macros such as libxl__ao_inprogress_gc, AO_GC, and STATE_AO_GC. * - * It MUST NOT be used with AO_INPROGRESS, AO_ABORT, + * It MUST NOT be used with AO_INPROGRESS, AO_CREATE_FAIL, * libxl__ao_complete, libxl__ao_progress_report, and so on. * * The caller must ensure that all of the sub-ao's are freed before -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01: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 1Z9OOD-0007a0-UY; Mon, 29 Jun 2015 02:01:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOC-0007Zk-I0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:40 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 8A/C9-21300-307A0955; Mon, 29 Jun 2015 02:01:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435543297!16012062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23869 invoked from network); 29 Jun 2015 02:01:38 -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; 29 Jun 2015 02:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OO9-0002Mt-IB for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OO9-0005Dt-Fu for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:37 +0000 Date: Mon, 29 Jun 2015 02:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Rename AO_ABORT to AO_CREATE_FAIL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a8c62608383b7c492026125ed529cb8656e7f25 Author: Ian Jackson AuthorDate: Thu Jun 25 16:33:02 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Rename AO_ABORT to AO_CREATE_FAIL We are going to introduce a new meaning for aborting an ao, so rename this to avoid confusion. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl.c | 10 +++++----- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ed50d32..cfbae7c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -901,7 +901,7 @@ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, return AO_INPROGRESS; out: - return AO_ABORT(rc); + return AO_CREATE_FAIL(rc); } static void libxl__remus_setup_done(libxl__egc *egc, @@ -982,7 +982,7 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, return AO_INPROGRESS; out_err: - return AO_ABORT(rc); + return AO_CREATE_FAIL(rc); } int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid) @@ -3008,7 +3008,7 @@ out: if (lock) libxl__unlock_domain_userdata(lock); - if (rc) return AO_ABORT(rc); + if (rc) return AO_CREATE_FAIL(rc); return AO_INPROGRESS; } @@ -4198,7 +4198,7 @@ out: libxl__initiate_device_remove(egc, aodev); \ \ out: \ - if (rc) return AO_ABORT(rc); \ + if (rc) return AO_CREATE_FAIL(rc); \ return AO_INPROGRESS; \ } @@ -4609,7 +4609,7 @@ int libxl_device_events_handler(libxl_ctx *ctx, return AO_INPROGRESS; out: - return AO_ABORT(rc); + return AO_CREATE_FAIL(rc); } /******************************************************************************/ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 3b45148..4b234a3 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1735,10 +1735,10 @@ void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) free(ao); } -void libxl__ao_abort(libxl__ao *ao) +void libxl__ao_create_fail(libxl__ao *ao) { AO_GC; - LOG(DEBUG,"ao %p: abort",ao); + LOG(DEBUG,"ao %p: create fail",ao); assert(ao->magic == LIBXL__AO_MAGIC); assert(ao->in_initiator); assert(!ao->complete); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index de36c7a..e2c5299 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1953,8 +1953,8 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); * libxl__ao_progress_gethow. * * - If the initiation is unsuccessful, the initiating function must - * call libxl__ao_abort before unlocking and returning whatever - * error code is appropriate (AO_ABORT macro). + * call libxl__ao_create_fail before unlocking and returning whatever + * error code is appropriate (AO_CREATE_FAIL macro). * * If initiation is successful: * @@ -2011,10 +2011,10 @@ _hidden void libxl__egc_cleanup(libxl__egc *egc); (ao__rc); \ }) -#define AO_ABORT(rc) ({ \ +#define AO_CREATE_FAIL(rc) ({ \ libxl_ctx *ao__ctx = libxl__gc_owner(&ao->gc); \ assert(rc); \ - libxl__ao_abort(ao); \ + libxl__ao_create_fail(ao); \ libxl__ctx_unlock(ao__ctx); /* gc is now invalid */ \ EGC_FREE; \ (rc); \ @@ -2035,7 +2035,7 @@ _hidden libxl__ao *libxl__ao_create(libxl_ctx*, uint32_t domid, const char *file, int line, const char *func); _hidden int libxl__ao_inprogress(libxl__ao *ao, const char *file, int line, const char *func); /* temporarily unlocks */ -_hidden void libxl__ao_abort(libxl__ao *ao); +_hidden void libxl__ao_create_fail(libxl__ao *ao); _hidden void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc); _hidden libxl__gc *libxl__ao_inprogress_gc(libxl__ao *ao); @@ -2064,7 +2064,7 @@ _hidden void libxl__ao_complete_check_progress_reports(libxl__egc*, libxl__ao*); * The returned sub-ao is suitable for passing to gc-related functions * and macros such as libxl__ao_inprogress_gc, AO_GC, and STATE_AO_GC. * - * It MUST NOT be used with AO_INPROGRESS, AO_ABORT, + * It MUST NOT be used with AO_INPROGRESS, AO_CREATE_FAIL, * libxl__ao_complete, libxl__ao_progress_report, and so on. * * The caller must ensure that all of the sub-ao's are freed before -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:01:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01: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 1Z9OOP-0007bP-0t; Mon, 29 Jun 2015 02:01:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOO-0007bC-0b for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:52 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id FE/68-25881-F07A0955; Mon, 29 Jun 2015 02:01:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435543307!17418482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23857 invoked from network); 29 Jun 2015 02:01:48 -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; 29 Jun 2015 02:01:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOJ-0002N1-NY for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOJ-0005EI-Lq for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:47 +0000 Date: Mon, 29 Jun 2015 02:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Change some log messages to say `abandoning' rather than `aborting' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34d3900cfde24d6c6830ab35bcc8851173da2556 Author: Ian Jackson AuthorDate: Thu Jun 25 16:34:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Change some log messages to say `abandoning' rather than `aborting' We are going to introduce application-requested aborts of (ao) operations, but these suspend failures are something different. Reword to avoid confusion. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_dom.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 54908fb..ccbcb6e 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1242,7 +1242,7 @@ static void domain_suspend_switch_qemu_xen_traditional_logdirty return; out: - LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + LOG(ERROR,"logdirty switch failed (rc=%d), abandoning suspend",rc); libxl__xs_transaction_abort(gc, &t); switch_logdirty_done(egc,dss,rc); } @@ -1260,7 +1260,7 @@ static void domain_suspend_switch_qemu_xen_logdirty if (!rc) { libxl__xc_domain_saverestore_async_callback_done(egc, shs, 0); } else { - LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + LOG(ERROR,"logdirty switch failed (rc=%d), abandoning suspend",rc); dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1); } @@ -1283,7 +1283,7 @@ void libxl__domain_suspend_common_switch_qemu_logdirty break; default: LOG(ERROR,"logdirty switch failed" - ", no valid device model version found, aborting suspend"); + ", no valid device model version found, abandoning suspend"); dss->rc = ERROR_FAIL; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -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 Jun 29 02:01:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:01: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 1Z9OOP-0007bP-0t; Mon, 29 Jun 2015 02:01:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOO-0007bC-0b for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:52 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id FE/68-25881-F07A0955; Mon, 29 Jun 2015 02:01:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435543307!17418482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23857 invoked from network); 29 Jun 2015 02:01:48 -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; 29 Jun 2015 02:01:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOJ-0002N1-NY for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOJ-0005EI-Lq for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:47 +0000 Date: Mon, 29 Jun 2015 02:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Change some log messages to say `abandoning' rather than `aborting' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34d3900cfde24d6c6830ab35bcc8851173da2556 Author: Ian Jackson AuthorDate: Thu Jun 25 16:34:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Change some log messages to say `abandoning' rather than `aborting' We are going to introduce application-requested aborts of (ao) operations, but these suspend failures are something different. Reword to avoid confusion. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_dom.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 54908fb..ccbcb6e 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1242,7 +1242,7 @@ static void domain_suspend_switch_qemu_xen_traditional_logdirty return; out: - LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + LOG(ERROR,"logdirty switch failed (rc=%d), abandoning suspend",rc); libxl__xs_transaction_abort(gc, &t); switch_logdirty_done(egc,dss,rc); } @@ -1260,7 +1260,7 @@ static void domain_suspend_switch_qemu_xen_logdirty if (!rc) { libxl__xc_domain_saverestore_async_callback_done(egc, shs, 0); } else { - LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc); + LOG(ERROR,"logdirty switch failed (rc=%d), abandoning suspend",rc); dss->rc = rc; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1); } @@ -1283,7 +1283,7 @@ void libxl__domain_suspend_common_switch_qemu_logdirty break; default: LOG(ERROR,"logdirty switch failed" - ", no valid device model version found, aborting suspend"); + ", no valid device model version found, abandoning suspend"); dss->rc = ERROR_FAIL; libxl__xc_domain_saverestore_async_callback_done(egc, shs, -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 Jun 29 02:02:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOY-0007cn-3T; Mon, 29 Jun 2015 02:02:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOW-0007cW-G9 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:00 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 62/80-02969-717A0955; Mon, 29 Jun 2015 02:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1435543318!19355462!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30308 invoked from network); 29 Jun 2015 02:01:59 -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; 29 Jun 2015 02:01:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOT-0002ND-UJ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOT-0005Fr-SQ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:57 +0000 Date: Mon, 29 Jun 2015 02:01:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Change an internal comment to say `bail' rather than `abort' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1772b78c33fcd3f475269a342cc4cab8f285bf97 Author: Ian Jackson AuthorDate: Thu Jun 25 16:35:27 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Change an internal comment to say `bail' rather than `abort' Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e2c5299..5004ef3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2380,7 +2380,7 @@ struct libxl__multidev { * any stale entry * for loop -- xs transaction * open xs transaction - * check device existence, abort if it exists + * check device existence, bail if it exists * write in-memory json config to disk * commit xs transaction * end for loop -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:02:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOY-0007cn-3T; Mon, 29 Jun 2015 02:02:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOW-0007cW-G9 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:00 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 62/80-02969-717A0955; Mon, 29 Jun 2015 02:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1435543318!19355462!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30308 invoked from network); 29 Jun 2015 02:01:59 -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; 29 Jun 2015 02:01:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOT-0002ND-UJ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOT-0005Fr-SQ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:01:57 +0000 Date: Mon, 29 Jun 2015 02:01:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Change an internal comment to say `bail' rather than `abort' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1772b78c33fcd3f475269a342cc4cab8f285bf97 Author: Ian Jackson AuthorDate: Thu Jun 25 16:35:27 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Change an internal comment to say `bail' rather than `abort' Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e2c5299..5004ef3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2380,7 +2380,7 @@ struct libxl__multidev { * any stale entry * for loop -- xs transaction * open xs transaction - * check device existence, abort if it exists + * check device existence, bail if it exists * write in-memory json config to disk * commit xs transaction * end for loop -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:02:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOi-0007ei-64; Mon, 29 Jun 2015 02:02:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOg-0007eQ-Pe for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:10 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id EA/C3-30151-227A0955; Mon, 29 Jun 2015 02:02:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543328!27442573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3777 invoked from network); 29 Jun 2015 02:02: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; 29 Jun 2015 02:02:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOe-0002Nr-3A for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOe-0005Ky-1K for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:08 +0000 Date: Mon, 29 Jun 2015 02:02:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: New error codes ABORTED etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1bbae427d635121fa73241e4ff4c2f72a889d746 Author: Ian Jackson AuthorDate: Fri Dec 20 15:18:59 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: New error codes ABORTED etc. We introduce ERROR_ABORTED now, so that we can write code to handle it, and decreee that functions might return it, even though currently there is nowhere where this error is generated. While we're here, provide ERROR_NOTFOUND which will also be used later, but only as part of the public API. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: CANCELLED renamed to ABORTED. No longer introduce ERROR_NOTIMPLEMENTED. v2: Rebase means new errors have bigger (more negative) numbers. --- tools/libxl/libxl_types.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 23f27d4..9558d52 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -65,6 +65,8 @@ libxl_error = Enumeration("error", [ (-19, "REMUS_DEVICE_NOT_SUPPORTED"), (-20, "VNUMA_CONFIG_INVALID"), (-21, "DOMAIN_NOTFOUND"), + (-22, "ABORTED"), + (-23, "NOTFOUND"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_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 Mon Jun 29 02:02:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOi-0007ei-64; Mon, 29 Jun 2015 02:02:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOg-0007eQ-Pe for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:10 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id EA/C3-30151-227A0955; Mon, 29 Jun 2015 02:02:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543328!27442573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3777 invoked from network); 29 Jun 2015 02:02: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; 29 Jun 2015 02:02:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOe-0002Nr-3A for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOe-0005Ky-1K for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:08 +0000 Date: Mon, 29 Jun 2015 02:02:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: New error codes ABORTED etc. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1bbae427d635121fa73241e4ff4c2f72a889d746 Author: Ian Jackson AuthorDate: Fri Dec 20 15:18:59 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: New error codes ABORTED etc. We introduce ERROR_ABORTED now, so that we can write code to handle it, and decreee that functions might return it, even though currently there is nowhere where this error is generated. While we're here, provide ERROR_NOTFOUND which will also be used later, but only as part of the public API. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: CANCELLED renamed to ABORTED. No longer introduce ERROR_NOTIMPLEMENTED. v2: Rebase means new errors have bigger (more negative) numbers. --- tools/libxl/libxl_types.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 23f27d4..9558d52 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -65,6 +65,8 @@ libxl_error = Enumeration("error", [ (-19, "REMUS_DEVICE_NOT_SUPPORTED"), (-20, "VNUMA_CONFIG_INVALID"), (-21, "DOMAIN_NOTFOUND"), + (-22, "ABORTED"), + (-23, "NOTFOUND"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_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 Mon Jun 29 02:02:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OOs-0007gk-8V; Mon, 29 Jun 2015 02:02:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOq-0007gV-VZ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:21 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id D6/1A-21300-C27A0955; Mon, 29 Jun 2015 02:02:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1435543338!27449161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7553 invoked from network); 29 Jun 2015 02:02:19 -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; 29 Jun 2015 02:02:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOo-0002Nz-8Q for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOo-0005LO-6b for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:18 +0000 Date: Mon, 29 Jun 2015 02:02:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Make timeout and async exec setup take an ao, not a gc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f5f8400fd09989b2b977cb99c34af7cf1a41f47c Author: Ian Jackson AuthorDate: Tue Feb 10 16:13:36 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: events: Make timeout and async exec setup take an ao, not a gc Change the timeout setup functions to take a libxl__ao, not a libxl__gc. This is going to be needed for ao abort, because timeouts are going to be a main hook for ao abort requests - so the timeouts need to be associated with an ao. This means that timeouts can only occur as part of a long-running libxl function (but this is of course correct, as libxl shouldn't have any global timeouts, and indeed all the call sites have an ao). Also remove the gc parameter from libxl__async_exec_start. It can just use the gc from the ao supplied in the aes. All the callers follow the obvious patterns and therefore supply the ao's gc to libxl__async_exec_start and the timeout setup functions. There is therefore no functional change in this patch. Signed-off-by: Ian Jackson CC: Yang Hongyang CC: Wen Congyang CC: Lai Jiangshan Acked-by: Wen Congyang Acked-by: Ian Campbell --- v2: This patch split off from "Permit timeouts to signal cancellation". Rebased; consequently, deal with libxl__async_exec_start. CC'd authors of the libxl__async_exec_* functions. --- tools/libxl/libxl_aoutils.c | 8 +++++--- tools/libxl/libxl_device.c | 4 ++-- tools/libxl/libxl_dom.c | 8 ++++---- tools/libxl/libxl_event.c | 6 ++++-- tools/libxl/libxl_internal.h | 6 +++--- tools/libxl/libxl_remus_disk_drbd.c | 2 +- tools/libxl/libxl_test_timedereg.c | 9 +++++---- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index ef679dd..1502ffe 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -46,7 +46,7 @@ int libxl__xswait_start(libxl__gc *gc, libxl__xswait_state *xswa) { int rc; - rc = libxl__ev_time_register_rel(gc, &xswa->time_ev, + rc = libxl__ev_time_register_rel(xswa->ao, &xswa->time_ev, xswait_timeout_callback, xswa->timeout_ms); if (rc) goto err; @@ -547,16 +547,18 @@ void libxl__async_exec_init(libxl__async_exec_state *aes) libxl__ev_child_init(&aes->child); } -int libxl__async_exec_start(libxl__gc *gc, libxl__async_exec_state *aes) +int libxl__async_exec_start(libxl__async_exec_state *aes) { pid_t pid; /* Convenience aliases */ + libxl__ao *ao = aes->ao; + AO_GC; libxl__ev_child *const child = &aes->child; char ** const args = aes->args; /* Set execution timeout */ - if (libxl__ev_time_register_rel(gc, &aes->time, + if (libxl__ev_time_register_rel(ao, &aes->time, async_exec_timeout, aes->timeout_ms)) { LOG(ERROR, "unable to register timeout for executing: %s", aes->what); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 951d125..b6276f6 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -808,7 +808,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, * TODO: 4.2 Bodge due to QEMU, see comment on top of * libxl__initiate_device_remove in libxl_internal.h */ - rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + rc = libxl__ev_time_register_rel(ao, &aodev->timeout, device_qemu_timeout, LIBXL_QEMU_BODGE_TIMEOUT * 1000); if (rc) { @@ -1034,7 +1034,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) aes->stdfds[1] = 2; aes->stdfds[2] = -1; - rc = libxl__async_exec_start(gc, aes); + rc = libxl__async_exec_start(aes); if (rc) goto out; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index ccbcb6e..40a2d79 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1200,7 +1200,7 @@ static void domain_suspend_switch_qemu_xen_traditional_logdirty switch_logdirty_xswatch, lds->ret_path); if (rc) goto out; - rc = libxl__ev_time_register_rel(gc, &lds->timeout, + rc = libxl__ev_time_register_rel(ao, &lds->timeout, switch_logdirty_timeout, 10*1000); if (rc) goto out; @@ -1480,7 +1480,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, rc = libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); if (rc) goto err; - rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + rc = libxl__ev_time_register_rel(ao, &dss->guest_timeout, suspend_common_wait_guest_timeout, 60*1000); if (rc) goto err; @@ -1611,7 +1611,7 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, "@releaseDomain"); if (rc) goto err; - rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + rc = libxl__ev_time_register_rel(ao, &dss->guest_timeout, suspend_common_wait_guest_timeout, 60*1000); if (rc) goto err; @@ -1990,7 +1990,7 @@ static void remus_devices_commit_cb(libxl__egc *egc, */ /* Set checkpoint interval timeout */ - rc = libxl__ev_time_register_rel(gc, &dss->checkpoint_timeout, + rc = libxl__ev_time_register_rel(ao, &dss->checkpoint_timeout, remus_next_checkpoint, dss->interval); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 4b234a3..217fe97 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -332,10 +332,11 @@ static void time_done_debug(libxl__gc *gc, const char *func, #endif } -int libxl__ev_time_register_abs(libxl__gc *gc, libxl__ev_time *ev, +int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, libxl__ev_time_callback *func, struct timeval absolute) { + AO_GC; int rc; CTX_LOCK; @@ -356,10 +357,11 @@ int libxl__ev_time_register_abs(libxl__gc *gc, libxl__ev_time *ev, } -int libxl__ev_time_register_rel(libxl__gc *gc, libxl__ev_time *ev, +int libxl__ev_time_register_rel(libxl__ao *ao, libxl__ev_time *ev, libxl__ev_time_callback *func, int milliseconds /* as for poll(2) */) { + AO_GC; struct timeval absolute; int rc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5004ef3..44b662c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -791,10 +791,10 @@ static inline void libxl__ev_fd_init(libxl__ev_fd *efd) static inline int libxl__ev_fd_isregistered(const libxl__ev_fd *efd) { return efd->fd >= 0; } -_hidden int libxl__ev_time_register_rel(libxl__gc*, libxl__ev_time *ev_out, +_hidden int libxl__ev_time_register_rel(libxl__ao*, libxl__ev_time *ev_out, libxl__ev_time_callback*, int milliseconds /* as for poll(2) */); -_hidden int libxl__ev_time_register_abs(libxl__gc*, libxl__ev_time *ev_out, +_hidden int libxl__ev_time_register_abs(libxl__ao*, libxl__ev_time *ev_out, libxl__ev_time_callback*, struct timeval); _hidden int libxl__ev_time_modify_rel(libxl__gc*, libxl__ev_time *ev, @@ -2166,7 +2166,7 @@ struct libxl__async_exec_state { }; void libxl__async_exec_init(libxl__async_exec_state *aes); -int libxl__async_exec_start(libxl__gc *gc, libxl__async_exec_state *aes); +int libxl__async_exec_start(libxl__async_exec_state *aes); bool libxl__async_exec_inuse(const libxl__async_exec_state *aes); /*----- device addition/removal -----*/ diff --git a/tools/libxl/libxl_remus_disk_drbd.c b/tools/libxl/libxl_remus_disk_drbd.c index afe9b61..5e0c9a6 100644 --- a/tools/libxl/libxl_remus_disk_drbd.c +++ b/tools/libxl/libxl_remus_disk_drbd.c @@ -120,7 +120,7 @@ static void match_async_exec(libxl__egc *egc, libxl__remus_device *dev) aes->stdfds[1] = -1; aes->stdfds[2] = -1; - rc = libxl__async_exec_start(gc, aes); + rc = libxl__async_exec_start(aes); if (rc) goto out; diff --git a/tools/libxl/libxl_test_timedereg.c b/tools/libxl/libxl_test_timedereg.c index a44639f..e2cc27d 100644 --- a/tools/libxl/libxl_test_timedereg.c +++ b/tools/libxl/libxl_test_timedereg.c @@ -30,12 +30,13 @@ static int seq; static void occurs(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs); -static void regs(libxl__gc *gc, int j) +static void regs(libxl__ao *ao, int j) { + AO_GC; int rc, i; LOG(DEBUG,"regs(%d)", j); for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OOs-0007gk-8V; Mon, 29 Jun 2015 02:02:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOq-0007gV-VZ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:21 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id D6/1A-21300-C27A0955; Mon, 29 Jun 2015 02:02:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1435543338!27449161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7553 invoked from network); 29 Jun 2015 02:02:19 -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; 29 Jun 2015 02:02:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOo-0002Nz-8Q for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOo-0005LO-6b for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:18 +0000 Date: Mon, 29 Jun 2015 02:02:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Make timeout and async exec setup take an ao, not a gc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f5f8400fd09989b2b977cb99c34af7cf1a41f47c Author: Ian Jackson AuthorDate: Tue Feb 10 16:13:36 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: events: Make timeout and async exec setup take an ao, not a gc Change the timeout setup functions to take a libxl__ao, not a libxl__gc. This is going to be needed for ao abort, because timeouts are going to be a main hook for ao abort requests - so the timeouts need to be associated with an ao. This means that timeouts can only occur as part of a long-running libxl function (but this is of course correct, as libxl shouldn't have any global timeouts, and indeed all the call sites have an ao). Also remove the gc parameter from libxl__async_exec_start. It can just use the gc from the ao supplied in the aes. All the callers follow the obvious patterns and therefore supply the ao's gc to libxl__async_exec_start and the timeout setup functions. There is therefore no functional change in this patch. Signed-off-by: Ian Jackson CC: Yang Hongyang CC: Wen Congyang CC: Lai Jiangshan Acked-by: Wen Congyang Acked-by: Ian Campbell --- v2: This patch split off from "Permit timeouts to signal cancellation". Rebased; consequently, deal with libxl__async_exec_start. CC'd authors of the libxl__async_exec_* functions. --- tools/libxl/libxl_aoutils.c | 8 +++++--- tools/libxl/libxl_device.c | 4 ++-- tools/libxl/libxl_dom.c | 8 ++++---- tools/libxl/libxl_event.c | 6 ++++-- tools/libxl/libxl_internal.h | 6 +++--- tools/libxl/libxl_remus_disk_drbd.c | 2 +- tools/libxl/libxl_test_timedereg.c | 9 +++++---- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index ef679dd..1502ffe 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -46,7 +46,7 @@ int libxl__xswait_start(libxl__gc *gc, libxl__xswait_state *xswa) { int rc; - rc = libxl__ev_time_register_rel(gc, &xswa->time_ev, + rc = libxl__ev_time_register_rel(xswa->ao, &xswa->time_ev, xswait_timeout_callback, xswa->timeout_ms); if (rc) goto err; @@ -547,16 +547,18 @@ void libxl__async_exec_init(libxl__async_exec_state *aes) libxl__ev_child_init(&aes->child); } -int libxl__async_exec_start(libxl__gc *gc, libxl__async_exec_state *aes) +int libxl__async_exec_start(libxl__async_exec_state *aes) { pid_t pid; /* Convenience aliases */ + libxl__ao *ao = aes->ao; + AO_GC; libxl__ev_child *const child = &aes->child; char ** const args = aes->args; /* Set execution timeout */ - if (libxl__ev_time_register_rel(gc, &aes->time, + if (libxl__ev_time_register_rel(ao, &aes->time, async_exec_timeout, aes->timeout_ms)) { LOG(ERROR, "unable to register timeout for executing: %s", aes->what); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 951d125..b6276f6 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -808,7 +808,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, * TODO: 4.2 Bodge due to QEMU, see comment on top of * libxl__initiate_device_remove in libxl_internal.h */ - rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + rc = libxl__ev_time_register_rel(ao, &aodev->timeout, device_qemu_timeout, LIBXL_QEMU_BODGE_TIMEOUT * 1000); if (rc) { @@ -1034,7 +1034,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) aes->stdfds[1] = 2; aes->stdfds[2] = -1; - rc = libxl__async_exec_start(gc, aes); + rc = libxl__async_exec_start(aes); if (rc) goto out; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index ccbcb6e..40a2d79 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1200,7 +1200,7 @@ static void domain_suspend_switch_qemu_xen_traditional_logdirty switch_logdirty_xswatch, lds->ret_path); if (rc) goto out; - rc = libxl__ev_time_register_rel(gc, &lds->timeout, + rc = libxl__ev_time_register_rel(ao, &lds->timeout, switch_logdirty_timeout, 10*1000); if (rc) goto out; @@ -1480,7 +1480,7 @@ static void domain_suspend_callback_common(libxl__egc *egc, rc = libxl__ev_evtchn_wait(gc, &dss->guest_evtchn); if (rc) goto err; - rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + rc = libxl__ev_time_register_rel(ao, &dss->guest_timeout, suspend_common_wait_guest_timeout, 60*1000); if (rc) goto err; @@ -1611,7 +1611,7 @@ static void domain_suspend_common_wait_guest(libxl__egc *egc, "@releaseDomain"); if (rc) goto err; - rc = libxl__ev_time_register_rel(gc, &dss->guest_timeout, + rc = libxl__ev_time_register_rel(ao, &dss->guest_timeout, suspend_common_wait_guest_timeout, 60*1000); if (rc) goto err; @@ -1990,7 +1990,7 @@ static void remus_devices_commit_cb(libxl__egc *egc, */ /* Set checkpoint interval timeout */ - rc = libxl__ev_time_register_rel(gc, &dss->checkpoint_timeout, + rc = libxl__ev_time_register_rel(ao, &dss->checkpoint_timeout, remus_next_checkpoint, dss->interval); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 4b234a3..217fe97 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -332,10 +332,11 @@ static void time_done_debug(libxl__gc *gc, const char *func, #endif } -int libxl__ev_time_register_abs(libxl__gc *gc, libxl__ev_time *ev, +int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, libxl__ev_time_callback *func, struct timeval absolute) { + AO_GC; int rc; CTX_LOCK; @@ -356,10 +357,11 @@ int libxl__ev_time_register_abs(libxl__gc *gc, libxl__ev_time *ev, } -int libxl__ev_time_register_rel(libxl__gc *gc, libxl__ev_time *ev, +int libxl__ev_time_register_rel(libxl__ao *ao, libxl__ev_time *ev, libxl__ev_time_callback *func, int milliseconds /* as for poll(2) */) { + AO_GC; struct timeval absolute; int rc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5004ef3..44b662c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -791,10 +791,10 @@ static inline void libxl__ev_fd_init(libxl__ev_fd *efd) static inline int libxl__ev_fd_isregistered(const libxl__ev_fd *efd) { return efd->fd >= 0; } -_hidden int libxl__ev_time_register_rel(libxl__gc*, libxl__ev_time *ev_out, +_hidden int libxl__ev_time_register_rel(libxl__ao*, libxl__ev_time *ev_out, libxl__ev_time_callback*, int milliseconds /* as for poll(2) */); -_hidden int libxl__ev_time_register_abs(libxl__gc*, libxl__ev_time *ev_out, +_hidden int libxl__ev_time_register_abs(libxl__ao*, libxl__ev_time *ev_out, libxl__ev_time_callback*, struct timeval); _hidden int libxl__ev_time_modify_rel(libxl__gc*, libxl__ev_time *ev, @@ -2166,7 +2166,7 @@ struct libxl__async_exec_state { }; void libxl__async_exec_init(libxl__async_exec_state *aes); -int libxl__async_exec_start(libxl__gc *gc, libxl__async_exec_state *aes); +int libxl__async_exec_start(libxl__async_exec_state *aes); bool libxl__async_exec_inuse(const libxl__async_exec_state *aes); /*----- device addition/removal -----*/ diff --git a/tools/libxl/libxl_remus_disk_drbd.c b/tools/libxl/libxl_remus_disk_drbd.c index afe9b61..5e0c9a6 100644 --- a/tools/libxl/libxl_remus_disk_drbd.c +++ b/tools/libxl/libxl_remus_disk_drbd.c @@ -120,7 +120,7 @@ static void match_async_exec(libxl__egc *egc, libxl__remus_device *dev) aes->stdfds[1] = -1; aes->stdfds[2] = -1; - rc = libxl__async_exec_start(gc, aes); + rc = libxl__async_exec_start(aes); if (rc) goto out; diff --git a/tools/libxl/libxl_test_timedereg.c b/tools/libxl/libxl_test_timedereg.c index a44639f..e2cc27d 100644 --- a/tools/libxl/libxl_test_timedereg.c +++ b/tools/libxl/libxl_test_timedereg.c @@ -30,12 +30,13 @@ static int seq; static void occurs(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs); -static void regs(libxl__gc *gc, int j) +static void regs(libxl__ao *ao, int j) { + AO_GC; int rc, i; LOG(DEBUG,"regs(%d)", j); for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OP2-0007iS-D3; Mon, 29 Jun 2015 02:02:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OP1-0007iI-Ch for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:31 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id F6/96-06739-637A0955; Mon, 29 Jun 2015 02:02:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435543348!21311728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23617 invoked from network); 29 Jun 2015 02:02:29 -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; 29 Jun 2015 02:02:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOy-0002OC-Hs for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOy-0005MW-Ci for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:28 +0000 Date: Mon, 29 Jun 2015 02:02:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Make libxl__async_exec_* pass caller an rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3935054e76f85934db54e514dfb6db4cdfead30 Author: Ian Jackson AuthorDate: Tue Feb 10 16:27:39 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: events: Make libxl__async_exec_* pass caller an rc The internal user of libxl__async_exec_start et al now gets an rc as well as the process's exit status. For now this is always either 0 or ERROR_FAIL, but with ao abort requests this will possibly be ABORTED or TIMEDOUT too. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: Improve doc comment as suggested by Ian C. v2: New patch due to rebause; v1 had changes to device_hotplug_* scripts instead. Callback now gets unambiguous information about error situation: previously, if only thing that went wrong was that child died badly, rc would be FAILED, which was unambigously; now rc=0. Add a comment document the meaning of the rc and status parameters to the callback. --- tools/libxl/libxl_aoutils.c | 9 ++++++--- tools/libxl/libxl_device.c | 13 +++++++++---- tools/libxl/libxl_internal.h | 12 +++++++++++- tools/libxl/libxl_netbuffer.c | 19 ++++++++++--------- tools/libxl/libxl_remus_disk_drbd.c | 8 +++++--- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 1502ffe..450caae 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -534,11 +534,12 @@ static void async_exec_done(libxl__egc *egc, libxl__ev_time_deregister(gc, &aes->time); if (status) { - libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, - aes->what, pid, status); + if (!aes->rc) + libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, + aes->what, pid, status); } - aes->callback(egc, aes, status); + aes->callback(egc, aes, aes->rc, status); } void libxl__async_exec_init(libxl__async_exec_state *aes) @@ -557,6 +558,8 @@ int libxl__async_exec_start(libxl__async_exec_state *aes) libxl__ev_child *const child = &aes->child; char ** const args = aes->args; + aes->rc = 0; + /* Set execution timeout */ if (libxl__ev_time_register_rel(ao, &aes->time, async_exec_timeout, diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index b6276f6..012a9f8 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -729,7 +729,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev); static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); static void device_destroy_be_watch_cb(libxl__egc *egc, libxl__xswait_state *xswait, @@ -1052,7 +1052,7 @@ out: static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); STATE_AO_GC(aodev->ao); @@ -1061,12 +1061,17 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, device_hotplug_clean(gc, aodev); - if (status) { + if (status && !rc) { hotplug_error = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/hotplug-error", be_path)); if (hotplug_error) LOG(ERROR, "script: %s", hotplug_error); - aodev->rc = ERROR_FAIL; + rc = ERROR_FAIL; + } + + if (rc) { + if (!aodev->rc) + aodev->rc = rc; if (aodev->action == LIBXL__DEVICE_ACTION_ADD) /* * Only fail on device connection, on disconnection diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 44b662c..5b63e84 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2147,7 +2147,16 @@ _hidden const char *libxl__run_dir_path(void); typedef struct libxl__async_exec_state libxl__async_exec_state; typedef void libxl__async_exec_callback(libxl__egc *egc, - libxl__async_exec_state *aes, int status); + libxl__async_exec_state *aes, int rc, int status); +/* + * Meaning of status and rc: + * rc==0, status==0 all went well + * rc==0, status!=0 everything OK except child exited nonzero (logged) + * rc!=0 something else went wrong (status is real + * exit status; maybe reflecting SIGKILL, and + * therefore not very interesting, if aes code + * killed the child). Logged unless ABORTED. + */ struct libxl__async_exec_state { /* caller must fill these in */ @@ -2163,6 +2172,7 @@ struct libxl__async_exec_state { /* private */ libxl__ev_time time; libxl__ev_child child; + int rc; }; void libxl__async_exec_init(libxl__async_exec_state *aes); diff --git a/tools/libxl/libxl_netbuffer.c b/tools/libxl/libxl_netbuffer.c index edc6843..ff2d6c7 100644 --- a/tools/libxl/libxl_netbuffer.c +++ b/tools/libxl/libxl_netbuffer.c @@ -219,10 +219,10 @@ out: static void netbuf_setup_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); static void netbuf_teardown_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); /* * the script needs the following env & args @@ -327,14 +327,13 @@ out: */ static void netbuf_setup_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); libxl__remus_device *dev = CONTAINER_OF(aodev, *dev, aodev); libxl__remus_device_nic *remus_nic = dev->concrete_data; libxl__remus_devices_state *rds = dev->rds; const char *out_path_base, *hotplug_error = NULL; - int rc; STATE_AO_GC(rds->ao); @@ -344,6 +343,11 @@ static void netbuf_setup_script_cb(libxl__egc *egc, const char *const vif = remus_nic->vif; const char **const ifb = &remus_nic->ifb; + if (status && !rc) + rc = ERROR_FAIL; + if (rc) + goto out; + /* * we need to get ifb first because it's needed for teardown */ @@ -411,17 +415,14 @@ out: static void netbuf_teardown_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { - int rc; libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); libxl__remus_device *dev = CONTAINER_OF(aodev, *dev, aodev); libxl__remus_device_nic *remus_nic = dev->concrete_data; - if (status) + if (status && !rc) rc = ERROR_FAIL; - else - rc = 0; free_qdisc(remus_nic); diff --git a/tools/libxl/libxl_remus_disk_drbd.c b/tools/libxl/libxl_remus_disk_drbd.c index 5e0c9a6..fc76b89 100644 --- a/tools/libxl/libxl_remus_disk_drbd.c +++ b/tools/libxl/libxl_remus_disk_drbd.c @@ -78,7 +78,7 @@ out: /* callbacks */ static void match_async_exec_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); /* implementations */ @@ -133,9 +133,8 @@ out: static void match_async_exec_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { - int rc; libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); libxl__remus_device *dev = CONTAINER_OF(aodev, *dev, aodev); libxl__remus_drbd_disk *drbd_disk; @@ -143,6 +142,9 @@ static void match_async_exec_cb(libxl__egc *egc, STATE_AO_GC(aodev->ao); + if (rc) + goto out; + if (status) { rc = ERROR_REMUS_DEVOPS_DOES_NOT_MATCH; /* BUG: seems to assume that any exit status means `no match' */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:02:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OP2-0007iS-D3; Mon, 29 Jun 2015 02:02:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OP1-0007iI-Ch for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:31 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id F6/96-06739-637A0955; Mon, 29 Jun 2015 02:02:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435543348!21311728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23617 invoked from network); 29 Jun 2015 02:02:29 -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; 29 Jun 2015 02:02:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OOy-0002OC-Hs for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OOy-0005MW-Ci for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:28 +0000 Date: Mon, 29 Jun 2015 02:02:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Make libxl__async_exec_* pass caller an rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3935054e76f85934db54e514dfb6db4cdfead30 Author: Ian Jackson AuthorDate: Tue Feb 10 16:27:39 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: events: Make libxl__async_exec_* pass caller an rc The internal user of libxl__async_exec_start et al now gets an rc as well as the process's exit status. For now this is always either 0 or ERROR_FAIL, but with ao abort requests this will possibly be ABORTED or TIMEDOUT too. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: Improve doc comment as suggested by Ian C. v2: New patch due to rebause; v1 had changes to device_hotplug_* scripts instead. Callback now gets unambiguous information about error situation: previously, if only thing that went wrong was that child died badly, rc would be FAILED, which was unambigously; now rc=0. Add a comment document the meaning of the rc and status parameters to the callback. --- tools/libxl/libxl_aoutils.c | 9 ++++++--- tools/libxl/libxl_device.c | 13 +++++++++---- tools/libxl/libxl_internal.h | 12 +++++++++++- tools/libxl/libxl_netbuffer.c | 19 ++++++++++--------- tools/libxl/libxl_remus_disk_drbd.c | 8 +++++--- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 1502ffe..450caae 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -534,11 +534,12 @@ static void async_exec_done(libxl__egc *egc, libxl__ev_time_deregister(gc, &aes->time); if (status) { - libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, - aes->what, pid, status); + if (!aes->rc) + libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, + aes->what, pid, status); } - aes->callback(egc, aes, status); + aes->callback(egc, aes, aes->rc, status); } void libxl__async_exec_init(libxl__async_exec_state *aes) @@ -557,6 +558,8 @@ int libxl__async_exec_start(libxl__async_exec_state *aes) libxl__ev_child *const child = &aes->child; char ** const args = aes->args; + aes->rc = 0; + /* Set execution timeout */ if (libxl__ev_time_register_rel(ao, &aes->time, async_exec_timeout, diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index b6276f6..012a9f8 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -729,7 +729,7 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev); static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); static void device_destroy_be_watch_cb(libxl__egc *egc, libxl__xswait_state *xswait, @@ -1052,7 +1052,7 @@ out: static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); STATE_AO_GC(aodev->ao); @@ -1061,12 +1061,17 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, device_hotplug_clean(gc, aodev); - if (status) { + if (status && !rc) { hotplug_error = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/hotplug-error", be_path)); if (hotplug_error) LOG(ERROR, "script: %s", hotplug_error); - aodev->rc = ERROR_FAIL; + rc = ERROR_FAIL; + } + + if (rc) { + if (!aodev->rc) + aodev->rc = rc; if (aodev->action == LIBXL__DEVICE_ACTION_ADD) /* * Only fail on device connection, on disconnection diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 44b662c..5b63e84 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2147,7 +2147,16 @@ _hidden const char *libxl__run_dir_path(void); typedef struct libxl__async_exec_state libxl__async_exec_state; typedef void libxl__async_exec_callback(libxl__egc *egc, - libxl__async_exec_state *aes, int status); + libxl__async_exec_state *aes, int rc, int status); +/* + * Meaning of status and rc: + * rc==0, status==0 all went well + * rc==0, status!=0 everything OK except child exited nonzero (logged) + * rc!=0 something else went wrong (status is real + * exit status; maybe reflecting SIGKILL, and + * therefore not very interesting, if aes code + * killed the child). Logged unless ABORTED. + */ struct libxl__async_exec_state { /* caller must fill these in */ @@ -2163,6 +2172,7 @@ struct libxl__async_exec_state { /* private */ libxl__ev_time time; libxl__ev_child child; + int rc; }; void libxl__async_exec_init(libxl__async_exec_state *aes); diff --git a/tools/libxl/libxl_netbuffer.c b/tools/libxl/libxl_netbuffer.c index edc6843..ff2d6c7 100644 --- a/tools/libxl/libxl_netbuffer.c +++ b/tools/libxl/libxl_netbuffer.c @@ -219,10 +219,10 @@ out: static void netbuf_setup_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); static void netbuf_teardown_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); /* * the script needs the following env & args @@ -327,14 +327,13 @@ out: */ static void netbuf_setup_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); libxl__remus_device *dev = CONTAINER_OF(aodev, *dev, aodev); libxl__remus_device_nic *remus_nic = dev->concrete_data; libxl__remus_devices_state *rds = dev->rds; const char *out_path_base, *hotplug_error = NULL; - int rc; STATE_AO_GC(rds->ao); @@ -344,6 +343,11 @@ static void netbuf_setup_script_cb(libxl__egc *egc, const char *const vif = remus_nic->vif; const char **const ifb = &remus_nic->ifb; + if (status && !rc) + rc = ERROR_FAIL; + if (rc) + goto out; + /* * we need to get ifb first because it's needed for teardown */ @@ -411,17 +415,14 @@ out: static void netbuf_teardown_script_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { - int rc; libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); libxl__remus_device *dev = CONTAINER_OF(aodev, *dev, aodev); libxl__remus_device_nic *remus_nic = dev->concrete_data; - if (status) + if (status && !rc) rc = ERROR_FAIL; - else - rc = 0; free_qdisc(remus_nic); diff --git a/tools/libxl/libxl_remus_disk_drbd.c b/tools/libxl/libxl_remus_disk_drbd.c index 5e0c9a6..fc76b89 100644 --- a/tools/libxl/libxl_remus_disk_drbd.c +++ b/tools/libxl/libxl_remus_disk_drbd.c @@ -78,7 +78,7 @@ out: /* callbacks */ static void match_async_exec_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status); + int rc, int status); /* implementations */ @@ -133,9 +133,8 @@ out: static void match_async_exec_cb(libxl__egc *egc, libxl__async_exec_state *aes, - int status) + int rc, int status) { - int rc; libxl__ao_device *aodev = CONTAINER_OF(aes, *aodev, aes); libxl__remus_device *dev = CONTAINER_OF(aodev, *dev, aodev); libxl__remus_drbd_disk *drbd_disk; @@ -143,6 +142,9 @@ static void match_async_exec_cb(libxl__egc *egc, STATE_AO_GC(aodev->ao); + if (rc) + goto out; + if (status) { rc = ERROR_REMUS_DEVOPS_DOES_NOT_MATCH; /* BUG: seems to assume that any exit status means `no match' */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:02:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OPE-0007ko-0v; Mon, 29 Jun 2015 02:02:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPB-0007kU-Qe for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:42 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 95/95-21074-147A0955; Mon, 29 Jun 2015 02:02:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435543358!17418557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26154 invoked from network); 29 Jun 2015 02:02:39 -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; 29 Jun 2015 02:02:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OP8-0002OM-Q3 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OP8-0005NB-MY for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:38 +0000 Date: Mon, 29 Jun 2015 02:02:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Permit timeouts to signal ao abort X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31c836f4da98fa515c14df7e7812aa9fb8c84e76 Author: Ian Jackson AuthorDate: Tue Feb 10 16:36:46 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: events: Permit timeouts to signal ao abort The callback functions provided by users must take an rc value. This rc value can be ERROR_TIMEDOUT or ERROR_ABORTED. Users of xswait are now expected to deal correctly with ERROR_ABORTED. If they experience this, it hasn't been logged. And the caller won't log it either since it's not TIMEDOUT. Luckily this is correct, so we can just change the doc comment. Currently nothing generates ERROR_ABORTED; in particular the timeouts cannot in fact signal abort requests. There should be no publicly visible change except that some error returns from libxl will change from ERROR_FAIL to ERROR_TIMEDOUT, and some changes to debugging messages. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: ABORTED not CANCELLED. --- tools/libxl/libxl_aoutils.c | 11 ++++++++--- tools/libxl/libxl_device.c | 8 +++++--- tools/libxl/libxl_dom.c | 29 ++++++++++++++++++++--------- tools/libxl/libxl_event.c | 8 ++++---- tools/libxl/libxl_internal.h | 12 +++++++----- tools/libxl/libxl_test_timedereg.c | 8 +++++--- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 450caae..593a575 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -80,12 +80,13 @@ void xswait_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *xsw, } void xswait_timeout_callback(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { EGC_GC; libxl__xswait_state *xswa = CONTAINER_OF(ev, *xswa, time_ev); LOG(DEBUG, "%s: xswait timeout (path=%s)", xswa->what, xswa->path); - xswait_report_error(egc, xswa, ERROR_TIMEDOUT); + xswait_report_error(egc, xswa, rc); } static void xswait_report_error(libxl__egc *egc, libxl__xswait_state *xswa, @@ -506,11 +507,15 @@ int libxl__openptys(libxl__openpty_state *op, static void async_exec_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { libxl__async_exec_state *aes = CONTAINER_OF(ev, *aes, time); STATE_AO_GC(aes->ao); + if (!aes->rc) + aes->rc = rc; + libxl__ev_time_deregister(gc, &aes->time); assert(libxl__ev_child_inuse(&aes->child)); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 012a9f8..8209629 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -717,7 +717,7 @@ out: /* This callback is part of the Qemu devices Badge */ static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, int rc); static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, int rc); @@ -880,7 +880,7 @@ out: } static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, int rc) { libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); STATE_AO_GC(aodev->ao); @@ -888,7 +888,9 @@ static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, char *state_path = GCSPRINTF("%s/state", be_path); const char *xs_state; xs_transaction_t t = 0; - int rc = 0; + + if (rc != ERROR_TIMEDOUT) + goto out; libxl__ev_time_deregister(gc, &aodev->timeout); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 40a2d79..b081ef7 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1162,7 +1162,8 @@ static void domain_suspend_callback_common_done(libxl__egc *egc, */ static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, + int rc); static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, const char *watch_path, const char *event_path); static void switch_logdirty_done(libxl__egc *egc, @@ -1289,7 +1290,8 @@ void libxl__domain_suspend_common_switch_qemu_logdirty } } static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, logdirty.timeout); STATE_AO_GC(dss->ao); @@ -1438,7 +1440,7 @@ static void suspend_common_wait_guest_watch(libxl__egc *egc, static void suspend_common_wait_guest_check(libxl__egc *egc, libxl__domain_suspend_state *dss); static void suspend_common_wait_guest_timeout(libxl__egc *egc, - libxl__ev_time *ev, const struct timeval *requested_abs); + libxl__ev_time *ev, const struct timeval *requested_abs, int rc); static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, @@ -1672,12 +1674,15 @@ static void suspend_common_wait_guest_check(libxl__egc *egc, } static void suspend_common_wait_guest_timeout(libxl__egc *egc, - libxl__ev_time *ev, const struct timeval *requested_abs) + libxl__ev_time *ev, const struct timeval *requested_abs, int rc) { libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, guest_timeout); STATE_AO_GC(dss->ao); - LOG(ERROR, "guest did not suspend, timed out"); - domain_suspend_common_done(egc, dss, ERROR_GUEST_TIMEDOUT); + if (rc == ERROR_TIMEDOUT) { + LOG(ERROR, "guest did not suspend, timed out"); + rc = ERROR_GUEST_TIMEDOUT; + } + domain_suspend_common_done(egc, dss, rc); } static void domain_suspend_common_guest_suspended(libxl__egc *egc, @@ -1929,7 +1934,8 @@ static void remus_devices_commit_cb(libxl__egc *egc, libxl__remus_devices_state *rds, int rc); static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, + int rc); static void libxl__remus_domain_checkpoint_callback(void *data) { @@ -2004,7 +2010,8 @@ out: } static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, checkpoint_timeout); @@ -2016,7 +2023,11 @@ static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev, * (xc_domain_save.c). in order to continue executing the infinite loop * (suspend, checkpoint, resume) in xc_domain_save(). */ - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, 1); + + if (rc) + dss->rc = rc; + + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } /*----- main code for suspending, in order of execution -----*/ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 217fe97..2809743 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -406,7 +406,7 @@ void libxl__ev_time_deregister(libxl__gc *gc, libxl__ev_time *ev) return; } -static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) +static void time_occurs(libxl__egc *egc, libxl__ev_time *etime, int rc) { DBG("ev_time=%p occurs abs=%lu.%06lu", etime, (unsigned long)etime->abs.tv_sec, @@ -414,7 +414,7 @@ static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) libxl__ev_time_callback *func = etime->func; etime->func = 0; - func(egc, etime, &etime->abs); + func(egc, etime, &etime->abs, rc); } @@ -1207,7 +1207,7 @@ static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, time_deregister(gc, etime); - time_occurs(egc, etime); + time_occurs(egc, etime, ERROR_TIMEDOUT); } } @@ -1274,7 +1274,7 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); - time_occurs(egc, ev); + time_occurs(egc, ev, ERROR_TIMEDOUT); out: CTX_UNLOCK; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5b63e84..d4617e4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -195,7 +195,8 @@ struct libxl__ev_fd { typedef struct libxl__ev_time libxl__ev_time; typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, + int rc); /* TIMEDOUT or ABORTED */ struct libxl__ev_time { /* caller should include this in their own struct */ /* read-only for caller, who may read only when registered: */ @@ -1134,13 +1135,13 @@ typedef struct libxl__xswait_state libxl__xswait_state; * Otherwise, xswait will continue waiting and watching and * will call you back later. * - * rc==ERROR_TIMEDOUT + * rc==ERROR_TIMEDOUT, rc==ERROR_ABORTED * * The specified timeout was reached. * This has NOT been logged (except to the debug log). * xswait will not continue (but calling libxl__xswait_stop is OK). * - * rc!=0, !=ERROR_TIMEDOUT + * rc!=0, !=ERROR_TIMEDOUT, !=ERROR_ABORTED * * Some other error occurred. * This HAS been logged. @@ -1180,8 +1181,9 @@ int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); typedef struct libxl__ev_devstate libxl__ev_devstate; typedef void libxl__ev_devstate_callback(libxl__egc *egc, libxl__ev_devstate*, int rc); - /* rc will be 0, ERROR_TIMEDOUT, ERROR_INVAL (meaning path was removed), - * or ERROR_FAIL if other stuff went wrong (in which latter case, logged) */ + /* rc will be 0, ERROR_TIMEDOUT, ERROR_ABORTED, ERROR_INVAL + * (meaning path was removed), or ERROR_FAIL if other stuff went + * wrong (in which latter case, logged) */ struct libxl__ev_devstate { /* read-only for caller, who may read only when waiting: */ diff --git a/tools/libxl/libxl_test_timedereg.c b/tools/libxl/libxl_test_timedereg.c index e2cc27d..c464663 100644 --- a/tools/libxl/libxl_test_timedereg.c +++ b/tools/libxl/libxl_test_timedereg.c @@ -28,7 +28,7 @@ static libxl__ao *tao; static int seq; static void occurs(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, int rc); static void regs(libxl__ao *ao, int j) { @@ -59,13 +59,15 @@ int libxl_test_timedereg(libxl_ctx *ctx, libxl_asyncop_how *ao_how) } static void occurs(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, int rc) { EGC_GC; int i; int off = ev - &et[0][0]; - LOG(DEBUG,"occurs[%d][%d] seq=%d", off/NTIMES, off%NTIMES, seq); + LOG(DEBUG,"occurs[%d][%d] seq=%d rc=%d", off/NTIMES, off%NTIMES, seq, rc); + + assert(!rc); switch (seq) { case 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 Jun 29 02:02:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OPE-0007ko-0v; Mon, 29 Jun 2015 02:02:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPB-0007kU-Qe for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:42 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 95/95-21074-147A0955; Mon, 29 Jun 2015 02:02:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435543358!17418557!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26154 invoked from network); 29 Jun 2015 02:02:39 -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; 29 Jun 2015 02:02:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OP8-0002OM-Q3 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OP8-0005NB-MY for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:38 +0000 Date: Mon, 29 Jun 2015 02:02:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Permit timeouts to signal ao abort X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31c836f4da98fa515c14df7e7812aa9fb8c84e76 Author: Ian Jackson AuthorDate: Tue Feb 10 16:36:46 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: events: Permit timeouts to signal ao abort The callback functions provided by users must take an rc value. This rc value can be ERROR_TIMEDOUT or ERROR_ABORTED. Users of xswait are now expected to deal correctly with ERROR_ABORTED. If they experience this, it hasn't been logged. And the caller won't log it either since it's not TIMEDOUT. Luckily this is correct, so we can just change the doc comment. Currently nothing generates ERROR_ABORTED; in particular the timeouts cannot in fact signal abort requests. There should be no publicly visible change except that some error returns from libxl will change from ERROR_FAIL to ERROR_TIMEDOUT, and some changes to debugging messages. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: ABORTED not CANCELLED. --- tools/libxl/libxl_aoutils.c | 11 ++++++++--- tools/libxl/libxl_device.c | 8 +++++--- tools/libxl/libxl_dom.c | 29 ++++++++++++++++++++--------- tools/libxl/libxl_event.c | 8 ++++---- tools/libxl/libxl_internal.h | 12 +++++++----- tools/libxl/libxl_test_timedereg.c | 8 +++++--- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 450caae..593a575 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -80,12 +80,13 @@ void xswait_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *xsw, } void xswait_timeout_callback(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { EGC_GC; libxl__xswait_state *xswa = CONTAINER_OF(ev, *xswa, time_ev); LOG(DEBUG, "%s: xswait timeout (path=%s)", xswa->what, xswa->path); - xswait_report_error(egc, xswa, ERROR_TIMEDOUT); + xswait_report_error(egc, xswa, rc); } static void xswait_report_error(libxl__egc *egc, libxl__xswait_state *xswa, @@ -506,11 +507,15 @@ int libxl__openptys(libxl__openpty_state *op, static void async_exec_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { libxl__async_exec_state *aes = CONTAINER_OF(ev, *aes, time); STATE_AO_GC(aes->ao); + if (!aes->rc) + aes->rc = rc; + libxl__ev_time_deregister(gc, &aes->time); assert(libxl__ev_child_inuse(&aes->child)); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 012a9f8..8209629 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -717,7 +717,7 @@ out: /* This callback is part of the Qemu devices Badge */ static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, int rc); static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, int rc); @@ -880,7 +880,7 @@ out: } static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, int rc) { libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); STATE_AO_GC(aodev->ao); @@ -888,7 +888,9 @@ static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, char *state_path = GCSPRINTF("%s/state", be_path); const char *xs_state; xs_transaction_t t = 0; - int rc = 0; + + if (rc != ERROR_TIMEDOUT) + goto out; libxl__ev_time_deregister(gc, &aodev->timeout); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 40a2d79..b081ef7 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1162,7 +1162,8 @@ static void domain_suspend_callback_common_done(libxl__egc *egc, */ static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, + int rc); static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, const char *watch_path, const char *event_path); static void switch_logdirty_done(libxl__egc *egc, @@ -1289,7 +1290,8 @@ void libxl__domain_suspend_common_switch_qemu_logdirty } } static void switch_logdirty_timeout(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, logdirty.timeout); STATE_AO_GC(dss->ao); @@ -1438,7 +1440,7 @@ static void suspend_common_wait_guest_watch(libxl__egc *egc, static void suspend_common_wait_guest_check(libxl__egc *egc, libxl__domain_suspend_state *dss); static void suspend_common_wait_guest_timeout(libxl__egc *egc, - libxl__ev_time *ev, const struct timeval *requested_abs); + libxl__ev_time *ev, const struct timeval *requested_abs, int rc); static void domain_suspend_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, @@ -1672,12 +1674,15 @@ static void suspend_common_wait_guest_check(libxl__egc *egc, } static void suspend_common_wait_guest_timeout(libxl__egc *egc, - libxl__ev_time *ev, const struct timeval *requested_abs) + libxl__ev_time *ev, const struct timeval *requested_abs, int rc) { libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, guest_timeout); STATE_AO_GC(dss->ao); - LOG(ERROR, "guest did not suspend, timed out"); - domain_suspend_common_done(egc, dss, ERROR_GUEST_TIMEDOUT); + if (rc == ERROR_TIMEDOUT) { + LOG(ERROR, "guest did not suspend, timed out"); + rc = ERROR_GUEST_TIMEDOUT; + } + domain_suspend_common_done(egc, dss, rc); } static void domain_suspend_common_guest_suspended(libxl__egc *egc, @@ -1929,7 +1934,8 @@ static void remus_devices_commit_cb(libxl__egc *egc, libxl__remus_devices_state *rds, int rc); static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, + int rc); static void libxl__remus_domain_checkpoint_callback(void *data) { @@ -2004,7 +2010,8 @@ out: } static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, + int rc) { libxl__domain_suspend_state *dss = CONTAINER_OF(ev, *dss, checkpoint_timeout); @@ -2016,7 +2023,11 @@ static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev, * (xc_domain_save.c). in order to continue executing the infinite loop * (suspend, checkpoint, resume) in xc_domain_save(). */ - libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, 1); + + if (rc) + dss->rc = rc; + + libxl__xc_domain_saverestore_async_callback_done(egc, &dss->shs, !rc); } /*----- main code for suspending, in order of execution -----*/ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 217fe97..2809743 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -406,7 +406,7 @@ void libxl__ev_time_deregister(libxl__gc *gc, libxl__ev_time *ev) return; } -static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) +static void time_occurs(libxl__egc *egc, libxl__ev_time *etime, int rc) { DBG("ev_time=%p occurs abs=%lu.%06lu", etime, (unsigned long)etime->abs.tv_sec, @@ -414,7 +414,7 @@ static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) libxl__ev_time_callback *func = etime->func; etime->func = 0; - func(egc, etime, &etime->abs); + func(egc, etime, &etime->abs, rc); } @@ -1207,7 +1207,7 @@ static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, time_deregister(gc, etime); - time_occurs(egc, etime); + time_occurs(egc, etime, ERROR_TIMEDOUT); } } @@ -1274,7 +1274,7 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); - time_occurs(egc, ev); + time_occurs(egc, ev, ERROR_TIMEDOUT); out: CTX_UNLOCK; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5b63e84..d4617e4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -195,7 +195,8 @@ struct libxl__ev_fd { typedef struct libxl__ev_time libxl__ev_time; typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, + int rc); /* TIMEDOUT or ABORTED */ struct libxl__ev_time { /* caller should include this in their own struct */ /* read-only for caller, who may read only when registered: */ @@ -1134,13 +1135,13 @@ typedef struct libxl__xswait_state libxl__xswait_state; * Otherwise, xswait will continue waiting and watching and * will call you back later. * - * rc==ERROR_TIMEDOUT + * rc==ERROR_TIMEDOUT, rc==ERROR_ABORTED * * The specified timeout was reached. * This has NOT been logged (except to the debug log). * xswait will not continue (but calling libxl__xswait_stop is OK). * - * rc!=0, !=ERROR_TIMEDOUT + * rc!=0, !=ERROR_TIMEDOUT, !=ERROR_ABORTED * * Some other error occurred. * This HAS been logged. @@ -1180,8 +1181,9 @@ int libxl__xswait_start(libxl__gc*, libxl__xswait_state*); typedef struct libxl__ev_devstate libxl__ev_devstate; typedef void libxl__ev_devstate_callback(libxl__egc *egc, libxl__ev_devstate*, int rc); - /* rc will be 0, ERROR_TIMEDOUT, ERROR_INVAL (meaning path was removed), - * or ERROR_FAIL if other stuff went wrong (in which latter case, logged) */ + /* rc will be 0, ERROR_TIMEDOUT, ERROR_ABORTED, ERROR_INVAL + * (meaning path was removed), or ERROR_FAIL if other stuff went + * wrong (in which latter case, logged) */ struct libxl__ev_devstate { /* read-only for caller, who may read only when waiting: */ diff --git a/tools/libxl/libxl_test_timedereg.c b/tools/libxl/libxl_test_timedereg.c index e2cc27d..c464663 100644 --- a/tools/libxl/libxl_test_timedereg.c +++ b/tools/libxl/libxl_test_timedereg.c @@ -28,7 +28,7 @@ static libxl__ao *tao; static int seq; static void occurs(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs); + const struct timeval *requested_abs, int rc); static void regs(libxl__ao *ao, int j) { @@ -59,13 +59,15 @@ int libxl_test_timedereg(libxl_ctx *ctx, libxl_asyncop_how *ao_how) } static void occurs(libxl__egc *egc, libxl__ev_time *ev, - const struct timeval *requested_abs) + const struct timeval *requested_abs, int rc) { EGC_GC; int i; int off = ev - &et[0][0]; - LOG(DEBUG,"occurs[%d][%d] seq=%d", off/NTIMES, off%NTIMES, seq); + LOG(DEBUG,"occurs[%d][%d] seq=%d rc=%d", off/NTIMES, off%NTIMES, seq, rc); + + assert(!rc); switch (seq) { case 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 Jun 29 02:02:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OPN-0007mj-3X; Mon, 29 Jun 2015 02:02:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPL-0007mH-O7 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:51 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id AD/A0-11060-B47A0955; Mon, 29 Jun 2015 02:02:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435543369!16187979!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4170 invoked from network); 29 Jun 2015 02:02:49 -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; 29 Jun 2015 02:02:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPJ-0002Ob-00 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPI-0005TG-Uc for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:48 +0000 Date: Mon, 29 Jun 2015 02:02:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: spawn: Preserve rc in error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a56a84b03636e639d00a3b11b238c6434c1e3fe Author: Ian Jackson AuthorDate: Tue Jun 23 18:06:48 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: spawn: Preserve rc in error path Make spawn provide an rc to its caller, and either pass it through from the timeout callback, or invent ERROR_FAIL, as applicable. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_dm.c | 8 +++++--- tools/libxl/libxl_exec.c | 36 ++++++++++++++++++++---------------- tools/libxl/libxl_internal.h | 5 +++-- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 33f9ce6..317a8eb 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1370,7 +1370,8 @@ static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, const char *xsdata); static void device_model_startup_failed(libxl__egc *egc, - libxl__spawn_state *spawn); + libxl__spawn_state *spawn, + int rc); static void device_model_detached(libxl__egc *egc, libxl__spawn_state *spawn); @@ -1540,10 +1541,11 @@ static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, } static void device_model_startup_failed(libxl__egc *egc, - libxl__spawn_state *spawn) + libxl__spawn_state *spawn, + int rc) { libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); - device_model_spawn_outcome(egc, dmss, ERROR_FAIL); + device_model_spawn_outcome(egc, dmss, rc); } static void device_model_detached(libxl__egc *egc, diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 478b4c2..85cbde0 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -238,11 +238,11 @@ err: /* * Full set of possible states of a libxl__spawn_state and its _detachable: * - * detaching failed mid timeout xswatch + * detaching rc mid timeout xswatch * - Undefined undef undef - undef undef * - Idle any any Idle Idle Idle * - Attached OK 0 0 Active Active Active - * - Attached Failed 0 1 Active Idle Idle + * - Attached Failed 0 non-0 Active Idle Idle * - Detaching 1 maybe Active Idle Idle * - Partial any any Idle Active/Idle Active/Idle * @@ -267,7 +267,7 @@ static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss); /* Precondition: Attached or Detaching; caller has logged failure reason. * Results: Detaching, or Attached Failed */ -static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss); +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss, int rc); void libxl__spawn_init(libxl__spawn_state *ss) { @@ -283,7 +283,7 @@ int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) int status, rc; libxl__spawn_init(ss); - ss->failed = ss->detaching = 0; + ss->rc = ss->detaching = 0; ss->xswait.ao = ao; ss->xswait.what = GCSPRINTF("%s startup", ss->what); @@ -352,12 +352,13 @@ static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) /* Precondition: Attached or Detaching, but caller must have just set - * at least one of detaching or failed. + * at least one of detaching or rc. * Results: Detaching or Attached Failed */ { int r; assert(libxl__ev_child_inuse(&ss->mid)); + assert(ss->detaching || ss->rc); libxl__xswait_stop(gc, &ss->xswait); pid_t child = ss->mid.pid; @@ -373,12 +374,13 @@ void libxl__spawn_initiate_detach(libxl__gc *gc, libxl__spawn_state *ss) spawn_detach(gc, ss); } -static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss) +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss, int rc) /* Caller must have logged. Must be last thing in calling function, * as it may make the callback. Precondition: Attached or Detaching. */ { EGC_GC; - ss->failed = 1; + assert(rc); + ss->rc = rc; spawn_detach(gc, ss); } @@ -391,9 +393,10 @@ static void spawn_watch_event(libxl__egc *egc, libxl__xswait_state *xswa, if (rc) { if (rc == ERROR_TIMEDOUT) LOG(ERROR, "%s: startup timed out", ss->what); - spawn_fail(egc, ss); /* must be last */ + spawn_fail(egc, ss, rc); /* must be last */ return; } + LOG(DEBUG, "%s: spawn watch p=%s", ss->what, p); ss->confirm_cb(egc, ss, p); /* must be last */ } @@ -404,7 +407,7 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, EGC_GC; libxl__spawn_state *ss = CONTAINER_OF(childw, *ss, mid); - if ((ss->failed || ss->detaching) && + if ((ss->rc || ss->detaching) && ((WIFEXITED(status) && WEXITSTATUS(status)==0) || (WIFSIGNALED(status) && WTERMSIG(status)==SIGKILL))) { /* as expected */ @@ -413,7 +416,7 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, const char *what = GCSPRINTF("%s intermediate process (startup monitor)", ss->what); libxl_report_child_exitstatus(CTX, loglevel, what, pid, status); - ss->failed = 1; + ss->rc = ERROR_FAIL; } else { if (!status) LOG(ERROR, "%s [%ld]: unexpectedly exited with exit status 0," @@ -432,19 +435,20 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, LOG(ERROR, "%s [%ld]: died during startup due to unknown fatal" " signal number %d", ss->what, (unsigned long)pid, sig); } - ss->failed = 1; + ss->rc = ERROR_FAIL; } spawn_cleanup(gc, ss); - if (ss->failed && !ss->detaching) { - ss->failure_cb(egc, ss); /* must be last */ + if (ss->rc && !ss->detaching) { + ss->failure_cb(egc, ss, ss->rc); /* must be last */ return; } - if (ss->failed && ss->detaching) - LOG(WARN,"%s underlying machinery seemed to fail," - " but its function seems to have been successful", ss->what); + if (ss->rc && ss->detaching) + LOG(WARN,"%s underlying machinery seemed to fail (%d)," + " but its function seems to have been successful", + ss->what, ss->rc); assert(ss->detaching); ss->detached_cb(egc, ss); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d4617e4..45b8a46 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1365,7 +1365,8 @@ libxl__spawn_midproc_cb(libxl__gc*, libxl__spawn_state*, pid_t inner); * The spawn state will be Idle on entry to the callback (and * it may be reused immediately if desired). */ -typedef void libxl__spawn_failure_cb(libxl__egc*, libxl__spawn_state*); +typedef void libxl__spawn_failure_cb(libxl__egc*, libxl__spawn_state*, + int rc); /* * Called when the xspath watch triggers. xspath will have been read @@ -1406,7 +1407,7 @@ struct libxl__spawn_state { /* remaining fields are private to libxl_spawn_... */ int detaching; /* we are in Detaching */ - int failed; /* might be true whenever we are not Idle */ + int rc; /* might be non-0 whenever we are not Idle */ libxl__ev_child mid; /* always in use whenever we are not Idle */ libxl__xswait_state xswait; }; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:02:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:02: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 1Z9OPN-0007mj-3X; Mon, 29 Jun 2015 02:02:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPL-0007mH-O7 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:51 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id AD/A0-11060-B47A0955; Mon, 29 Jun 2015 02:02:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435543369!16187979!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4170 invoked from network); 29 Jun 2015 02:02:49 -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; 29 Jun 2015 02:02:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPJ-0002Ob-00 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPI-0005TG-Uc for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:48 +0000 Date: Mon, 29 Jun 2015 02:02:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: spawn: Preserve rc in error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a56a84b03636e639d00a3b11b238c6434c1e3fe Author: Ian Jackson AuthorDate: Tue Jun 23 18:06:48 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: spawn: Preserve rc in error path Make spawn provide an rc to its caller, and either pass it through from the timeout callback, or invent ERROR_FAIL, as applicable. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_dm.c | 8 +++++--- tools/libxl/libxl_exec.c | 36 ++++++++++++++++++++---------------- tools/libxl/libxl_internal.h | 5 +++-- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 33f9ce6..317a8eb 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1370,7 +1370,8 @@ static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, const char *xsdata); static void device_model_startup_failed(libxl__egc *egc, - libxl__spawn_state *spawn); + libxl__spawn_state *spawn, + int rc); static void device_model_detached(libxl__egc *egc, libxl__spawn_state *spawn); @@ -1540,10 +1541,11 @@ static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, } static void device_model_startup_failed(libxl__egc *egc, - libxl__spawn_state *spawn) + libxl__spawn_state *spawn, + int rc) { libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); - device_model_spawn_outcome(egc, dmss, ERROR_FAIL); + device_model_spawn_outcome(egc, dmss, rc); } static void device_model_detached(libxl__egc *egc, diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 478b4c2..85cbde0 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -238,11 +238,11 @@ err: /* * Full set of possible states of a libxl__spawn_state and its _detachable: * - * detaching failed mid timeout xswatch + * detaching rc mid timeout xswatch * - Undefined undef undef - undef undef * - Idle any any Idle Idle Idle * - Attached OK 0 0 Active Active Active - * - Attached Failed 0 1 Active Idle Idle + * - Attached Failed 0 non-0 Active Idle Idle * - Detaching 1 maybe Active Idle Idle * - Partial any any Idle Active/Idle Active/Idle * @@ -267,7 +267,7 @@ static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss); /* Precondition: Attached or Detaching; caller has logged failure reason. * Results: Detaching, or Attached Failed */ -static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss); +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss, int rc); void libxl__spawn_init(libxl__spawn_state *ss) { @@ -283,7 +283,7 @@ int libxl__spawn_spawn(libxl__egc *egc, libxl__spawn_state *ss) int status, rc; libxl__spawn_init(ss); - ss->failed = ss->detaching = 0; + ss->rc = ss->detaching = 0; ss->xswait.ao = ao; ss->xswait.what = GCSPRINTF("%s startup", ss->what); @@ -352,12 +352,13 @@ static void spawn_cleanup(libxl__gc *gc, libxl__spawn_state *ss) static void spawn_detach(libxl__gc *gc, libxl__spawn_state *ss) /* Precondition: Attached or Detaching, but caller must have just set - * at least one of detaching or failed. + * at least one of detaching or rc. * Results: Detaching or Attached Failed */ { int r; assert(libxl__ev_child_inuse(&ss->mid)); + assert(ss->detaching || ss->rc); libxl__xswait_stop(gc, &ss->xswait); pid_t child = ss->mid.pid; @@ -373,12 +374,13 @@ void libxl__spawn_initiate_detach(libxl__gc *gc, libxl__spawn_state *ss) spawn_detach(gc, ss); } -static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss) +static void spawn_fail(libxl__egc *egc, libxl__spawn_state *ss, int rc) /* Caller must have logged. Must be last thing in calling function, * as it may make the callback. Precondition: Attached or Detaching. */ { EGC_GC; - ss->failed = 1; + assert(rc); + ss->rc = rc; spawn_detach(gc, ss); } @@ -391,9 +393,10 @@ static void spawn_watch_event(libxl__egc *egc, libxl__xswait_state *xswa, if (rc) { if (rc == ERROR_TIMEDOUT) LOG(ERROR, "%s: startup timed out", ss->what); - spawn_fail(egc, ss); /* must be last */ + spawn_fail(egc, ss, rc); /* must be last */ return; } + LOG(DEBUG, "%s: spawn watch p=%s", ss->what, p); ss->confirm_cb(egc, ss, p); /* must be last */ } @@ -404,7 +407,7 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, EGC_GC; libxl__spawn_state *ss = CONTAINER_OF(childw, *ss, mid); - if ((ss->failed || ss->detaching) && + if ((ss->rc || ss->detaching) && ((WIFEXITED(status) && WEXITSTATUS(status)==0) || (WIFSIGNALED(status) && WTERMSIG(status)==SIGKILL))) { /* as expected */ @@ -413,7 +416,7 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, const char *what = GCSPRINTF("%s intermediate process (startup monitor)", ss->what); libxl_report_child_exitstatus(CTX, loglevel, what, pid, status); - ss->failed = 1; + ss->rc = ERROR_FAIL; } else { if (!status) LOG(ERROR, "%s [%ld]: unexpectedly exited with exit status 0," @@ -432,19 +435,20 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, LOG(ERROR, "%s [%ld]: died during startup due to unknown fatal" " signal number %d", ss->what, (unsigned long)pid, sig); } - ss->failed = 1; + ss->rc = ERROR_FAIL; } spawn_cleanup(gc, ss); - if (ss->failed && !ss->detaching) { - ss->failure_cb(egc, ss); /* must be last */ + if (ss->rc && !ss->detaching) { + ss->failure_cb(egc, ss, ss->rc); /* must be last */ return; } - if (ss->failed && ss->detaching) - LOG(WARN,"%s underlying machinery seemed to fail," - " but its function seems to have been successful", ss->what); + if (ss->rc && ss->detaching) + LOG(WARN,"%s underlying machinery seemed to fail (%d)," + " but its function seems to have been successful", + ss->what, ss->rc); assert(ss->detaching); ss->detached_cb(egc, ss); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d4617e4..45b8a46 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1365,7 +1365,8 @@ libxl__spawn_midproc_cb(libxl__gc*, libxl__spawn_state*, pid_t inner); * The spawn state will be Idle on entry to the callback (and * it may be reused immediately if desired). */ -typedef void libxl__spawn_failure_cb(libxl__egc*, libxl__spawn_state*); +typedef void libxl__spawn_failure_cb(libxl__egc*, libxl__spawn_state*, + int rc); /* * Called when the xspath watch triggers. xspath will have been read @@ -1406,7 +1407,7 @@ struct libxl__spawn_state { /* remaining fields are private to libxl_spawn_... */ int detaching; /* we are in Detaching */ - int failed; /* might be true whenever we are not Idle */ + int rc; /* might be non-0 whenever we are not Idle */ libxl__ev_child mid; /* always in use whenever we are not Idle */ libxl__xswait_state xswait; }; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:03:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPX-0007pY-8f; Mon, 29 Jun 2015 02:03:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPV-0007pD-Nf for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:01 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id C0/3D-16276-457A0955; Mon, 29 Jun 2015 02:03:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435543379!16187995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4451 invoked from network); 29 Jun 2015 02:03:00 -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; 29 Jun 2015 02:03:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPT-0002Om-4k for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPT-0005Td-3k for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:59 +0000 Date: Mon, 29 Jun 2015 02:02:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: domain create: Do not destroy on ao abort X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f0c4c53ff29ad3dc2c79996cc3ef61e8d340af91 Author: Ian Jackson AuthorDate: Fri Dec 20 15:31:32 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: domain create: Do not destroy on ao abort If we aborted the domain creation, do not try to tear it down again Document this. This is a backwards-compatible API change since old libxl users will never abort any operations. In the current code, there is no functional change, because ERROR_ABORTED is never generated anywhere yet. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: ABORTED not CANCELLED. Always write out guest domid on completion. Do not trash rc with libxl__set_domain_configuration on preserve path. --- tools/libxl/libxl.h | 4 ++++ tools/libxl/libxl_create.c | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 0a7913b..b113d8c 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -975,6 +975,10 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */); /* domain related functions */ +/* If the result is ERROR_ABORTED, the domain may or may not exist + * (in a half-created state). *domid will be valid and will be the + * domain id, or -1, as appropriate */ + int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, const libxl_asyncop_how *ao_how, diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 86384d2..f366a09 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1519,7 +1519,9 @@ static void domcreate_complete(libxl__egc *egc, if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); - if (!rc) { + bool retain_domain = !rc || rc == ERROR_ABORTED; + + if (retain_domain) { libxl__domain_userdata_lock *lock; /* Note that we hold CTX lock at this point so only need to @@ -1530,15 +1532,17 @@ static void domcreate_complete(libxl__egc *egc, rc = ERROR_LOCK_FAIL; } else { libxl__update_domain_configuration(gc, d_config_saved, d_config); - rc = libxl__set_domain_configuration(gc, dcs->guest_domid, - d_config_saved); + int cfg_rc = libxl__set_domain_configuration + (gc, dcs->guest_domid, d_config_saved); + if (!rc) + rc = cfg_rc; libxl__unlock_domain_userdata(lock); } } libxl_domain_config_dispose(d_config_saved); - if (rc) { + if (!retain_domain) { if (dcs->guest_domid) { dcs->dds.ao = ao; dcs->dds.domid = dcs->guest_domid; @@ -1608,8 +1612,7 @@ static void domain_create_cb(libxl__egc *egc, libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); STATE_AO_GC(cdcs->dcs.ao); - if (!rc) - *cdcs->domid_out = domid; + *cdcs->domid_out = domid; libxl__ao_complete(egc, ao, 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 Mon Jun 29 02:03:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPX-0007pY-8f; Mon, 29 Jun 2015 02:03:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPV-0007pD-Nf for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:01 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id C0/3D-16276-457A0955; Mon, 29 Jun 2015 02:03:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1435543379!16187995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4451 invoked from network); 29 Jun 2015 02:03:00 -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; 29 Jun 2015 02:03:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPT-0002Om-4k for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPT-0005Td-3k for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:02:59 +0000 Date: Mon, 29 Jun 2015 02:02:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: domain create: Do not destroy on ao abort X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f0c4c53ff29ad3dc2c79996cc3ef61e8d340af91 Author: Ian Jackson AuthorDate: Fri Dec 20 15:31:32 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: domain create: Do not destroy on ao abort If we aborted the domain creation, do not try to tear it down again Document this. This is a backwards-compatible API change since old libxl users will never abort any operations. In the current code, there is no functional change, because ERROR_ABORTED is never generated anywhere yet. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: ABORTED not CANCELLED. Always write out guest domid on completion. Do not trash rc with libxl__set_domain_configuration on preserve path. --- tools/libxl/libxl.h | 4 ++++ tools/libxl/libxl_create.c | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 0a7913b..b113d8c 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -975,6 +975,10 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */); /* domain related functions */ +/* If the result is ERROR_ABORTED, the domain may or may not exist + * (in a half-created state). *domid will be valid and will be the + * domain id, or -1, as appropriate */ + int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, const libxl_asyncop_how *ao_how, diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 86384d2..f366a09 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1519,7 +1519,9 @@ static void domcreate_complete(libxl__egc *egc, if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); - if (!rc) { + bool retain_domain = !rc || rc == ERROR_ABORTED; + + if (retain_domain) { libxl__domain_userdata_lock *lock; /* Note that we hold CTX lock at this point so only need to @@ -1530,15 +1532,17 @@ static void domcreate_complete(libxl__egc *egc, rc = ERROR_LOCK_FAIL; } else { libxl__update_domain_configuration(gc, d_config_saved, d_config); - rc = libxl__set_domain_configuration(gc, dcs->guest_domid, - d_config_saved); + int cfg_rc = libxl__set_domain_configuration + (gc, dcs->guest_domid, d_config_saved); + if (!rc) + rc = cfg_rc; libxl__unlock_domain_userdata(lock); } } libxl_domain_config_dispose(d_config_saved); - if (rc) { + if (!retain_domain) { if (dcs->guest_domid) { dcs->dds.ao = ao; dcs->dds.domid = dcs->guest_domid; @@ -1608,8 +1612,7 @@ static void domain_create_cb(libxl__egc *egc, libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); STATE_AO_GC(cdcs->dcs.ao); - if (!rc) - *cdcs->domid_out = domid; + *cdcs->domid_out = domid; libxl__ao_complete(egc, ao, 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 Mon Jun 29 02:03:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03: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 1Z9OPg-0007rU-BE; Mon, 29 Jun 2015 02:03:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPf-0007rJ-Pe for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:11 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 06/2B-18947-F57A0955; Mon, 29 Jun 2015 02:03:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435543389!27354517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25440 invoked from network); 29 Jun 2015 02:03:10 -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; 29 Jun 2015 02:03:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPd-0002PN-9n for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPd-0005UE-8I for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:09 +0000 Date: Mon, 29 Jun 2015 02:03:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: Record ultimate parent of a nested ao X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 846a0b9bce8dd87be75e4b099047781819174bb1 Author: Ian Jackson AuthorDate: Fri Dec 20 15:54:21 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao: Record ultimate parent of a nested ao This will be used by the abort request machinery. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 25 +++++++++++++++---------- tools/libxl/libxl_internal.h | 3 ++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 2809743..47d65a3 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -31,6 +31,9 @@ #define DBG(args, ...) LIBXL__DBG_LOG(CTX, args, __VA_ARGS__) +static libxl__ao *ao_nested_root(libxl__ao *ao); + + /* * The counter osevent_in_hook is used to ensure that the application * honours the reentrancy restriction documented in libxl_event.h. @@ -1761,7 +1764,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) LOG(DEBUG,"ao %p: complete, rc=%d",ao,rc); assert(ao->magic == LIBXL__AO_MAGIC); assert(!ao->complete); - assert(!ao->nested); + assert(!ao->nested_root); ao->complete = 1; ao->rc = rc; @@ -1932,7 +1935,7 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, const libxl_asyncprogress_how *how, libxl_event *ev) { AO_GC; - assert(!ao->nested); + assert(!ao->nested_root); if (how->callback == dummy_asyncprogress_callback_ignore) { LOG(DEBUG,"ao %p: progress report: ignored",ao); libxl_event_free(CTX,ev); @@ -1955,21 +1958,23 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, /* nested ao */ +static libxl__ao *ao_nested_root(libxl__ao *ao) { + libxl__ao *root = ao->nested_root ? : ao; + assert(!root->nested_root); + return root; +} + _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) { - /* We only use the parent to get the ctx. However, we require the - * caller to provide us with an ao, not just a ctx, to prove that - * they are already in an asynchronous operation. That will avoid - * people using this to (for example) make an ao in a non-ao_how - * function somewhere in the middle of libxl. */ - libxl__ao *child = NULL; + libxl__ao *child = NULL, *root; libxl_ctx *ctx = libxl__gc_owner(&parent->gc); assert(parent->magic == LIBXL__AO_MAGIC); + root = ao_nested_root(parent); child = libxl__zalloc(&ctx->nogc_gc, sizeof(*child)); child->magic = LIBXL__AO_MAGIC; - child->nested = 1; + child->nested_root = root; LIBXL_INIT_GC(child->gc, ctx); libxl__gc *gc = &child->gc; @@ -1980,7 +1985,7 @@ _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) _hidden void libxl__nested_ao_free(libxl__ao *child) { assert(child->magic == LIBXL__AO_MAGIC); - assert(child->nested); + assert(child->nested_root); libxl_ctx *ctx = libxl__gc_owner(&child->gc); libxl__ao__destroy(ctx, child); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 45b8a46..9e57585 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -468,7 +468,8 @@ struct libxl__ao { * only in libxl__ao_complete.) */ uint32_t magic; - unsigned constructing:1, in_initiator:1, complete:1, notified:1, nested:1; + unsigned constructing:1, in_initiator:1, complete:1, notified:1; + libxl__ao *nested_root; int progress_reports_outstanding; int rc; libxl__gc 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 Mon Jun 29 02:03:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03: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 1Z9OPg-0007rU-BE; Mon, 29 Jun 2015 02:03:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPf-0007rJ-Pe for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:11 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 06/2B-18947-F57A0955; Mon, 29 Jun 2015 02:03:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435543389!27354517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25440 invoked from network); 29 Jun 2015 02:03:10 -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; 29 Jun 2015 02:03:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPd-0002PN-9n for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPd-0005UE-8I for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:09 +0000 Date: Mon, 29 Jun 2015 02:03:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: Record ultimate parent of a nested ao X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 846a0b9bce8dd87be75e4b099047781819174bb1 Author: Ian Jackson AuthorDate: Fri Dec 20 15:54:21 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao: Record ultimate parent of a nested ao This will be used by the abort request machinery. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 25 +++++++++++++++---------- tools/libxl/libxl_internal.h | 3 ++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 2809743..47d65a3 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -31,6 +31,9 @@ #define DBG(args, ...) LIBXL__DBG_LOG(CTX, args, __VA_ARGS__) +static libxl__ao *ao_nested_root(libxl__ao *ao); + + /* * The counter osevent_in_hook is used to ensure that the application * honours the reentrancy restriction documented in libxl_event.h. @@ -1761,7 +1764,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) LOG(DEBUG,"ao %p: complete, rc=%d",ao,rc); assert(ao->magic == LIBXL__AO_MAGIC); assert(!ao->complete); - assert(!ao->nested); + assert(!ao->nested_root); ao->complete = 1; ao->rc = rc; @@ -1932,7 +1935,7 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, const libxl_asyncprogress_how *how, libxl_event *ev) { AO_GC; - assert(!ao->nested); + assert(!ao->nested_root); if (how->callback == dummy_asyncprogress_callback_ignore) { LOG(DEBUG,"ao %p: progress report: ignored",ao); libxl_event_free(CTX,ev); @@ -1955,21 +1958,23 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, /* nested ao */ +static libxl__ao *ao_nested_root(libxl__ao *ao) { + libxl__ao *root = ao->nested_root ? : ao; + assert(!root->nested_root); + return root; +} + _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) { - /* We only use the parent to get the ctx. However, we require the - * caller to provide us with an ao, not just a ctx, to prove that - * they are already in an asynchronous operation. That will avoid - * people using this to (for example) make an ao in a non-ao_how - * function somewhere in the middle of libxl. */ - libxl__ao *child = NULL; + libxl__ao *child = NULL, *root; libxl_ctx *ctx = libxl__gc_owner(&parent->gc); assert(parent->magic == LIBXL__AO_MAGIC); + root = ao_nested_root(parent); child = libxl__zalloc(&ctx->nogc_gc, sizeof(*child)); child->magic = LIBXL__AO_MAGIC; - child->nested = 1; + child->nested_root = root; LIBXL_INIT_GC(child->gc, ctx); libxl__gc *gc = &child->gc; @@ -1980,7 +1985,7 @@ _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) _hidden void libxl__nested_ao_free(libxl__ao *child) { assert(child->magic == LIBXL__AO_MAGIC); - assert(child->nested); + assert(child->nested_root); libxl_ctx *ctx = libxl__gc_owner(&child->gc); libxl__ao__destroy(ctx, child); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 45b8a46..9e57585 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -468,7 +468,8 @@ struct libxl__ao { * only in libxl__ao_complete.) */ uint32_t magic; - unsigned constructing:1, in_initiator:1, complete:1, notified:1, nested:1; + unsigned constructing:1, in_initiator:1, complete:1, notified:1; + libxl__ao *nested_root; int progress_reports_outstanding; int rc; libxl__gc 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 Mon Jun 29 02:03:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03: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 1Z9OPq-0007tS-Dv; Mon, 29 Jun 2015 02:03:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPq-0007tH-1G for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:22 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 15/2F-18733-967A0955; Mon, 29 Jun 2015 02:03:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543399!27442735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7579 invoked from network); 29 Jun 2015 02:03:20 -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; 29 Jun 2015 02:03:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPn-0002PV-ET for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPn-0005Ug-DZ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:19 +0000 Date: Mon, 29 Jun 2015 02:03:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: Count the nested progeny of an ao X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1102ae7b4d19b8df78d5c9b48305cc3787488aa Author: Ian Jackson AuthorDate: Fri Dec 20 15:58:35 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao: Count the nested progeny of an ao This will detect any "escaped" nested aos. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 8 +++++++- tools/libxl/libxl_internal.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 47d65a3..96efb33 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1765,6 +1765,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) assert(ao->magic == LIBXL__AO_MAGIC); assert(!ao->complete); assert(!ao->nested_root); + assert(!ao->nested_progeny); ao->complete = 1; ao->rc = rc; @@ -1975,6 +1976,8 @@ _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) child = libxl__zalloc(&ctx->nogc_gc, sizeof(*child)); child->magic = LIBXL__AO_MAGIC; child->nested_root = root; + assert(root->nested_progeny < INT_MAX); + root->nested_progeny++; LIBXL_INIT_GC(child->gc, ctx); libxl__gc *gc = &child->gc; @@ -1985,7 +1988,10 @@ _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) _hidden void libxl__nested_ao_free(libxl__ao *child) { assert(child->magic == LIBXL__AO_MAGIC); - assert(child->nested_root); + libxl__ao *root = child->nested_root; + assert(root); + assert(root->nested_progeny > 0); + root->nested_progeny--; libxl_ctx *ctx = libxl__gc_owner(&child->gc); libxl__ao__destroy(ctx, child); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9e57585..79cdec1 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -470,6 +470,7 @@ struct libxl__ao { uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; libxl__ao *nested_root; + int nested_progeny; int progress_reports_outstanding; int rc; libxl__gc 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 Mon Jun 29 02:03:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03: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 1Z9OPq-0007tS-Dv; Mon, 29 Jun 2015 02:03:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPq-0007tH-1G for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:22 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 15/2F-18733-967A0955; Mon, 29 Jun 2015 02:03:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543399!27442735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7579 invoked from network); 29 Jun 2015 02:03:20 -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; 29 Jun 2015 02:03:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPn-0002PV-ET for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPn-0005Ug-DZ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:19 +0000 Date: Mon, 29 Jun 2015 02:03:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: Count the nested progeny of an ao X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1102ae7b4d19b8df78d5c9b48305cc3787488aa Author: Ian Jackson AuthorDate: Fri Dec 20 15:58:35 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao: Count the nested progeny of an ao This will detect any "escaped" nested aos. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 8 +++++++- tools/libxl/libxl_internal.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 47d65a3..96efb33 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1765,6 +1765,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) assert(ao->magic == LIBXL__AO_MAGIC); assert(!ao->complete); assert(!ao->nested_root); + assert(!ao->nested_progeny); ao->complete = 1; ao->rc = rc; @@ -1975,6 +1976,8 @@ _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) child = libxl__zalloc(&ctx->nogc_gc, sizeof(*child)); child->magic = LIBXL__AO_MAGIC; child->nested_root = root; + assert(root->nested_progeny < INT_MAX); + root->nested_progeny++; LIBXL_INIT_GC(child->gc, ctx); libxl__gc *gc = &child->gc; @@ -1985,7 +1988,10 @@ _hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) _hidden void libxl__nested_ao_free(libxl__ao *child) { assert(child->magic == LIBXL__AO_MAGIC); - assert(child->nested_root); + libxl__ao *root = child->nested_root; + assert(root); + assert(root->nested_progeny > 0); + root->nested_progeny--; libxl_ctx *ctx = libxl__gc_owner(&child->gc); libxl__ao__destroy(ctx, child); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9e57585..79cdec1 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -470,6 +470,7 @@ struct libxl__ao { uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; libxl__ao *nested_root; + int nested_progeny; int progress_reports_outstanding; int rc; libxl__gc 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 Mon Jun 29 02:03:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03: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 1Z9OQ1-0007ve-Gg; Mon, 29 Jun 2015 02:03:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQ0-0007vN-4P for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:32 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 5A/36-15949-377A0955; Mon, 29 Jun 2015 02:03:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1435543409!14568423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22650 invoked from network); 29 Jun 2015 02:03:30 -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; 29 Jun 2015 02:03:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPx-0002Pf-JL for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPx-0005Vc-I0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:29 +0000 Date: Mon, 29 Jun 2015 02:03:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: Provide manip_refcnt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc0b4c80cb61583eba2fd99a21d6a4e337233818 Author: Ian Jackson AuthorDate: Fri Dec 20 16:34:41 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao: Provide manip_refcnt Previously we used in_initiator to stop the ao being freed while we were still in the initiator function (which would result in the initiator's call to libxl__ao_inprogress accessing the ao after it had been freed). We are going to introduce a new libxl entrypoint which finds, and operates on, ongoing aos. This function needs the same protection, and might even end up running on the same ao multiple times concurrently. So do this with reference counting instead, with a new variable ao->manip_refcnt. We keep ao->in_initiator because that allows us to keep some useful asserts about the sequencing of libxl__ao_inprogress, etc. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v5: Fix typo in commit message. v3: Add a missing space. Mention locking in the comment. --- tools/libxl/libxl_event.c | 43 +++++++++++++++++++++++++++++++++-------- tools/libxl/libxl_internal.h | 1 + 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 96efb33..6d5f9d8 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -33,6 +33,8 @@ static libxl__ao *ao_nested_root(libxl__ao *ao); +static void ao__check_destroy(libxl_ctx *ctx, libxl__ao *ao); + /* * The counter osevent_in_hook is used to ensure that the application @@ -1347,8 +1349,7 @@ static void egc_run_callbacks(libxl__egc *egc) ao->how.callback(CTX, ao->rc, ao->how.u.for_callback); CTX_LOCK; ao->notified = 1; - if (!ao->in_initiator) - libxl__ao__destroy(CTX, ao); + ao__check_destroy(CTX, ao); CTX_UNLOCK; } } @@ -1729,6 +1730,33 @@ int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, * - destroy the ao */ + +/* + * A "manip" is a libxl public function manipulating this ao, which + * has a pointer to it. We have to not destroy it while that's the + * case, obviously. Callers must have the ctx locked, obviously. + */ +static void ao__manip_enter(libxl__ao *ao) +{ + assert(ao->manip_refcnt < INT_MAX); + ao->manip_refcnt++; +} + +static void ao__manip_leave(libxl_ctx *ctx, libxl__ao *ao) +{ + assert(ao->manip_refcnt > 0); + ao->manip_refcnt--; + ao__check_destroy(ctx, ao); +} + +static void ao__check_destroy(libxl_ctx *ctx, libxl__ao *ao) +{ + if (!ao->manip_refcnt && ao->notified) { + assert(ao->complete); + libxl__ao__destroy(ctx, ao); + } +} + void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) { AO_GC; @@ -1810,8 +1838,8 @@ void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) } ao->notified = 1; } - if (!ao->in_initiator && ao->notified) - libxl__ao__destroy(ctx, ao); + + ao__check_destroy(ctx, ao); } libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, @@ -1826,6 +1854,7 @@ libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, ao->magic = LIBXL__AO_MAGIC; ao->constructing = 1; ao->in_initiator = 1; + ao__manip_enter(ao); ao->poller = 0; ao->domid = domid; LIBXL_INIT_GC(ao->gc, ctx); @@ -1906,11 +1935,7 @@ int libxl__ao_inprogress(libxl__ao *ao, } ao->in_initiator = 0; - - if (ao->notified) { - assert(ao->complete); - libxl__ao__destroy(CTX,ao); - } + ao__manip_leave(CTX, ao); return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 79cdec1..02314b6 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -469,6 +469,7 @@ struct libxl__ao { */ uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; + int manip_refcnt; libxl__ao *nested_root; int nested_progeny; int progress_reports_outstanding; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:03:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03: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 1Z9OQ1-0007ve-Gg; Mon, 29 Jun 2015 02:03:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQ0-0007vN-4P for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:32 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 5A/36-15949-377A0955; Mon, 29 Jun 2015 02:03:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1435543409!14568423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22650 invoked from network); 29 Jun 2015 02:03:30 -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; 29 Jun 2015 02:03:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OPx-0002Pf-JL for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OPx-0005Vc-I0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:29 +0000 Date: Mon, 29 Jun 2015 02:03:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: Provide manip_refcnt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc0b4c80cb61583eba2fd99a21d6a4e337233818 Author: Ian Jackson AuthorDate: Fri Dec 20 16:34:41 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao: Provide manip_refcnt Previously we used in_initiator to stop the ao being freed while we were still in the initiator function (which would result in the initiator's call to libxl__ao_inprogress accessing the ao after it had been freed). We are going to introduce a new libxl entrypoint which finds, and operates on, ongoing aos. This function needs the same protection, and might even end up running on the same ao multiple times concurrently. So do this with reference counting instead, with a new variable ao->manip_refcnt. We keep ao->in_initiator because that allows us to keep some useful asserts about the sequencing of libxl__ao_inprogress, etc. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v5: Fix typo in commit message. v3: Add a missing space. Mention locking in the comment. --- tools/libxl/libxl_event.c | 43 +++++++++++++++++++++++++++++++++-------- tools/libxl/libxl_internal.h | 1 + 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 96efb33..6d5f9d8 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -33,6 +33,8 @@ static libxl__ao *ao_nested_root(libxl__ao *ao); +static void ao__check_destroy(libxl_ctx *ctx, libxl__ao *ao); + /* * The counter osevent_in_hook is used to ensure that the application @@ -1347,8 +1349,7 @@ static void egc_run_callbacks(libxl__egc *egc) ao->how.callback(CTX, ao->rc, ao->how.u.for_callback); CTX_LOCK; ao->notified = 1; - if (!ao->in_initiator) - libxl__ao__destroy(CTX, ao); + ao__check_destroy(CTX, ao); CTX_UNLOCK; } } @@ -1729,6 +1730,33 @@ int libxl_event_wait(libxl_ctx *ctx, libxl_event **event_r, * - destroy the ao */ + +/* + * A "manip" is a libxl public function manipulating this ao, which + * has a pointer to it. We have to not destroy it while that's the + * case, obviously. Callers must have the ctx locked, obviously. + */ +static void ao__manip_enter(libxl__ao *ao) +{ + assert(ao->manip_refcnt < INT_MAX); + ao->manip_refcnt++; +} + +static void ao__manip_leave(libxl_ctx *ctx, libxl__ao *ao) +{ + assert(ao->manip_refcnt > 0); + ao->manip_refcnt--; + ao__check_destroy(ctx, ao); +} + +static void ao__check_destroy(libxl_ctx *ctx, libxl__ao *ao) +{ + if (!ao->manip_refcnt && ao->notified) { + assert(ao->complete); + libxl__ao__destroy(ctx, ao); + } +} + void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) { AO_GC; @@ -1810,8 +1838,8 @@ void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) } ao->notified = 1; } - if (!ao->in_initiator && ao->notified) - libxl__ao__destroy(ctx, ao); + + ao__check_destroy(ctx, ao); } libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, @@ -1826,6 +1854,7 @@ libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, ao->magic = LIBXL__AO_MAGIC; ao->constructing = 1; ao->in_initiator = 1; + ao__manip_enter(ao); ao->poller = 0; ao->domid = domid; LIBXL_INIT_GC(ao->gc, ctx); @@ -1906,11 +1935,7 @@ int libxl__ao_inprogress(libxl__ao *ao, } ao->in_initiator = 0; - - if (ao->notified) { - assert(ao->complete); - libxl__ao__destroy(CTX,ao); - } + ao__manip_leave(CTX, ao); return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 79cdec1..02314b6 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -469,6 +469,7 @@ struct libxl__ao { */ uint32_t magic; unsigned constructing:1, in_initiator:1, complete:1, notified:1; + int manip_refcnt; libxl__ao *nested_root; int nested_progeny; int progress_reports_outstanding; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:03:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQB-0007xd-JN; Mon, 29 Jun 2015 02:03:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQA-0007xO-Sn for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:43 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 5A/BA-28408-E77A0955; Mon, 29 Jun 2015 02:03:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435543419!20667520!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9099 invoked from network); 29 Jun 2015 02:03:40 -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; 29 Jun 2015 02:03:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQ7-0002Pn-PN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQ7-0005WM-O4 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:39 +0000 Date: Mon, 29 Jun 2015 02:03:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Provide public ao abort request API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29db7f65d69bbb34029c57d9356bf7c0e6f05513 Author: Ian Jackson AuthorDate: Fri Dec 20 16:34:50 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Provide public ao abort request API Provide libxl_ao_abort. There is machinery to allow an ao to register an interest in abort requests, using a libxl__ao_abortable. This API is not currently very functional: requesting abort will never have any effect. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v5: Clarify API doc comment re aborting synchronous operations. v4: Rename from cancel to abort. Actually record aos on aos_inprogress. (Report from Koushik Chakravarty at Citrix.) Do not mark libxl_ao_cancel hidden (!) Abolish ERROR_NOTIMPLEMENTED from libxl_ao_cancel. All operations are supposed to support cancellation. v2: Minor comment improvements --- tools/libxl/libxl.c | 3 + tools/libxl/libxl.h | 58 ++++++++++++++++++ tools/libxl/libxl_event.c | 132 +++++++++++++++++++++++++++++++++++++++++- tools/libxl/libxl_internal.h | 41 +++++++++++++- 4 files changed, 230 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index cfbae7c..37069b7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -73,6 +73,8 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, LIBXL_LIST_INIT(&ctx->evtchns_waiting); libxl__ev_fd_init(&ctx->evtchn_efd); + LIBXL_LIST_INIT(&ctx->aos_inprogress); + LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); @@ -174,6 +176,7 @@ int libxl_ctx_free(libxl_ctx *ctx) assert(LIBXL_LIST_EMPTY(&ctx->efds)); assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); assert(LIBXL_LIST_EMPTY(&ctx->evtchns_waiting)); + assert(LIBXL_LIST_EMPTY(&ctx->aos_inprogress)); if (ctx->xch) xc_interface_close(ctx->xch); libxl_version_info_dispose(&ctx->version_info); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index b113d8c..b5a8fdf 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -688,6 +688,11 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_DEVICE_CHANNEL 1 +/* + * LIBXL_HAVE_AO_ABORT indicates the availability of libxl_ao_abort + */ +#define LIBXL_HAVE_AO_ABORT 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ @@ -965,6 +970,59 @@ typedef struct { void *for_callback; /* passed to callback */ } libxl_asyncprogress_how; +/* + * It is sometimes possible to abort an asynchronous operation. + * + * libxl_ao_abort searches for an ongoing asynchronous operation whose + * ao_how is identical to *how, and tries to abort it. The return + * values from libxl_ao_abort are as follows: + * + * 0 + * + * The operation was found, and attempts are being made to cut it + * short. However, it may still take some time to stop. It is + * also possible that the operation will nevertheless complete + * successfully. + * + * ERROR_NOTFOUND + * + * No matching ongoing operation was found. This might happen + * for an actual operation if the operation has already completed + * (perhaps on another thread). The call to libxl_ao_abort has + * had no effect. + * + * ERROR_ABORTED + * + * The operation has already been the subject of at least one + * call to libxl_ao_abort. + * + * If the operation was indeed cut short due to the abort request, it + * will complete, at some point in the future, with ERROR_ABORTED. In + * that case, depending on the operation it have performed some of the + * work in question and left the operation half-done. Consult the + * documentation for individual operations. + * + * Note that an aborted operation might still fail for other reasons + * even after the abort was requested. + * + * If your application is multithreaded you must not reuse an + * ao_how->for_event or ao_how->for_callback value (with a particular + * ao_how->callback) unless you are sure that none of your other + * threads are going to abort the previous operation using that + * value; otherwise you risk aborting the wrong operation if the + * intended target of the abort request completes in the meantime. + * + * It is possible to abort even an operation which is being performed + * synchronously, but since in that case how==NULL you had better only + * have one such operation, because it is not possible to tell them + * apart (and libxl_ao_abort will abort only the first one it finds). + * (And, if you want to do this, obviously the abort would have to be + * requested on a different thread.) + */ +int libxl_ao_abort(libxl_ctx *ctx, const libxl_asyncop_how *how) + LIBXL_EXTERNAL_CALLERS_ONLY; + + #define LIBXL_VERSION 0 /* context functions */ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 6d5f9d8..f9daa55 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1776,6 +1776,8 @@ void libxl__ao_create_fail(libxl__ao *ao) assert(ao->in_initiator); assert(!ao->complete); assert(!ao->progress_reports_outstanding); + assert(!ao->aborting); + LIBXL_LIST_REMOVE(ao, inprogress_entry); libxl__ao__destroy(CTX, ao); } @@ -1796,7 +1798,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) assert(!ao->nested_progeny); ao->complete = 1; ao->rc = rc; - + LIBXL_LIST_REMOVE(ao, inprogress_entry); libxl__ao_complete_check_progress_reports(egc, ao); } @@ -1869,6 +1871,8 @@ libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, "ao %p: create: how=%p callback=%p poller=%p", ao, how, ao->how.callback, ao->poller); + LIBXL_LIST_INSERT_HEAD(&ctx->aos_inprogress, ao, inprogress_entry); + return ao; out: @@ -1922,8 +1926,8 @@ int libxl__ao_inprogress(libxl__ao *ao, sleep(1); /* It's either this or return ERROR_I_DONT_KNOW_WHETHER * _THE_THING_YOU_ASKED_FOR_WILL_BE_DONE_LATER_WHEN - * _YOU_DIDNT_EXPECT_IT, since we don't have any kind of - * cancellation ability. */ + * _YOU_DIDNT_EXPECT_IT, since we don't have a + * synchronous cancellation ability. */ } CTX_UNLOCK; @@ -1941,6 +1945,128 @@ int libxl__ao_inprogress(libxl__ao *ao, } +/* abort requests */ + +static int ao__abort(libxl_ctx *ctx, libxl__ao *parent) +/* Temporarily unlocks ctx, which must be locked exactly once on entry. */ +{ + int rc; + ao__manip_enter(parent); + + if (parent->aborting) { + rc = ERROR_ABORTED; + goto out; + } + + parent->aborting = 1; + + if (LIBXL_LIST_EMPTY(&parent->abortables)) { + LIBXL__LOG(ctx, XTL_DEBUG, + "ao %p: abort requested and noted, but no-one interested", + parent); + rc = 0; + goto out; + } + + /* We keep calling abort hooks until there are none left */ + while (!LIBXL_LIST_EMPTY(&parent->abortables)) { + libxl__egc egc; + LIBXL_INIT_EGC(egc,ctx); + + assert(!parent->complete); + + libxl__ao_abortable *abrt = LIBXL_LIST_FIRST(&parent->abortables); + assert(parent == ao_nested_root(abrt->ao)); + + LIBXL_LIST_REMOVE(abrt, entry); + abrt->registered = 0; + + LIBXL__LOG(ctx, XTL_DEBUG, "ao %p: abrt=%p: aborting", + parent, abrt->ao); + abrt->callback(&egc, abrt, ERROR_ABORTED); + + libxl__ctx_unlock(ctx); + libxl__egc_cleanup(&egc); + libxl__ctx_lock(ctx); + } + + rc = 0; + + out: + ao__manip_leave(ctx, parent); + return rc; +} + +int libxl_ao_abort(libxl_ctx *ctx, const libxl_asyncop_how *how) +{ + libxl__ao *search; + libxl__ctx_lock(ctx); + int rc; + + LIBXL_LIST_FOREACH(search, &ctx->aos_inprogress, inprogress_entry) { + if (how) { + /* looking for ao to be reported by callback or event */ + if (search->poller) + /* sync */ + continue; + if (how->callback != search->how.callback) + continue; + if (how->callback + ? (how->u.for_callback != search->how.u.for_callback) + : (how->u.for_event != search->how.u.for_event)) + continue; + } else { + /* looking for synchronous call */ + if (!search->poller) + /* async */ + continue; + } + goto found; + } + rc = ERROR_NOTFOUND; + goto out; + + found: + rc = ao__abort(ctx, search); + out: + libxl__ctx_unlock(ctx); + return rc; +} + +int libxl__ao_abortable_register(libxl__ao_abortable *abrt) +{ + libxl__ao *ao = abrt->ao; + libxl__ao *root = ao_nested_root(ao); + AO_GC; + + if (root->aborting) { + DBG("ao=%p: preemptively aborting ao_abortable registration %p (root=%p)", + ao, abrt, root); + return ERROR_ABORTED; + } + + DBG("ao=%p, abrt=%p: registering (root=%p)", ao, abrt, root); + LIBXL_LIST_INSERT_HEAD(&root->abortables, abrt, entry); + abrt->registered = 1; + + return 0; +} + +_hidden void libxl__ao_abortable_deregister(libxl__ao_abortable *abrt) +{ + if (!abrt->registered) + return; + + libxl__ao *ao = abrt->ao; + libxl__ao *root __attribute__((unused)) = ao_nested_root(ao); + AO_GC; + + DBG("ao=%p, abrt=%p: deregistering (root=%p)", ao, abrt, root); + LIBXL_LIST_REMOVE(abrt, entry); + abrt->registered = 0; +} + + /* progress reporting */ /* The application indicates a desire to ignore events by passing NULL diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 02314b6..411f7ad 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -193,6 +193,40 @@ struct libxl__ev_fd { }; +typedef struct libxl__ao_abortable libxl__ao_abortable; +typedef void libxl__ao_abortable_callback(libxl__egc *egc, + libxl__ao_abortable *ao_abortable, int rc /* ABORTED */); + +struct libxl__ao_abortable { + /* caller must fill this in and it must remain valid */ + libxl__ao *ao; + libxl__ao_abortable_callback *callback; + /* remainder is private for abort machinery */ + bool registered; + LIBXL_LIST_ENTRY(libxl__ao_abortable) entry; + /* + * For nested aos: + * Semantically, abort affects the whole tree of aos, + * not just the parent. + * libxl__ao_abortable.ao refers to the child, so + * that the child callback sees the right ao. (After all, + * it was code dealing with the child that set .ao.) + * But, the abortable is recorded on the "abortables" list + * for the ultimate root ao, so that every possible child + * abort occurs as a result of the abort of the parent. + * We set ao->aborting only in the root. + */ +}; + +_hidden int libxl__ao_abortable_register(libxl__ao_abortable*); +_hidden void libxl__ao_abortable_deregister(libxl__ao_abortable*); + +static inline void libxl__ao_abortable_init + (libxl__ao_abortable *c) { c->registered = 0; } +static inline bool libxl__ao_abortable_isregistered + (const libxl__ao_abortable *c) { return c->registered; } + + typedef struct libxl__ev_time libxl__ev_time; typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs, @@ -382,6 +416,8 @@ struct libxl__ctx { LIBXL_LIST_HEAD(, libxl__ev_evtchn) evtchns_waiting; libxl__ev_fd evtchn_efd; + LIBXL_LIST_HEAD(, libxl__ao) aos_inprogress; + LIBXL_TAILQ_HEAD(libxl__evgen_domain_death_list, libxl_evgen_domain_death) death_list /* sorted by domid */, death_reported; @@ -468,12 +504,15 @@ struct libxl__ao { * only in libxl__ao_complete.) */ uint32_t magic; - unsigned constructing:1, in_initiator:1, complete:1, notified:1; + unsigned constructing:1, in_initiator:1, complete:1, notified:1, + aborting:1; int manip_refcnt; libxl__ao *nested_root; int nested_progeny; int progress_reports_outstanding; int rc; + LIBXL_LIST_HEAD(, libxl__ao_abortable) abortables; + LIBXL_LIST_ENTRY(libxl__ao) inprogress_entry; libxl__gc gc; libxl_asyncop_how how; libxl__poller *poller; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:03:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQB-0007xd-JN; Mon, 29 Jun 2015 02:03:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQA-0007xO-Sn for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:43 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 5A/BA-28408-E77A0955; Mon, 29 Jun 2015 02:03:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435543419!20667520!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9099 invoked from network); 29 Jun 2015 02:03:40 -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; 29 Jun 2015 02:03:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQ7-0002Pn-PN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQ7-0005WM-O4 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:39 +0000 Date: Mon, 29 Jun 2015 02:03:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Provide public ao abort request API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29db7f65d69bbb34029c57d9356bf7c0e6f05513 Author: Ian Jackson AuthorDate: Fri Dec 20 16:34:50 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Provide public ao abort request API Provide libxl_ao_abort. There is machinery to allow an ao to register an interest in abort requests, using a libxl__ao_abortable. This API is not currently very functional: requesting abort will never have any effect. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v5: Clarify API doc comment re aborting synchronous operations. v4: Rename from cancel to abort. Actually record aos on aos_inprogress. (Report from Koushik Chakravarty at Citrix.) Do not mark libxl_ao_cancel hidden (!) Abolish ERROR_NOTIMPLEMENTED from libxl_ao_cancel. All operations are supposed to support cancellation. v2: Minor comment improvements --- tools/libxl/libxl.c | 3 + tools/libxl/libxl.h | 58 ++++++++++++++++++ tools/libxl/libxl_event.c | 132 +++++++++++++++++++++++++++++++++++++++++- tools/libxl/libxl_internal.h | 41 +++++++++++++- 4 files changed, 230 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index cfbae7c..37069b7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -73,6 +73,8 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, LIBXL_LIST_INIT(&ctx->evtchns_waiting); libxl__ev_fd_init(&ctx->evtchn_efd); + LIBXL_LIST_INIT(&ctx->aos_inprogress); + LIBXL_TAILQ_INIT(&ctx->death_list); libxl__ev_xswatch_init(&ctx->death_watch); @@ -174,6 +176,7 @@ int libxl_ctx_free(libxl_ctx *ctx) assert(LIBXL_LIST_EMPTY(&ctx->efds)); assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); assert(LIBXL_LIST_EMPTY(&ctx->evtchns_waiting)); + assert(LIBXL_LIST_EMPTY(&ctx->aos_inprogress)); if (ctx->xch) xc_interface_close(ctx->xch); libxl_version_info_dispose(&ctx->version_info); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index b113d8c..b5a8fdf 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -688,6 +688,11 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_DEVICE_CHANNEL 1 +/* + * LIBXL_HAVE_AO_ABORT indicates the availability of libxl_ao_abort + */ +#define LIBXL_HAVE_AO_ABORT 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ @@ -965,6 +970,59 @@ typedef struct { void *for_callback; /* passed to callback */ } libxl_asyncprogress_how; +/* + * It is sometimes possible to abort an asynchronous operation. + * + * libxl_ao_abort searches for an ongoing asynchronous operation whose + * ao_how is identical to *how, and tries to abort it. The return + * values from libxl_ao_abort are as follows: + * + * 0 + * + * The operation was found, and attempts are being made to cut it + * short. However, it may still take some time to stop. It is + * also possible that the operation will nevertheless complete + * successfully. + * + * ERROR_NOTFOUND + * + * No matching ongoing operation was found. This might happen + * for an actual operation if the operation has already completed + * (perhaps on another thread). The call to libxl_ao_abort has + * had no effect. + * + * ERROR_ABORTED + * + * The operation has already been the subject of at least one + * call to libxl_ao_abort. + * + * If the operation was indeed cut short due to the abort request, it + * will complete, at some point in the future, with ERROR_ABORTED. In + * that case, depending on the operation it have performed some of the + * work in question and left the operation half-done. Consult the + * documentation for individual operations. + * + * Note that an aborted operation might still fail for other reasons + * even after the abort was requested. + * + * If your application is multithreaded you must not reuse an + * ao_how->for_event or ao_how->for_callback value (with a particular + * ao_how->callback) unless you are sure that none of your other + * threads are going to abort the previous operation using that + * value; otherwise you risk aborting the wrong operation if the + * intended target of the abort request completes in the meantime. + * + * It is possible to abort even an operation which is being performed + * synchronously, but since in that case how==NULL you had better only + * have one such operation, because it is not possible to tell them + * apart (and libxl_ao_abort will abort only the first one it finds). + * (And, if you want to do this, obviously the abort would have to be + * requested on a different thread.) + */ +int libxl_ao_abort(libxl_ctx *ctx, const libxl_asyncop_how *how) + LIBXL_EXTERNAL_CALLERS_ONLY; + + #define LIBXL_VERSION 0 /* context functions */ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 6d5f9d8..f9daa55 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1776,6 +1776,8 @@ void libxl__ao_create_fail(libxl__ao *ao) assert(ao->in_initiator); assert(!ao->complete); assert(!ao->progress_reports_outstanding); + assert(!ao->aborting); + LIBXL_LIST_REMOVE(ao, inprogress_entry); libxl__ao__destroy(CTX, ao); } @@ -1796,7 +1798,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) assert(!ao->nested_progeny); ao->complete = 1; ao->rc = rc; - + LIBXL_LIST_REMOVE(ao, inprogress_entry); libxl__ao_complete_check_progress_reports(egc, ao); } @@ -1869,6 +1871,8 @@ libxl__ao *libxl__ao_create(libxl_ctx *ctx, uint32_t domid, "ao %p: create: how=%p callback=%p poller=%p", ao, how, ao->how.callback, ao->poller); + LIBXL_LIST_INSERT_HEAD(&ctx->aos_inprogress, ao, inprogress_entry); + return ao; out: @@ -1922,8 +1926,8 @@ int libxl__ao_inprogress(libxl__ao *ao, sleep(1); /* It's either this or return ERROR_I_DONT_KNOW_WHETHER * _THE_THING_YOU_ASKED_FOR_WILL_BE_DONE_LATER_WHEN - * _YOU_DIDNT_EXPECT_IT, since we don't have any kind of - * cancellation ability. */ + * _YOU_DIDNT_EXPECT_IT, since we don't have a + * synchronous cancellation ability. */ } CTX_UNLOCK; @@ -1941,6 +1945,128 @@ int libxl__ao_inprogress(libxl__ao *ao, } +/* abort requests */ + +static int ao__abort(libxl_ctx *ctx, libxl__ao *parent) +/* Temporarily unlocks ctx, which must be locked exactly once on entry. */ +{ + int rc; + ao__manip_enter(parent); + + if (parent->aborting) { + rc = ERROR_ABORTED; + goto out; + } + + parent->aborting = 1; + + if (LIBXL_LIST_EMPTY(&parent->abortables)) { + LIBXL__LOG(ctx, XTL_DEBUG, + "ao %p: abort requested and noted, but no-one interested", + parent); + rc = 0; + goto out; + } + + /* We keep calling abort hooks until there are none left */ + while (!LIBXL_LIST_EMPTY(&parent->abortables)) { + libxl__egc egc; + LIBXL_INIT_EGC(egc,ctx); + + assert(!parent->complete); + + libxl__ao_abortable *abrt = LIBXL_LIST_FIRST(&parent->abortables); + assert(parent == ao_nested_root(abrt->ao)); + + LIBXL_LIST_REMOVE(abrt, entry); + abrt->registered = 0; + + LIBXL__LOG(ctx, XTL_DEBUG, "ao %p: abrt=%p: aborting", + parent, abrt->ao); + abrt->callback(&egc, abrt, ERROR_ABORTED); + + libxl__ctx_unlock(ctx); + libxl__egc_cleanup(&egc); + libxl__ctx_lock(ctx); + } + + rc = 0; + + out: + ao__manip_leave(ctx, parent); + return rc; +} + +int libxl_ao_abort(libxl_ctx *ctx, const libxl_asyncop_how *how) +{ + libxl__ao *search; + libxl__ctx_lock(ctx); + int rc; + + LIBXL_LIST_FOREACH(search, &ctx->aos_inprogress, inprogress_entry) { + if (how) { + /* looking for ao to be reported by callback or event */ + if (search->poller) + /* sync */ + continue; + if (how->callback != search->how.callback) + continue; + if (how->callback + ? (how->u.for_callback != search->how.u.for_callback) + : (how->u.for_event != search->how.u.for_event)) + continue; + } else { + /* looking for synchronous call */ + if (!search->poller) + /* async */ + continue; + } + goto found; + } + rc = ERROR_NOTFOUND; + goto out; + + found: + rc = ao__abort(ctx, search); + out: + libxl__ctx_unlock(ctx); + return rc; +} + +int libxl__ao_abortable_register(libxl__ao_abortable *abrt) +{ + libxl__ao *ao = abrt->ao; + libxl__ao *root = ao_nested_root(ao); + AO_GC; + + if (root->aborting) { + DBG("ao=%p: preemptively aborting ao_abortable registration %p (root=%p)", + ao, abrt, root); + return ERROR_ABORTED; + } + + DBG("ao=%p, abrt=%p: registering (root=%p)", ao, abrt, root); + LIBXL_LIST_INSERT_HEAD(&root->abortables, abrt, entry); + abrt->registered = 1; + + return 0; +} + +_hidden void libxl__ao_abortable_deregister(libxl__ao_abortable *abrt) +{ + if (!abrt->registered) + return; + + libxl__ao *ao = abrt->ao; + libxl__ao *root __attribute__((unused)) = ao_nested_root(ao); + AO_GC; + + DBG("ao=%p, abrt=%p: deregistering (root=%p)", ao, abrt, root); + LIBXL_LIST_REMOVE(abrt, entry); + abrt->registered = 0; +} + + /* progress reporting */ /* The application indicates a desire to ignore events by passing NULL diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 02314b6..411f7ad 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -193,6 +193,40 @@ struct libxl__ev_fd { }; +typedef struct libxl__ao_abortable libxl__ao_abortable; +typedef void libxl__ao_abortable_callback(libxl__egc *egc, + libxl__ao_abortable *ao_abortable, int rc /* ABORTED */); + +struct libxl__ao_abortable { + /* caller must fill this in and it must remain valid */ + libxl__ao *ao; + libxl__ao_abortable_callback *callback; + /* remainder is private for abort machinery */ + bool registered; + LIBXL_LIST_ENTRY(libxl__ao_abortable) entry; + /* + * For nested aos: + * Semantically, abort affects the whole tree of aos, + * not just the parent. + * libxl__ao_abortable.ao refers to the child, so + * that the child callback sees the right ao. (After all, + * it was code dealing with the child that set .ao.) + * But, the abortable is recorded on the "abortables" list + * for the ultimate root ao, so that every possible child + * abort occurs as a result of the abort of the parent. + * We set ao->aborting only in the root. + */ +}; + +_hidden int libxl__ao_abortable_register(libxl__ao_abortable*); +_hidden void libxl__ao_abortable_deregister(libxl__ao_abortable*); + +static inline void libxl__ao_abortable_init + (libxl__ao_abortable *c) { c->registered = 0; } +static inline bool libxl__ao_abortable_isregistered + (const libxl__ao_abortable *c) { return c->registered; } + + typedef struct libxl__ev_time libxl__ev_time; typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs, @@ -382,6 +416,8 @@ struct libxl__ctx { LIBXL_LIST_HEAD(, libxl__ev_evtchn) evtchns_waiting; libxl__ev_fd evtchn_efd; + LIBXL_LIST_HEAD(, libxl__ao) aos_inprogress; + LIBXL_TAILQ_HEAD(libxl__evgen_domain_death_list, libxl_evgen_domain_death) death_list /* sorted by domid */, death_reported; @@ -468,12 +504,15 @@ struct libxl__ao { * only in libxl__ao_complete.) */ uint32_t magic; - unsigned constructing:1, in_initiator:1, complete:1, notified:1; + unsigned constructing:1, in_initiator:1, complete:1, notified:1, + aborting:1; int manip_refcnt; libxl__ao *nested_root; int nested_progeny; int progress_reports_outstanding; int rc; + LIBXL_LIST_HEAD(, libxl__ao_abortable) abortables; + LIBXL_LIST_ENTRY(libxl__ao) inprogress_entry; libxl__gc gc; libxl_asyncop_how how; libxl__poller *poller; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:03:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQL-000803-ON; Mon, 29 Jun 2015 02:03:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQK-0007zi-4Z for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:52 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 30/31-06457-787A0955; Mon, 29 Jun 2015 02:03:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435543430!20615170!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1926 invoked from network); 29 Jun 2015 02:03:50 -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; 29 Jun 2015 02:03:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQH-0002Pv-U5 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQH-0005Wx-Si for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:49 +0000 Date: Mon, 29 Jun 2015 02:03:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Provide explicit internal abort check API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf0e9ed9c77ea1a9322d239dfae2d599da0e2ef8 Author: Ian Jackson AuthorDate: Tue Feb 10 19:16:08 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Provide explicit internal abort check API Some places in libxl which can't handle abort via a libxl__ao_abortable callback might nevertheless benefit from being able to explicitly check whether abort has been requested. Provide the (fairly trivial) internal API function to do this. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_event.c | 11 +++++++++++ tools/libxl/libxl_internal.h | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index f9daa55..5015563 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -2033,6 +2033,17 @@ int libxl_ao_abort(libxl_ctx *ctx, const libxl_asyncop_how *how) return rc; } +int libxl__ao_aborting(libxl__ao *ao) +{ + libxl__ao *root = ao_nested_root(ao); + if (root->aborting) { + DBG("ao=%p: aborting at explicit check (root=%p)", ao, root); + return ERROR_ABORTED; + } + + return 0; +} + int libxl__ao_abortable_register(libxl__ao_abortable *abrt) { libxl__ao *ao = abrt->ao; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 411f7ad..4150071 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -226,6 +226,8 @@ static inline void libxl__ao_abortable_init static inline bool libxl__ao_abortable_isregistered (const libxl__ao_abortable *c) { return c->registered; } +int libxl__ao_aborting(libxl__ao *ao); /* -> 0 or ERROR_ABORTED */ + typedef struct libxl__ev_time libxl__ev_time; typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:03:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:03:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQL-000803-ON; Mon, 29 Jun 2015 02:03:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQK-0007zi-4Z for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:52 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 30/31-06457-787A0955; Mon, 29 Jun 2015 02:03:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435543430!20615170!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1926 invoked from network); 29 Jun 2015 02:03:50 -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; 29 Jun 2015 02:03:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQH-0002Pv-U5 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQH-0005Wx-Si for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:03:49 +0000 Date: Mon, 29 Jun 2015 02:03:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Provide explicit internal abort check API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf0e9ed9c77ea1a9322d239dfae2d599da0e2ef8 Author: Ian Jackson AuthorDate: Tue Feb 10 19:16:08 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Provide explicit internal abort check API Some places in libxl which can't handle abort via a libxl__ao_abortable callback might nevertheless benefit from being able to explicitly check whether abort has been requested. Provide the (fairly trivial) internal API function to do this. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_event.c | 11 +++++++++++ tools/libxl/libxl_internal.h | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index f9daa55..5015563 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -2033,6 +2033,17 @@ int libxl_ao_abort(libxl_ctx *ctx, const libxl_asyncop_how *how) return rc; } +int libxl__ao_aborting(libxl__ao *ao) +{ + libxl__ao *root = ao_nested_root(ao); + if (root->aborting) { + DBG("ao=%p: aborting at explicit check (root=%p)", ao, root); + return ERROR_ABORTED; + } + + return 0; +} + int libxl__ao_abortable_register(libxl__ao_abortable *abrt) { libxl__ao *ao = abrt->ao; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 411f7ad..4150071 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -226,6 +226,8 @@ static inline void libxl__ao_abortable_init static inline bool libxl__ao_abortable_isregistered (const libxl__ao_abortable *c) { return c->registered; } +int libxl__ao_aborting(libxl__ao *ao); /* -> 0 or ERROR_ABORTED */ + typedef struct libxl__ev_time libxl__ev_time; typedef void libxl__ev_time_callback(libxl__egc *egc, libxl__ev_time *ev, -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:04:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9OQW-000821-Qp; Mon, 29 Jun 2015 02:04:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQV-00081j-CG for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:03 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 2B/37-06739-197A0955; Mon, 29 Jun 2015 02:04:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1435543440!27449376!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13578 invoked from network); 29 Jun 2015 02:04:01 -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; 29 Jun 2015 02:04:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQS-0002Q6-2a for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQS-0005XQ-1i for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:00 +0000 Date: Mon, 29 Jun 2015 02:04:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Make timeouts abortable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c7ea64ee86db53bad3524d61451730d64949219 Author: Ian Jackson AuthorDate: Fri Dec 20 18:02:54 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Make timeouts abortable Make libxl__ev_time* register with the abort machinery, so that libxl_ao_abort can stop any operation which has a timeout. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: Do not immediately deregister the abortable (!) (v3 was Acked-by: Ian Campbell ) --- tools/libxl/libxl_event.c | 28 ++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 3 ++- 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 5015563..ed9e18c 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -315,6 +315,8 @@ static int time_register_finite(libxl__gc *gc, libxl__ev_time *ev, static void time_deregister(libxl__gc *gc, libxl__ev_time *ev) { + libxl__ao_abortable_deregister(&ev->abrt); + if (!ev->infinite) { struct timeval right_away = { 0, 0 }; if (ev->nexus) /* only set if app provided hooks */ @@ -337,6 +339,23 @@ static void time_done_debug(libxl__gc *gc, const char *func, #endif } +static void time_aborted(libxl__egc *egc, libxl__ao_abortable *abrt, int rc) +{ + libxl__ev_time *ev = CONTAINER_OF(abrt, *ev, abrt); + EGC_GC; + + time_deregister(gc, ev); + DBG("ev_time=%p aborted", ev); + ev->func(egc, ev, &ev->abs, rc); +} + +static int time_register_abortable(libxl__ao *ao, libxl__ev_time *ev) +{ + ev->abrt.ao = ao; + ev->abrt.callback = time_aborted; + return libxl__ao_abortable_register(&ev->abrt); +} + int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, libxl__ev_time_callback *func, struct timeval absolute) @@ -349,6 +368,9 @@ int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, DBG("ev_time=%p register abs=%lu.%06lu", ev, (unsigned long)absolute.tv_sec, (unsigned long)absolute.tv_usec); + rc = time_register_abortable(ao, ev); + if (rc) goto out; + rc = time_register_finite(gc, ev, absolute); if (rc) goto out; @@ -356,6 +378,7 @@ int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, rc = 0; out: + libxl__ao_abortable_deregister(&ev->abrt); time_done_debug(gc,__func__,ev,rc); CTX_UNLOCK; return rc; @@ -374,6 +397,9 @@ int libxl__ev_time_register_rel(libxl__ao *ao, libxl__ev_time *ev, DBG("ev_time=%p register ms=%d", ev, milliseconds); + rc = time_register_abortable(ao, ev); + if (rc) goto out; + if (milliseconds < 0) { ev->infinite = 1; } else { @@ -388,6 +414,8 @@ int libxl__ev_time_register_rel(libxl__ao *ao, libxl__ev_time *ev, rc = 0; out: + if (!libxl__ev_time_isregistered(ev)) + libxl__ao_abortable_deregister(&ev->abrt); time_done_debug(gc,__func__,ev,rc); CTX_UNLOCK; return rc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4150071..e271be4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -242,6 +242,7 @@ struct libxl__ev_time { LIBXL_TAILQ_ENTRY(libxl__ev_time) entry; struct timeval abs; libxl__osevent_hook_nexus *nexus; + libxl__ao_abortable abrt; }; typedef struct libxl__ev_xswatch libxl__ev_xswatch; @@ -848,7 +849,7 @@ _hidden int libxl__ev_time_modify_abs(libxl__gc*, libxl__ev_time *ev, struct timeval); _hidden void libxl__ev_time_deregister(libxl__gc*, libxl__ev_time *ev); static inline void libxl__ev_time_init(libxl__ev_time *ev) - { ev->func = 0; } + { ev->func = 0; libxl__ao_abortable_init(&ev->abrt); } static inline int libxl__ev_time_isregistered(const libxl__ev_time *ev) { return !!ev->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 Mon Jun 29 02:04:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9OQW-000821-Qp; Mon, 29 Jun 2015 02:04:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQV-00081j-CG for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:03 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 2B/37-06739-197A0955; Mon, 29 Jun 2015 02:04:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1435543440!27449376!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13578 invoked from network); 29 Jun 2015 02:04:01 -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; 29 Jun 2015 02:04:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQS-0002Q6-2a for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQS-0005XQ-1i for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:00 +0000 Date: Mon, 29 Jun 2015 02:04:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Make timeouts abortable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c7ea64ee86db53bad3524d61451730d64949219 Author: Ian Jackson AuthorDate: Fri Dec 20 18:02:54 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Make timeouts abortable Make libxl__ev_time* register with the abort machinery, so that libxl_ao_abort can stop any operation which has a timeout. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: Do not immediately deregister the abortable (!) (v3 was Acked-by: Ian Campbell ) --- tools/libxl/libxl_event.c | 28 ++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 3 ++- 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 5015563..ed9e18c 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -315,6 +315,8 @@ static int time_register_finite(libxl__gc *gc, libxl__ev_time *ev, static void time_deregister(libxl__gc *gc, libxl__ev_time *ev) { + libxl__ao_abortable_deregister(&ev->abrt); + if (!ev->infinite) { struct timeval right_away = { 0, 0 }; if (ev->nexus) /* only set if app provided hooks */ @@ -337,6 +339,23 @@ static void time_done_debug(libxl__gc *gc, const char *func, #endif } +static void time_aborted(libxl__egc *egc, libxl__ao_abortable *abrt, int rc) +{ + libxl__ev_time *ev = CONTAINER_OF(abrt, *ev, abrt); + EGC_GC; + + time_deregister(gc, ev); + DBG("ev_time=%p aborted", ev); + ev->func(egc, ev, &ev->abs, rc); +} + +static int time_register_abortable(libxl__ao *ao, libxl__ev_time *ev) +{ + ev->abrt.ao = ao; + ev->abrt.callback = time_aborted; + return libxl__ao_abortable_register(&ev->abrt); +} + int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, libxl__ev_time_callback *func, struct timeval absolute) @@ -349,6 +368,9 @@ int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, DBG("ev_time=%p register abs=%lu.%06lu", ev, (unsigned long)absolute.tv_sec, (unsigned long)absolute.tv_usec); + rc = time_register_abortable(ao, ev); + if (rc) goto out; + rc = time_register_finite(gc, ev, absolute); if (rc) goto out; @@ -356,6 +378,7 @@ int libxl__ev_time_register_abs(libxl__ao *ao, libxl__ev_time *ev, rc = 0; out: + libxl__ao_abortable_deregister(&ev->abrt); time_done_debug(gc,__func__,ev,rc); CTX_UNLOCK; return rc; @@ -374,6 +397,9 @@ int libxl__ev_time_register_rel(libxl__ao *ao, libxl__ev_time *ev, DBG("ev_time=%p register ms=%d", ev, milliseconds); + rc = time_register_abortable(ao, ev); + if (rc) goto out; + if (milliseconds < 0) { ev->infinite = 1; } else { @@ -388,6 +414,8 @@ int libxl__ev_time_register_rel(libxl__ao *ao, libxl__ev_time *ev, rc = 0; out: + if (!libxl__ev_time_isregistered(ev)) + libxl__ao_abortable_deregister(&ev->abrt); time_done_debug(gc,__func__,ev,rc); CTX_UNLOCK; return rc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4150071..e271be4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -242,6 +242,7 @@ struct libxl__ev_time { LIBXL_TAILQ_ENTRY(libxl__ev_time) entry; struct timeval abs; libxl__osevent_hook_nexus *nexus; + libxl__ao_abortable abrt; }; typedef struct libxl__ev_xswatch libxl__ev_xswatch; @@ -848,7 +849,7 @@ _hidden int libxl__ev_time_modify_abs(libxl__gc*, libxl__ev_time *ev, struct timeval); _hidden void libxl__ev_time_deregister(libxl__gc*, libxl__ev_time *ev); static inline void libxl__ev_time_init(libxl__ev_time *ev) - { ev->func = 0; } + { ev->func = 0; libxl__ao_abortable_init(&ev->abrt); } static inline int libxl__ev_time_isregistered(const libxl__ev_time *ev) { return !!ev->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 Mon Jun 29 02:04:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQf-00083V-TX; Mon, 29 Jun 2015 02:04:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQe-00083F-OC for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:12 +0000 Content-Length: 2022 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 61/F4-31258-C97A0955; Mon, 29 Jun 2015 02:04:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435543450!27431091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12543 invoked from network); 29 Jun 2015 02:04:11 -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; 29 Jun 2015 02:04:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQc-0002Qh-6a for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQc-0005Xx-5i for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:10 +0000 Date: Mon, 29 Jun 2015 02:04:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Note that driver domain task cannot be usefully aborted X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============9043348034596662267==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============9043348034596662267== Content-Length: 1608 Content-Transfer-Encoding: quoted-printable commit 698232a43a81a633c2c393df727b18e0d03da257 Author: Ian Jackson AuthorDate: Tue Feb 10 17:18:23 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Note that driver domain task cannot be usefully aborted In practice, aborting this task will cause all subsequent actual backend operations to fail, but will not actually cause the libxl_device_events_handler operation to complete. Signed-off-by: Ian Jackson CC: Roger Pau Monn=C3=A9 Acked-by: Roger Pau Monn=C3=A9 Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index b5a8fdf..a1c5d15 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1426,6 +1426,9 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, * From a libxl API point of view, this starts a long-running * operation. That operation consists of "being a driver domain" * and never completes. + * + * Attempting to abort this operation is not advisable; proper + * shutdown of the driver domain task is not supported. */ int libxl_device_events_handler(libxl_ctx *ctx, const libxl_asyncop_how *ao_how) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============9043348034596662267== 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 --===============9043348034596662267==-- From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:04:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQf-00083V-TX; Mon, 29 Jun 2015 02:04:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQe-00083F-OC for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:12 +0000 Content-Length: 2022 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 61/F4-31258-C97A0955; Mon, 29 Jun 2015 02:04:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435543450!27431091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12543 invoked from network); 29 Jun 2015 02:04:11 -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; 29 Jun 2015 02:04:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQc-0002Qh-6a for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQc-0005Xx-5i for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:10 +0000 Date: Mon, 29 Jun 2015 02:04:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Note that driver domain task cannot be usefully aborted X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============9043348034596662267==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============9043348034596662267== Content-Length: 1608 Content-Transfer-Encoding: quoted-printable commit 698232a43a81a633c2c393df727b18e0d03da257 Author: Ian Jackson AuthorDate: Tue Feb 10 17:18:23 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: ao abort: Note that driver domain task cannot be usefully aborted In practice, aborting this task will cause all subsequent actual backend operations to fail, but will not actually cause the libxl_device_events_handler operation to complete. Signed-off-by: Ian Jackson CC: Roger Pau Monn=C3=A9 Acked-by: Roger Pau Monn=C3=A9 Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index b5a8fdf..a1c5d15 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1426,6 +1426,9 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, * From a libxl API point of view, this starts a long-running * operation. That operation consists of "being a driver domain" * and never completes. + * + * Attempting to abort this operation is not advisable; proper + * shutdown of the driver domain task is not supported. */ int libxl_device_events_handler(libxl_ctx *ctx, const libxl_asyncop_how *ao_how) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============9043348034596662267== 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 --===============9043348034596662267==-- From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:04:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9OQp-000856-W4; Mon, 29 Jun 2015 02:04:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQo-00084q-Ly for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:22 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id B2/A4-30151-6A7A0955; Mon, 29 Jun 2015 02:04:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435543460!27354651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5181 invoked from network); 29 Jun 2015 02:04:21 -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; 29 Jun 2015 02:04:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQm-0002Qp-CN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQm-0005YK-BN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:20 +0000 Date: Mon, 29 Jun 2015 02:04:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce DOMAIN_DESTROYED error code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 668a3dd1f0ae015858bf3c32813de358753c52c4 Author: Ian Jackson AuthorDate: Tue Feb 10 17:48:40 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Introduce DOMAIN_DESTROYED error code This is currently reported only by the bootloader code, if the domain is destroyed while the bootloader is running. In the future it would be nice to return it for other circumstances where the domain existed when the operation started but subsequently vanished. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: Add a comment about the new error code's semantics v2: New in this version of the series. --- tools/libxl/libxl_bootloader.c | 2 +- tools/libxl/libxl_types.idl | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 0263ef9..490ad5c 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -613,7 +613,7 @@ static void bootloader_display_copyfail(libxl__egc *egc, static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); - bootloader_stop(egc, bl, ERROR_FAIL); + bootloader_stop(egc, bl, ERROR_DOMAIN_DESTROYED); } static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 9558d52..e1632fa 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -67,6 +67,7 @@ libxl_error = Enumeration("error", [ (-21, "DOMAIN_NOTFOUND"), (-22, "ABORTED"), (-23, "NOTFOUND"), + (-24, "DOMAIN_DESTROYED"), # Target domain ceased to exist during op ], value_namespace = "") libxl_domain_type = Enumeration("domain_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 Mon Jun 29 02:04:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9OQp-000856-W4; Mon, 29 Jun 2015 02:04:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQo-00084q-Ly for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:22 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id B2/A4-30151-6A7A0955; Mon, 29 Jun 2015 02:04:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435543460!27354651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5181 invoked from network); 29 Jun 2015 02:04:21 -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; 29 Jun 2015 02:04:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQm-0002Qp-CN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQm-0005YK-BN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:20 +0000 Date: Mon, 29 Jun 2015 02:04:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce DOMAIN_DESTROYED error code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 668a3dd1f0ae015858bf3c32813de358753c52c4 Author: Ian Jackson AuthorDate: Tue Feb 10 17:48:40 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:50 2015 +0100 libxl: Introduce DOMAIN_DESTROYED error code This is currently reported only by the bootloader code, if the domain is destroyed while the bootloader is running. In the future it would be nice to return it for other circumstances where the domain existed when the operation started but subsequently vanished. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v4: Add a comment about the new error code's semantics v2: New in this version of the series. --- tools/libxl/libxl_bootloader.c | 2 +- tools/libxl/libxl_types.idl | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 0263ef9..490ad5c 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -613,7 +613,7 @@ static void bootloader_display_copyfail(libxl__egc *egc, static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); - bootloader_stop(egc, bl, ERROR_FAIL); + bootloader_stop(egc, bl, ERROR_DOMAIN_DESTROYED); } static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 9558d52..e1632fa 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -67,6 +67,7 @@ libxl_error = Enumeration("error", [ (-21, "DOMAIN_NOTFOUND"), (-22, "ABORTED"), (-23, "NOTFOUND"), + (-24, "DOMAIN_DESTROYED"), # Target domain ceased to exist during op ], value_namespace = "") libxl_domain_type = Enumeration("domain_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 Mon Jun 29 02:04:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9OR1-00086l-2K; Mon, 29 Jun 2015 02:04:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQz-00086a-BJ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:33 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A7/D5-25925-0B7A0955; Mon, 29 Jun 2015 02:04:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1435543470!13324712!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6074 invoked from network); 29 Jun 2015 02:04:31 -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; 29 Jun 2015 02:04:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQw-0002Qz-IH for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQw-0005ZT-H3 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:30 +0000 Date: Mon, 29 Jun 2015 02:04:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Support aborting where we spot domain death X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 005bc3b588e3e1bd07a97fd752ab17042c41f21b Author: Ian Jackson AuthorDate: Tue Feb 10 17:53:21 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Support aborting where we spot domain death Make an active libxl__domaindeathcheck contain an active libxl__ao_abortable. Consequential changes are: * domaindeath callbacks now take an rc value. * libxl__domaindeathcheck_start takes an ao, not a gc. * bootloader_domaindeath plumbs the rc through to its caller. * libxl__domaindeathcheck_init and _stop are not quite trivial any more so are moved from (inline functions) in libxl_internal.h, to ordinary functions defined in libxl_event.c. * libxl__domaindeathcheck_start is not trivial any more, and now has the standard error-handling pattern. The only current user of libxl__domaindeathcheck is the bootloader. So the result is that now it is possible to effectively abort domain creation while the bootloader is running. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_bootloader.c | 11 +++++--- tools/libxl/libxl_event.c | 50 ++++++++++++++++++++++++++++++++++++--- tools/libxl/libxl_internal.h | 12 ++++---- 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 490ad5c..6db958e 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -33,7 +33,8 @@ static void bootloader_keystrokes_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); static void bootloader_display_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); -static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc); +static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc, + int rc); static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status); @@ -496,7 +497,7 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) bl->deathcheck.what = "stopping bootloader"; bl->deathcheck.domid = bl->domid; bl->deathcheck.callback = bootloader_domaindeath; - rc = libxl__domaindeathcheck_start(gc, &bl->deathcheck); + rc = libxl__domaindeathcheck_start(ao, &bl->deathcheck); if (rc) goto out; if (bl->console_available) @@ -610,10 +611,12 @@ static void bootloader_display_copyfail(libxl__egc *egc, bootloader_copyfail(egc, "bootloader output", bl, 1, onwrite, errnoval); } -static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) +static void bootloader_domaindeath(libxl__egc *egc, + libxl__domaindeathcheck *dc, + int rc) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); - bootloader_stop(egc, bl, ERROR_DOMAIN_DESTROYED); + bootloader_stop(egc, bl, rc); } static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index ed9e18c..9072df4 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -933,6 +933,18 @@ int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, * futile. */ +void libxl__domaindeathcheck_init(libxl__domaindeathcheck *dc) +{ + libxl__ao_abortable_init(&dc->abrt); + libxl__ev_xswatch_init(&dc->watch); +} + +void libxl__domaindeathcheck_stop(libxl__gc *gc, libxl__domaindeathcheck *dc) +{ + libxl__ao_abortable_deregister(&dc->abrt); + libxl__ev_xswatch_deregister(gc,&dc->watch); +} + static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *watch_path, const char *event_path) { @@ -941,6 +953,8 @@ static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *p = libxl__xs_read(gc, XBT_NULL, watch_path); if (p) return; + libxl__domaindeathcheck_stop(gc,dc); + if (errno!=ENOENT) { LIBXL__EVENT_DISASTER(egc,"failed to read xenstore" " for domain detach check", errno, 0); @@ -949,15 +963,43 @@ static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, LOG(ERROR,"%s: domain %"PRIu32" removed (%s no longer in xenstore)", dc->what, dc->domid, watch_path); - dc->callback(egc, dc); + dc->callback(egc, dc, ERROR_DOMAIN_DESTROYED); +} + +static void domaindeathcheck_abort(libxl__egc *egc, + libxl__ao_abortable *abrt, + int rc) +{ + libxl__domaindeathcheck *dc = CONTAINER_OF(abrt, *dc, abrt); + EGC_GC; + + libxl__domaindeathcheck_stop(gc,dc); + dc->callback(egc, dc, rc); } -int libxl__domaindeathcheck_start(libxl__gc *gc, +int libxl__domaindeathcheck_start(libxl__ao *ao, libxl__domaindeathcheck *dc) { + AO_GC; + int rc; const char *path = GCSPRINTF("/local/domain/%"PRIu32, dc->domid); - return libxl__ev_xswatch_register(gc, &dc->watch, - domaindeathcheck_callback, path); + + libxl__domaindeathcheck_init(dc); + + dc->abrt.ao = ao; + dc->abrt.callback = domaindeathcheck_abort; + rc = libxl__ao_abortable_register(&dc->abrt); + if (rc) goto out; + + rc = libxl__ev_xswatch_register(gc, &dc->watch, + domaindeathcheck_callback, path); + if (rc) goto out; + + return 0; + + out: + libxl__domaindeathcheck_stop(gc,dc); + return rc; } /* diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e271be4..6364d22 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1263,7 +1263,8 @@ _hidden int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, typedef struct libxl__domaindeathcheck libxl__domaindeathcheck; typedef void libxl___domaindeathcheck_callback(libxl__egc *egc, - libxl__domaindeathcheck*); + libxl__domaindeathcheck*, + int rc /* DESTROYED or ABORTED */); struct libxl__domaindeathcheck { /* must be filled in by caller, and remain valid: */ @@ -1271,16 +1272,15 @@ struct libxl__domaindeathcheck { uint32_t domid; libxl___domaindeathcheck_callback *callback; /* private */ + libxl__ao_abortable abrt; libxl__ev_xswatch watch; }; -_hidden int libxl__domaindeathcheck_start(libxl__gc *gc, +_hidden int libxl__domaindeathcheck_start(libxl__ao *ao, libxl__domaindeathcheck *dc); -static inline void libxl__domaindeathcheck_init - (libxl__domaindeathcheck *dc) { libxl__ev_xswatch_init(&dc->watch); } -static inline void libxl__domaindeathcheck_stop(libxl__gc *gc, - libxl__domaindeathcheck *dc) { libxl__ev_xswatch_deregister(gc,&dc->watch); } +void libxl__domaindeathcheck_init(libxl__domaindeathcheck *dc); +void libxl__domaindeathcheck_stop(libxl__gc *gc, libxl__domaindeathcheck *dc); /* -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:04:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9OR1-00086l-2K; Mon, 29 Jun 2015 02:04:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQz-00086a-BJ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:33 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A7/D5-25925-0B7A0955; Mon, 29 Jun 2015 02:04:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1435543470!13324712!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6074 invoked from network); 29 Jun 2015 02:04:31 -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; 29 Jun 2015 02:04:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OQw-0002Qz-IH for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OQw-0005ZT-H3 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:30 +0000 Date: Mon, 29 Jun 2015 02:04:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Support aborting where we spot domain death X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 005bc3b588e3e1bd07a97fd752ab17042c41f21b Author: Ian Jackson AuthorDate: Tue Feb 10 17:53:21 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Support aborting where we spot domain death Make an active libxl__domaindeathcheck contain an active libxl__ao_abortable. Consequential changes are: * domaindeath callbacks now take an rc value. * libxl__domaindeathcheck_start takes an ao, not a gc. * bootloader_domaindeath plumbs the rc through to its caller. * libxl__domaindeathcheck_init and _stop are not quite trivial any more so are moved from (inline functions) in libxl_internal.h, to ordinary functions defined in libxl_event.c. * libxl__domaindeathcheck_start is not trivial any more, and now has the standard error-handling pattern. The only current user of libxl__domaindeathcheck is the bootloader. So the result is that now it is possible to effectively abort domain creation while the bootloader is running. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_bootloader.c | 11 +++++--- tools/libxl/libxl_event.c | 50 ++++++++++++++++++++++++++++++++++++--- tools/libxl/libxl_internal.h | 12 ++++---- 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 490ad5c..6db958e 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -33,7 +33,8 @@ static void bootloader_keystrokes_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); static void bootloader_display_copyfail(libxl__egc *egc, libxl__datacopier_state *dc, int onwrite, int errnoval); -static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc); +static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc, + int rc); static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status); @@ -496,7 +497,7 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) bl->deathcheck.what = "stopping bootloader"; bl->deathcheck.domid = bl->domid; bl->deathcheck.callback = bootloader_domaindeath; - rc = libxl__domaindeathcheck_start(gc, &bl->deathcheck); + rc = libxl__domaindeathcheck_start(ao, &bl->deathcheck); if (rc) goto out; if (bl->console_available) @@ -610,10 +611,12 @@ static void bootloader_display_copyfail(libxl__egc *egc, bootloader_copyfail(egc, "bootloader output", bl, 1, onwrite, errnoval); } -static void bootloader_domaindeath(libxl__egc *egc, libxl__domaindeathcheck *dc) +static void bootloader_domaindeath(libxl__egc *egc, + libxl__domaindeathcheck *dc, + int rc) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, deathcheck); - bootloader_stop(egc, bl, ERROR_DOMAIN_DESTROYED); + bootloader_stop(egc, bl, rc); } static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index ed9e18c..9072df4 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -933,6 +933,18 @@ int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, * futile. */ +void libxl__domaindeathcheck_init(libxl__domaindeathcheck *dc) +{ + libxl__ao_abortable_init(&dc->abrt); + libxl__ev_xswatch_init(&dc->watch); +} + +void libxl__domaindeathcheck_stop(libxl__gc *gc, libxl__domaindeathcheck *dc) +{ + libxl__ao_abortable_deregister(&dc->abrt); + libxl__ev_xswatch_deregister(gc,&dc->watch); +} + static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *watch_path, const char *event_path) { @@ -941,6 +953,8 @@ static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *p = libxl__xs_read(gc, XBT_NULL, watch_path); if (p) return; + libxl__domaindeathcheck_stop(gc,dc); + if (errno!=ENOENT) { LIBXL__EVENT_DISASTER(egc,"failed to read xenstore" " for domain detach check", errno, 0); @@ -949,15 +963,43 @@ static void domaindeathcheck_callback(libxl__egc *egc, libxl__ev_xswatch *w, LOG(ERROR,"%s: domain %"PRIu32" removed (%s no longer in xenstore)", dc->what, dc->domid, watch_path); - dc->callback(egc, dc); + dc->callback(egc, dc, ERROR_DOMAIN_DESTROYED); +} + +static void domaindeathcheck_abort(libxl__egc *egc, + libxl__ao_abortable *abrt, + int rc) +{ + libxl__domaindeathcheck *dc = CONTAINER_OF(abrt, *dc, abrt); + EGC_GC; + + libxl__domaindeathcheck_stop(gc,dc); + dc->callback(egc, dc, rc); } -int libxl__domaindeathcheck_start(libxl__gc *gc, +int libxl__domaindeathcheck_start(libxl__ao *ao, libxl__domaindeathcheck *dc) { + AO_GC; + int rc; const char *path = GCSPRINTF("/local/domain/%"PRIu32, dc->domid); - return libxl__ev_xswatch_register(gc, &dc->watch, - domaindeathcheck_callback, path); + + libxl__domaindeathcheck_init(dc); + + dc->abrt.ao = ao; + dc->abrt.callback = domaindeathcheck_abort; + rc = libxl__ao_abortable_register(&dc->abrt); + if (rc) goto out; + + rc = libxl__ev_xswatch_register(gc, &dc->watch, + domaindeathcheck_callback, path); + if (rc) goto out; + + return 0; + + out: + libxl__domaindeathcheck_stop(gc,dc); + return rc; } /* diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e271be4..6364d22 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1263,7 +1263,8 @@ _hidden int libxl__ev_devstate_wait(libxl__ao *ao, libxl__ev_devstate *ds, typedef struct libxl__domaindeathcheck libxl__domaindeathcheck; typedef void libxl___domaindeathcheck_callback(libxl__egc *egc, - libxl__domaindeathcheck*); + libxl__domaindeathcheck*, + int rc /* DESTROYED or ABORTED */); struct libxl__domaindeathcheck { /* must be filled in by caller, and remain valid: */ @@ -1271,16 +1272,15 @@ struct libxl__domaindeathcheck { uint32_t domid; libxl___domaindeathcheck_callback *callback; /* private */ + libxl__ao_abortable abrt; libxl__ev_xswatch watch; }; -_hidden int libxl__domaindeathcheck_start(libxl__gc *gc, +_hidden int libxl__domaindeathcheck_start(libxl__ao *ao, libxl__domaindeathcheck *dc); -static inline void libxl__domaindeathcheck_init - (libxl__domaindeathcheck *dc) { libxl__ev_xswatch_init(&dc->watch); } -static inline void libxl__domaindeathcheck_stop(libxl__gc *gc, - libxl__domaindeathcheck *dc) { libxl__ev_xswatch_deregister(gc,&dc->watch); } +void libxl__domaindeathcheck_init(libxl__domaindeathcheck *dc); +void libxl__domaindeathcheck_stop(libxl__gc *gc, libxl__domaindeathcheck *dc); /* -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:04:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORB-00088P-4l; Mon, 29 Jun 2015 02:04:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OR9-000885-Dm for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:43 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 8F/4E-29123-AB7A0955; Mon, 29 Jun 2015 02:04:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435543480!21311994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4965 invoked from network); 29 Jun 2015 02:04:41 -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; 29 Jun 2015 02:04:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OR6-0002R7-Mh for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OR6-0005a1-Lq for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:40 +0000 Date: Mon, 29 Jun 2015 02:04:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce FILLZERO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a074278122b338fb08fa20ab30825e1366b2da68 Author: Ian Jackson AuthorDate: Tue Feb 10 19:00:06 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: Introduce FILLZERO FILLZERO is a macro for memset(&foo,0,sizeof(foo)). It eliminates the possiblity to make the error memset(&foo,0,sizeof(&foo)). No callers yet, but document it in CODING_STYLE. (In accordance with existing libxl policy, I haven't gone through all existing possible call sites.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/CODING_STYLE | 1 + tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_utils.h | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index f5b5890..a65efb3 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -62,6 +62,7 @@ whenever they are applicable. For example: libxl__ctx_[un]lock CTX_LOCK, CTX_UNLOCK gc=...; ao=...; EGC_GC, AO_GC, STATE_AO_GC explicit gc creation GC_INIT, GC_FREE + memset(..,0,sizeof..) FILLZERO ERROR HANDLING diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6364d22..2db6b2e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3291,6 +3291,9 @@ _hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); }) +#define FILLZERO LIBXL_FILLZERO + + /* * All of these assume (or define) * libxl__gc *gc; diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 1c1761d..9b90a44 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -160,6 +160,9 @@ int libxl_cpumap_to_nodemap(libxl_ctx *ctx, void libxl_string_copy(libxl_ctx *ctx, char **dst, char **src); + +#define LIBXL_FILLZERO(object) (memset(&(object), 0, sizeof((object)))) + #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 Jun 29 02:04:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORB-00088P-4l; Mon, 29 Jun 2015 02:04:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OR9-000885-Dm for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:43 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 8F/4E-29123-AB7A0955; Mon, 29 Jun 2015 02:04:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435543480!21311994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4965 invoked from network); 29 Jun 2015 02:04:41 -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; 29 Jun 2015 02:04:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OR6-0002R7-Mh for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OR6-0005a1-Lq for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:40 +0000 Date: Mon, 29 Jun 2015 02:04:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce FILLZERO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a074278122b338fb08fa20ab30825e1366b2da68 Author: Ian Jackson AuthorDate: Tue Feb 10 19:00:06 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: Introduce FILLZERO FILLZERO is a macro for memset(&foo,0,sizeof(foo)). It eliminates the possiblity to make the error memset(&foo,0,sizeof(&foo)). No callers yet, but document it in CODING_STYLE. (In accordance with existing libxl policy, I haven't gone through all existing possible call sites.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/CODING_STYLE | 1 + tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_utils.h | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index f5b5890..a65efb3 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -62,6 +62,7 @@ whenever they are applicable. For example: libxl__ctx_[un]lock CTX_LOCK, CTX_UNLOCK gc=...; ao=...; EGC_GC, AO_GC, STATE_AO_GC explicit gc creation GC_INIT, GC_FREE + memset(..,0,sizeof..) FILLZERO ERROR HANDLING diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6364d22..2db6b2e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3291,6 +3291,9 @@ _hidden const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid); }) +#define FILLZERO LIBXL_FILLZERO + + /* * All of these assume (or define) * libxl__gc *gc; diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 1c1761d..9b90a44 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -160,6 +160,9 @@ int libxl_cpumap_to_nodemap(libxl_ctx *ctx, void libxl_string_copy(libxl_ctx *ctx, char **dst, char **src); + +#define LIBXL_FILLZERO(object) (memset(&(object), 0, sizeof((object)))) + #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 Jun 29 02:04:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9ORK-0008AI-9n; Mon, 29 Jun 2015 02:04:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORI-0008A0-Vs for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:53 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id B8/40-31880-4C7A0955; Mon, 29 Jun 2015 02:04:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1435543491!9865492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17881 invoked from network); 29 Jun 2015 02:04:51 -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; 29 Jun 2015 02:04:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORG-0002RF-Qm for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORG-0005ac-PN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:50 +0000 Date: Mon, 29 Jun 2015 02:04:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Preparations for save/restore abort X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60d6c96bd93b074bc346dc15ab27bd59907d1667 Author: Ian Jackson AuthorDate: Tue Feb 10 19:03:16 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Preparations for save/restore abort Two unrelated non-functional changes, broken out into a pre-patch for easier review: Break out a function sendsig() in libxl_save_callout.c. Move io_fd to be a global variable in libxl_save_helper.c. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_save_callout.c | 10 +++++++--- tools/libxl/libxl_save_helper.c | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 40b25e4..1d584f1 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -237,6 +237,12 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, libxl__carefd_close(childs_pipes[1]); helper_failed(egc, shs, rc);; } +static void sendsig(libxl__gc *gc, libxl__save_helper_state *shs, int sig) +{ + int r = kill(shs->child.pid, sig); + if (r) LOGE(WARN, "failed to kill save/restore helper [%lu] (signal %d)", + (unsigned long)shs->child.pid, sig); +} static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, int rc) @@ -253,9 +259,7 @@ static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, return; } - int r = kill(shs->child.pid, SIGKILL); - if (r) LOGE(WARN, "failed to kill save/restore helper [%lu]", - (unsigned long)shs->child.pid); + sendsig(gc, shs, SIGKILL); } static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 74826a1..7514b2e 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -85,6 +85,7 @@ static xentoollog_logger logger = { tellparent_destroy, }; static xc_interface *xch; +static int io_fd; /*----- error handling -----*/ @@ -211,7 +212,7 @@ int main(int argc, char **argv) if (!strcmp(mode,"--save-domain")) { - int io_fd = atoi(NEXTARG); + io_fd = atoi(NEXTARG); uint32_t dom = strtoul(NEXTARG,0,10); uint32_t max_iters = strtoul(NEXTARG,0,10); uint32_t max_factor = strtoul(NEXTARG,0,10); @@ -234,7 +235,7 @@ int main(int argc, char **argv) } else if (!strcmp(mode,"--restore-domain")) { - int io_fd = atoi(NEXTARG); + io_fd = atoi(NEXTARG); uint32_t dom = strtoul(NEXTARG,0,10); unsigned store_evtchn = strtoul(NEXTARG,0,10); domid_t store_domid = strtoul(NEXTARG,0,10); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:04:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:04: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 1Z9ORK-0008AI-9n; Mon, 29 Jun 2015 02:04:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORI-0008A0-Vs for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:53 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id B8/40-31880-4C7A0955; Mon, 29 Jun 2015 02:04:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1435543491!9865492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17881 invoked from network); 29 Jun 2015 02:04:51 -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; 29 Jun 2015 02:04:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORG-0002RF-Qm for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORG-0005ac-PN for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:04:50 +0000 Date: Mon, 29 Jun 2015 02:04:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Preparations for save/restore abort X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60d6c96bd93b074bc346dc15ab27bd59907d1667 Author: Ian Jackson AuthorDate: Tue Feb 10 19:03:16 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Preparations for save/restore abort Two unrelated non-functional changes, broken out into a pre-patch for easier review: Break out a function sendsig() in libxl_save_callout.c. Move io_fd to be a global variable in libxl_save_helper.c. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_save_callout.c | 10 +++++++--- tools/libxl/libxl_save_helper.c | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 40b25e4..1d584f1 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -237,6 +237,12 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, libxl__carefd_close(childs_pipes[1]); helper_failed(egc, shs, rc);; } +static void sendsig(libxl__gc *gc, libxl__save_helper_state *shs, int sig) +{ + int r = kill(shs->child.pid, sig); + if (r) LOGE(WARN, "failed to kill save/restore helper [%lu] (signal %d)", + (unsigned long)shs->child.pid, sig); +} static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, int rc) @@ -253,9 +259,7 @@ static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, return; } - int r = kill(shs->child.pid, SIGKILL); - if (r) LOGE(WARN, "failed to kill save/restore helper [%lu]", - (unsigned long)shs->child.pid); + sendsig(gc, shs, SIGKILL); } static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 74826a1..7514b2e 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -85,6 +85,7 @@ static xentoollog_logger logger = { tellparent_destroy, }; static xc_interface *xch; +static int io_fd; /*----- error handling -----*/ @@ -211,7 +212,7 @@ int main(int argc, char **argv) if (!strcmp(mode,"--save-domain")) { - int io_fd = atoi(NEXTARG); + io_fd = atoi(NEXTARG); uint32_t dom = strtoul(NEXTARG,0,10); uint32_t max_iters = strtoul(NEXTARG,0,10); uint32_t max_factor = strtoul(NEXTARG,0,10); @@ -234,7 +235,7 @@ int main(int argc, char **argv) } else if (!strcmp(mode,"--restore-domain")) { - int io_fd = atoi(NEXTARG); + io_fd = atoi(NEXTARG); uint32_t dom = strtoul(NEXTARG,0,10); unsigned store_evtchn = strtoul(NEXTARG,0,10); domid_t store_domid = strtoul(NEXTARG,0,10); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:05:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORV-0008C1-CM; Mon, 29 Jun 2015 02:05:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORT-0008Bk-Ge for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:03 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 5B/C0-10437-EC7A0955; Mon, 29 Jun 2015 02:05:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435543501!18179417!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16568 invoked from network); 29 Jun 2015 02:05:02 -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; 29 Jun 2015 02:05:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORQ-0002RQ-Us for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORQ-0005b9-TZ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:00 +0000 Date: Mon, 29 Jun 2015 02:05:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Handle SIGTERM in save/restore 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b6ac9b7fc6bb18057a1aa114296b32f59b40e187 Author: Ian Jackson AuthorDate: Tue Feb 10 19:05:06 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Handle SIGTERM in save/restore helper During startup of the save/restore helper, set the disposition of SIGTERM appropriately. For restore, we can simply die immediately - there is no point trying to do any kind of cleanup on what is now going to be a trashed domain. For save, we want to arrange that libxc's cleanup code (eg turning off logdirty) takes place. So our signal handler replaces the fd with one on which writes will fail, causing libxc's own loop to fail next time it actually tries to do a write. Currently this has only a minor beneficial effect: we don't send the helper a SIGTERM ourselves, and if someone else contrives to send our helper a SIGTERM they have probably sent one to libxl too in which case things are going to be a bit messy anyway. But in the next patch libxl itself is going to use SIGTERM to implement ao abort requests. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_save_helper.c | 58 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 7514b2e..0be77c9 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -40,8 +40,10 @@ #include #include #include +#include #include "libxl.h" +#include "libxl_utils.h" #include "xenctrl.h" #include "xenguest.h" @@ -120,6 +122,58 @@ static void *xmalloc(size_t sz) return r; } +/*----- signal handling -----*/ + +static int unwriteable_fd; + +static void save_signal_handler(int num) +{ + /* + * We want to be able to interrupt save. But the code in libxc + * which does the actual saving is straight-through, and we need + * to execute its error path to put the guest back to sanity. + * + * So what we do is this: when we get the signal, we dup2 + * the result of open("/dev/null",O_RDONLY) onto the output fd. + * + * This is guaranteed to 1. interrupt libxc's write (causing it to + * return short, or maybe EINTR); 2. make the next write give + * EBADF, so that: 3. at latest, libxc will notice when it next + * tries to write data and will then go into its cleanup path. + * + * We make no effort here to sanitise the resulting errors. + * That's libxl's job. + */ + int esave = errno; + + int r = dup2(unwriteable_fd, io_fd); + assert(r == io_fd); /* if not we can't write an xtl message because we + * might end up interleaving on our control stream */ + + errno = esave; +} + +static void setup_signals(void (*handler)(int)) +{ + struct sigaction sa; + sigset_t spmask; + int r; + + unwriteable_fd = open("/dev/null",O_RDONLY); + if (unwriteable_fd < 0) fail(errno,"open /dev/null for reading"); + + LIBXL_FILLZERO(sa); + sa.sa_handler = handler; + sigemptyset(&sa.sa_mask); + r = sigaction(SIGTERM, &sa, 0); + if (r) fail(errno,"sigaction SIGTERM failed"); + + sigemptyset(&spmask); + sigaddset(&spmask,SIGTERM); + r = sigprocmask(SIG_UNBLOCK,&spmask,0); + if (r) fail(errno,"sigprocmask unblock SIGTERM failed"); +} + /*----- helper functions called by autogenerated stubs -----*/ unsigned char * helper_allocbuf(int len, void *user) @@ -229,6 +283,8 @@ int main(int argc, char **argv) helper_setcallbacks_save(&helper_save_callbacks, cbflags); startup("save"); + setup_signals(save_signal_handler); + r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags, &helper_save_callbacks, hvm); complete(r); @@ -254,6 +310,8 @@ int main(int argc, char **argv) unsigned long console_mfn = 0; startup("restore"); + setup_signals(SIG_DFL); + r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, console_domid, hvm, pae, superpages, -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:05:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORV-0008C1-CM; Mon, 29 Jun 2015 02:05:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORT-0008Bk-Ge for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:03 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 5B/C0-10437-EC7A0955; Mon, 29 Jun 2015 02:05:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435543501!18179417!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16568 invoked from network); 29 Jun 2015 02:05:02 -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; 29 Jun 2015 02:05:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORQ-0002RQ-Us for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORQ-0005b9-TZ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:00 +0000 Date: Mon, 29 Jun 2015 02:05:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Handle SIGTERM in save/restore 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b6ac9b7fc6bb18057a1aa114296b32f59b40e187 Author: Ian Jackson AuthorDate: Tue Feb 10 19:05:06 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Handle SIGTERM in save/restore helper During startup of the save/restore helper, set the disposition of SIGTERM appropriately. For restore, we can simply die immediately - there is no point trying to do any kind of cleanup on what is now going to be a trashed domain. For save, we want to arrange that libxc's cleanup code (eg turning off logdirty) takes place. So our signal handler replaces the fd with one on which writes will fail, causing libxc's own loop to fail next time it actually tries to do a write. Currently this has only a minor beneficial effect: we don't send the helper a SIGTERM ourselves, and if someone else contrives to send our helper a SIGTERM they have probably sent one to libxl too in which case things are going to be a bit messy anyway. But in the next patch libxl itself is going to use SIGTERM to implement ao abort requests. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_save_helper.c | 58 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 7514b2e..0be77c9 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -40,8 +40,10 @@ #include #include #include +#include #include "libxl.h" +#include "libxl_utils.h" #include "xenctrl.h" #include "xenguest.h" @@ -120,6 +122,58 @@ static void *xmalloc(size_t sz) return r; } +/*----- signal handling -----*/ + +static int unwriteable_fd; + +static void save_signal_handler(int num) +{ + /* + * We want to be able to interrupt save. But the code in libxc + * which does the actual saving is straight-through, and we need + * to execute its error path to put the guest back to sanity. + * + * So what we do is this: when we get the signal, we dup2 + * the result of open("/dev/null",O_RDONLY) onto the output fd. + * + * This is guaranteed to 1. interrupt libxc's write (causing it to + * return short, or maybe EINTR); 2. make the next write give + * EBADF, so that: 3. at latest, libxc will notice when it next + * tries to write data and will then go into its cleanup path. + * + * We make no effort here to sanitise the resulting errors. + * That's libxl's job. + */ + int esave = errno; + + int r = dup2(unwriteable_fd, io_fd); + assert(r == io_fd); /* if not we can't write an xtl message because we + * might end up interleaving on our control stream */ + + errno = esave; +} + +static void setup_signals(void (*handler)(int)) +{ + struct sigaction sa; + sigset_t spmask; + int r; + + unwriteable_fd = open("/dev/null",O_RDONLY); + if (unwriteable_fd < 0) fail(errno,"open /dev/null for reading"); + + LIBXL_FILLZERO(sa); + sa.sa_handler = handler; + sigemptyset(&sa.sa_mask); + r = sigaction(SIGTERM, &sa, 0); + if (r) fail(errno,"sigaction SIGTERM failed"); + + sigemptyset(&spmask); + sigaddset(&spmask,SIGTERM); + r = sigprocmask(SIG_UNBLOCK,&spmask,0); + if (r) fail(errno,"sigprocmask unblock SIGTERM failed"); +} + /*----- helper functions called by autogenerated stubs -----*/ unsigned char * helper_allocbuf(int len, void *user) @@ -229,6 +283,8 @@ int main(int argc, char **argv) helper_setcallbacks_save(&helper_save_callbacks, cbflags); startup("save"); + setup_signals(save_signal_handler); + r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags, &helper_save_callbacks, hvm); complete(r); @@ -254,6 +310,8 @@ int main(int argc, char **argv) unsigned long console_mfn = 0; startup("restore"); + setup_signals(SIG_DFL); + r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, console_domid, hvm, pae, superpages, -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:05:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9ORh-0008Dg-Et; Mon, 29 Jun 2015 02:05:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORf-0008DW-Kl for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:15 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C8/D7-21325-BD7A0955; Mon, 29 Jun 2015 02:05:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435543511!17428438!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8112 invoked from network); 29 Jun 2015 02:05:12 -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; 29 Jun 2015 02:05:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORb-0002S0-3k for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORb-0005bv-27 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:11 +0000 Date: Mon, 29 Jun 2015 02:05:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Abort libxc save/restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e12dade76a5a2d5001db3351835f443abae0ca2a Author: Ian Jackson AuthorDate: Tue Feb 10 19:10:18 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Abort libxc save/restore Register the the save/restore helper interface with the abort machinery. When we are informed that save/restore should be aborted, we make a note of the that in our rc variable, and send the helper a SIGTERM. It will die in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_save_callout.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2db6b2e..ad20168 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2702,6 +2702,7 @@ typedef struct libxl__save_helper_state { int rc; int completed; /* retval/errnoval valid iff completed */ int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ + libxl__ao_abortable abrt; libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ libxl__ev_fd readable; libxl__ev_child child; diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 1d584f1..93a884b 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -32,6 +32,7 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, const unsigned long *argnums, int num_argnums); static void helper_failed(libxl__egc*, libxl__save_helper_state *shs, int rc); +static void helper_stop(libxl__egc *egc, libxl__ao_abortable*, int rc); static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents); static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, @@ -166,9 +167,15 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, shs->rc = 0; shs->completed = 0; shs->pipes[0] = shs->pipes[1] = 0; + libxl__ao_abortable_init(&shs->abrt); libxl__ev_fd_init(&shs->readable); libxl__ev_child_init(&shs->child); + shs->abrt.ao = shs->ao; + shs->abrt.callback = helper_stop; + rc = libxl__ao_abortable_register(&shs->abrt); + if (rc) goto out; + shs->stdin_what = GCSPRINTF("domain %"PRIu32" save/restore helper" " stdin pipe", domid); shs->stdout_what = GCSPRINTF("domain %"PRIu32" save/restore helper" @@ -262,6 +269,22 @@ static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, sendsig(gc, shs, SIGKILL); } +static void helper_stop(libxl__egc *egc, libxl__ao_abortable *abrt, int rc) +{ + libxl__save_helper_state *shs = CONTAINER_OF(abrt, *shs, abrt); + STATE_AO_GC(shs->ao); + + if (!libxl__ev_child_inuse(&shs->child)) { + helper_failed(egc, shs, rc); + return; + } + + if (!shs->rc) + shs->rc = rc; + + sendsig(gc, shs, SIGTERM); +} + static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { @@ -332,6 +355,7 @@ static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs) { STATE_AO_GC(shs->ao); + libxl__ao_abortable_deregister(&shs->abrt); libxl__ev_fd_deregister(gc, &shs->readable); libxl__carefd_close(shs->pipes[0]); shs->pipes[0] = 0; libxl__carefd_close(shs->pipes[1]); shs->pipes[1] = 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 Jun 29 02:05:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9ORh-0008Dg-Et; Mon, 29 Jun 2015 02:05:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORf-0008DW-Kl for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:15 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id C8/D7-21325-BD7A0955; Mon, 29 Jun 2015 02:05:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435543511!17428438!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8112 invoked from network); 29 Jun 2015 02:05:12 -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; 29 Jun 2015 02:05:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORb-0002S0-3k for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORb-0005bv-27 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:11 +0000 Date: Mon, 29 Jun 2015 02:05:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Abort libxc save/restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e12dade76a5a2d5001db3351835f443abae0ca2a Author: Ian Jackson AuthorDate: Tue Feb 10 19:10:18 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Abort libxc save/restore Register the the save/restore helper interface with the abort machinery. When we are informed that save/restore should be aborted, we make a note of the that in our rc variable, and send the helper a SIGTERM. It will die in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_save_callout.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2db6b2e..ad20168 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2702,6 +2702,7 @@ typedef struct libxl__save_helper_state { int rc; int completed; /* retval/errnoval valid iff completed */ int retval, errnoval; /* from xc_domain_save / xc_domain_restore */ + libxl__ao_abortable abrt; libxl__carefd *pipes[2]; /* 0 = helper's stdin, 1 = helper's stdout */ libxl__ev_fd readable; libxl__ev_child child; diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 1d584f1..93a884b 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -32,6 +32,7 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, const unsigned long *argnums, int num_argnums); static void helper_failed(libxl__egc*, libxl__save_helper_state *shs, int rc); +static void helper_stop(libxl__egc *egc, libxl__ao_abortable*, int rc); static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents); static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, @@ -166,9 +167,15 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, shs->rc = 0; shs->completed = 0; shs->pipes[0] = shs->pipes[1] = 0; + libxl__ao_abortable_init(&shs->abrt); libxl__ev_fd_init(&shs->readable); libxl__ev_child_init(&shs->child); + shs->abrt.ao = shs->ao; + shs->abrt.callback = helper_stop; + rc = libxl__ao_abortable_register(&shs->abrt); + if (rc) goto out; + shs->stdin_what = GCSPRINTF("domain %"PRIu32" save/restore helper" " stdin pipe", domid); shs->stdout_what = GCSPRINTF("domain %"PRIu32" save/restore helper" @@ -262,6 +269,22 @@ static void helper_failed(libxl__egc *egc, libxl__save_helper_state *shs, sendsig(gc, shs, SIGKILL); } +static void helper_stop(libxl__egc *egc, libxl__ao_abortable *abrt, int rc) +{ + libxl__save_helper_state *shs = CONTAINER_OF(abrt, *shs, abrt); + STATE_AO_GC(shs->ao); + + if (!libxl__ev_child_inuse(&shs->child)) { + helper_failed(egc, shs, rc); + return; + } + + if (!shs->rc) + shs->rc = rc; + + sendsig(gc, shs, SIGTERM); +} + static void helper_stdout_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { @@ -332,6 +355,7 @@ static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs) { STATE_AO_GC(shs->ao); + libxl__ao_abortable_deregister(&shs->abrt); libxl__ev_fd_deregister(gc, &shs->readable); libxl__carefd_close(shs->pipes[0]); shs->pipes[0] = 0; libxl__carefd_close(shs->pipes[1]); shs->pipes[1] = 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 Jun 29 02:05:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9ORq-0008FA-HQ; Mon, 29 Jun 2015 02:05:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORo-0008Er-C8 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:24 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id D3/93-13517-3E7A0955; Mon, 29 Jun 2015 02:05:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435543521!20667713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27901 invoked from network); 29 Jun 2015 02:05:22 -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; 29 Jun 2015 02:05:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORl-0002S8-9s for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORl-0005cK-6w for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:21 +0000 Date: Mon, 29 Jun 2015 02:05:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: datacopier callback gets an rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3c8da9f5e731c518fcfb798beeaea9e8ccfad40 Author: Ian Jackson AuthorDate: Tue Feb 10 19:37:33 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao: datacopier callback gets an rc libxl__datacopier_* now provides its caller's callback function with an rc value. This relieves the caller of the need to figure out an appropriate rc value. Arrange that the `other internal failure' cases now get a valid positive errno value (EIO). In a few places, assert that errno is nonzero before passing it to our caller. Extend the datacopier callback API to permit the dc to signal ABORTED. (It doesn't actually do this yet, though.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: Andrew Cooper CC: David Vrabel --- v2: New in this version of the series. --- tools/libxl/libxl_aoutils.c | 24 +++++++++++++----------- tools/libxl/libxl_bootloader.c | 20 +++++++++++--------- tools/libxl/libxl_dom.c | 10 +++------- tools/libxl/libxl_internal.h | 18 +++++++++++------- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 593a575..1245828 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -121,10 +121,10 @@ void libxl__datacopier_kill(libxl__datacopier_state *dc) } static void datacopier_callback(libxl__egc *egc, libxl__datacopier_state *dc, - int onwrite, int errnoval) + int rc, int onwrite, int errnoval) { libxl__datacopier_kill(dc); - dc->callback(egc, dc, onwrite, errnoval); + dc->callback(egc, dc, rc, onwrite, errnoval); } static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, @@ -142,14 +142,14 @@ static void datacopier_check_state(libxl__egc *egc, libxl__datacopier_state *dc) if (rc) { LOG(ERROR, "unable to establish write event on %s" " during copy of %s", dc->writewhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO); return; } } } else if (!libxl__ev_fd_isregistered(&dc->toread) || dc->bytes_to_read == 0) { /* we have had eof */ - datacopier_callback(egc, dc, 0, 0); + datacopier_callback(egc, dc, 0, 0, 0); return; } else { /* nothing buffered, but still reading */ @@ -195,7 +195,7 @@ static int datacopier_pollhup_handled(libxl__egc *egc, onwrite ? dc->writewhat : dc->readwhat, dc->copywhat); libxl__datacopier_kill(dc); - dc->callback_pollhup(egc, dc, onwrite, -1); + dc->callback_pollhup(egc, dc, ERROR_FAIL, onwrite, -1); return 1; } return 0; @@ -213,7 +213,7 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, LOG(ERROR, "unexpected poll event 0x%x (expected POLLIN and/or POLLHUP)" " on %s during copy of %s", revents, dc->readwhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO); return; } assert(revents & (POLLIN|POLLHUP)); @@ -245,20 +245,21 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, } if (r < 0) { if (errno == EINTR) continue; + assert(errno); if (errno == EWOULDBLOCK) { if (revents & POLLHUP) { LOG(ERROR, "poll reported HUP but fd read gave EWOULDBLOCK" " on %s during copy of %s", dc->readwhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, 0); return; } break; } LOGE(ERROR, "error reading %s during copy of %s", dc->readwhat, dc->copywhat); - datacopier_callback(egc, dc, 0, errno); + datacopier_callback(egc, dc, ERROR_FAIL, 0, errno); return; } if (r == 0) { @@ -287,7 +288,7 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, assert(ferror(dc->log)); assert(errno); LOGE(ERROR, "error logging %s", dc->copywhat); - datacopier_callback(egc, dc, 0, errno); + datacopier_callback(egc, dc, ERROR_FAIL, 0, errno); return; } } @@ -315,7 +316,7 @@ static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, if (revents & ~POLLOUT) { LOG(ERROR, "unexpected poll event 0x%x (should be POLLOUT)" " on %s during copy of %s", revents, dc->writewhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO); return; } assert(revents & POLLOUT); @@ -332,9 +333,10 @@ static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, if (r < 0) { if (errno == EINTR) continue; if (errno == EWOULDBLOCK) break; + assert(errno); LOGE(ERROR, "error writing to %s during copy of %s", dc->writewhat, dc->copywhat); - datacopier_callback(egc, dc, 1, errno); + datacopier_callback(egc, dc, ERROR_FAIL, 1, errno); return; } assert(r > 0); diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 6db958e..95dde98 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -30,9 +30,9 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op); static void bootloader_keystrokes_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); static void bootloader_display_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc, int rc); static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, @@ -579,10 +579,10 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) /* perhaps one of these will be called, but perhaps not */ static void bootloader_copyfail(libxl__egc *egc, const char *which, - libxl__bootloader_state *bl, int ondisplay, int onwrite, int errnoval) + libxl__bootloader_state *bl, int ondisplay, + int rc, int onwrite, int errnoval) { STATE_AO_GC(bl->ao); - int rc = ERROR_FAIL; if (errnoval==-1) { /* POLLHUP */ @@ -593,22 +593,24 @@ static void bootloader_copyfail(libxl__egc *egc, const char *which, LOG(ERROR, "unexpected POLLHUP on %s", which); } } - if (!onwrite && !errnoval) + if (!rc) { LOG(ERROR, "unexpected eof copying %s", which); + rc = ERROR_FAIL; + } bootloader_stop(egc, bl, rc); } static void bootloader_keystrokes_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval) + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, keystrokes); - bootloader_copyfail(egc, "bootloader input", bl, 0, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader input", bl, 0, rc,onwrite,errnoval); } static void bootloader_display_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval) + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, display); - bootloader_copyfail(egc, "bootloader output", bl, 1, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader output", bl, 1, rc,onwrite,errnoval); } static void bootloader_domaindeath(libxl__egc *egc, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index b081ef7..bdc0465 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2158,7 +2158,7 @@ out: } static void save_device_model_datacopier_done(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); void libxl__domain_save_device_model(libxl__egc *egc, libxl__domain_suspend_state *dss, @@ -2218,11 +2218,11 @@ void libxl__domain_save_device_model(libxl__egc *egc, return; out: - save_device_model_datacopier_done(egc, dc, -1, 0); + save_device_model_datacopier_done(egc, dc, rc, -1, EIO); } static void save_device_model_datacopier_done(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval) + libxl__datacopier_state *dc, int our_rc, int onwrite, int errnoval) { libxl__domain_suspend_state *dss = CONTAINER_OF(dc, *dss, save_dm_datacopier); @@ -2230,14 +2230,10 @@ static void save_device_model_datacopier_done(libxl__egc *egc, /* Convenience aliases */ const char *const filename = dss->dm_savefile; - int our_rc = 0; int rc; libxl__datacopier_kill(dc); - if (onwrite || errnoval) - our_rc = ERROR_FAIL; - if (dc->readfd >= 0) { close(dc->readfd); dc->readfd = -1; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ad20168..1407251 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2620,17 +2620,21 @@ _hidden void libxl__device_disk_local_initiate_detach(libxl__egc *egc, typedef struct libxl__datacopier_state libxl__datacopier_state; typedef struct libxl__datacopier_buf libxl__datacopier_buf; -/* onwrite==1 means failure happened when writing, logged, errnoval is valid - * onwrite==0 means failure happened when reading - * errnoval==0 means we got eof and all data was written - * errnoval!=0 means we had a read error, logged - * onwrite==-1 means some other internal failure, errnoval not valid, logged - * If we get POLLHUP, we call callback_pollhup(..., onwrite, -1); +/* onwrite==1 means problem happened when writing + * rc==FAIL errnoval >0 we had a write error, logged + * onwrite==0 means problem happened when reading + * rc==0 errnoval==0 we got eof and all data was written + * rc==FAIL errnoval >0 we had a read error, logged + * onwrite==-1 means some other internal problem + * rc==FAIL errnoval==EIO some other internal failure, logged + * rc==ABORTED errnoval==0 abort requested, not logged + * If we get POLLHUP, we call callback_pollhup with + * rc==FAIL errnoval==-1 POLLHUP signalled * or if callback_pollhup==0 this is treated as eof (if POLLIN|POLLHUP * on the reading fd) or an internal failure (otherwise), as above. * In all cases copier is killed before calling this callback */ typedef void libxl__datacopier_callback(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); struct libxl__datacopier_buf { /* private to datacopier */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:05:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9ORq-0008FA-HQ; Mon, 29 Jun 2015 02:05:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORo-0008Er-C8 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:24 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id D3/93-13517-3E7A0955; Mon, 29 Jun 2015 02:05:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435543521!20667713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27901 invoked from network); 29 Jun 2015 02:05:22 -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; 29 Jun 2015 02:05:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORl-0002S8-9s for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORl-0005cK-6w for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:21 +0000 Date: Mon, 29 Jun 2015 02:05:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao: datacopier callback gets an rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3c8da9f5e731c518fcfb798beeaea9e8ccfad40 Author: Ian Jackson AuthorDate: Tue Feb 10 19:37:33 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao: datacopier callback gets an rc libxl__datacopier_* now provides its caller's callback function with an rc value. This relieves the caller of the need to figure out an appropriate rc value. Arrange that the `other internal failure' cases now get a valid positive errno value (EIO). In a few places, assert that errno is nonzero before passing it to our caller. Extend the datacopier callback API to permit the dc to signal ABORTED. (It doesn't actually do this yet, though.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell CC: Andrew Cooper CC: David Vrabel --- v2: New in this version of the series. --- tools/libxl/libxl_aoutils.c | 24 +++++++++++++----------- tools/libxl/libxl_bootloader.c | 20 +++++++++++--------- tools/libxl/libxl_dom.c | 10 +++------- tools/libxl/libxl_internal.h | 18 +++++++++++------- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 593a575..1245828 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -121,10 +121,10 @@ void libxl__datacopier_kill(libxl__datacopier_state *dc) } static void datacopier_callback(libxl__egc *egc, libxl__datacopier_state *dc, - int onwrite, int errnoval) + int rc, int onwrite, int errnoval) { libxl__datacopier_kill(dc); - dc->callback(egc, dc, onwrite, errnoval); + dc->callback(egc, dc, rc, onwrite, errnoval); } static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, @@ -142,14 +142,14 @@ static void datacopier_check_state(libxl__egc *egc, libxl__datacopier_state *dc) if (rc) { LOG(ERROR, "unable to establish write event on %s" " during copy of %s", dc->writewhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO); return; } } } else if (!libxl__ev_fd_isregistered(&dc->toread) || dc->bytes_to_read == 0) { /* we have had eof */ - datacopier_callback(egc, dc, 0, 0); + datacopier_callback(egc, dc, 0, 0, 0); return; } else { /* nothing buffered, but still reading */ @@ -195,7 +195,7 @@ static int datacopier_pollhup_handled(libxl__egc *egc, onwrite ? dc->writewhat : dc->readwhat, dc->copywhat); libxl__datacopier_kill(dc); - dc->callback_pollhup(egc, dc, onwrite, -1); + dc->callback_pollhup(egc, dc, ERROR_FAIL, onwrite, -1); return 1; } return 0; @@ -213,7 +213,7 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, LOG(ERROR, "unexpected poll event 0x%x (expected POLLIN and/or POLLHUP)" " on %s during copy of %s", revents, dc->readwhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO); return; } assert(revents & (POLLIN|POLLHUP)); @@ -245,20 +245,21 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, } if (r < 0) { if (errno == EINTR) continue; + assert(errno); if (errno == EWOULDBLOCK) { if (revents & POLLHUP) { LOG(ERROR, "poll reported HUP but fd read gave EWOULDBLOCK" " on %s during copy of %s", dc->readwhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, 0); return; } break; } LOGE(ERROR, "error reading %s during copy of %s", dc->readwhat, dc->copywhat); - datacopier_callback(egc, dc, 0, errno); + datacopier_callback(egc, dc, ERROR_FAIL, 0, errno); return; } if (r == 0) { @@ -287,7 +288,7 @@ static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, assert(ferror(dc->log)); assert(errno); LOGE(ERROR, "error logging %s", dc->copywhat); - datacopier_callback(egc, dc, 0, errno); + datacopier_callback(egc, dc, ERROR_FAIL, 0, errno); return; } } @@ -315,7 +316,7 @@ static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, if (revents & ~POLLOUT) { LOG(ERROR, "unexpected poll event 0x%x (should be POLLOUT)" " on %s during copy of %s", revents, dc->writewhat, dc->copywhat); - datacopier_callback(egc, dc, -1, 0); + datacopier_callback(egc, dc, ERROR_FAIL, -1, EIO); return; } assert(revents & POLLOUT); @@ -332,9 +333,10 @@ static void datacopier_writable(libxl__egc *egc, libxl__ev_fd *ev, if (r < 0) { if (errno == EINTR) continue; if (errno == EWOULDBLOCK) break; + assert(errno); LOGE(ERROR, "error writing to %s during copy of %s", dc->writewhat, dc->copywhat); - datacopier_callback(egc, dc, 1, errno); + datacopier_callback(egc, dc, ERROR_FAIL, 1, errno); return; } assert(r > 0); diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 6db958e..95dde98 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -30,9 +30,9 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op); static void bootloader_keystrokes_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); static void bootloader_display_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); static void bootloader_domaindeath(libxl__egc*, libxl__domaindeathcheck *dc, int rc); static void bootloader_finished(libxl__egc *egc, libxl__ev_child *child, @@ -579,10 +579,10 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) /* perhaps one of these will be called, but perhaps not */ static void bootloader_copyfail(libxl__egc *egc, const char *which, - libxl__bootloader_state *bl, int ondisplay, int onwrite, int errnoval) + libxl__bootloader_state *bl, int ondisplay, + int rc, int onwrite, int errnoval) { STATE_AO_GC(bl->ao); - int rc = ERROR_FAIL; if (errnoval==-1) { /* POLLHUP */ @@ -593,22 +593,24 @@ static void bootloader_copyfail(libxl__egc *egc, const char *which, LOG(ERROR, "unexpected POLLHUP on %s", which); } } - if (!onwrite && !errnoval) + if (!rc) { LOG(ERROR, "unexpected eof copying %s", which); + rc = ERROR_FAIL; + } bootloader_stop(egc, bl, rc); } static void bootloader_keystrokes_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval) + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, keystrokes); - bootloader_copyfail(egc, "bootloader input", bl, 0, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader input", bl, 0, rc,onwrite,errnoval); } static void bootloader_display_copyfail(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval) + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval) { libxl__bootloader_state *bl = CONTAINER_OF(dc, *bl, display); - bootloader_copyfail(egc, "bootloader output", bl, 1, onwrite, errnoval); + bootloader_copyfail(egc, "bootloader output", bl, 1, rc,onwrite,errnoval); } static void bootloader_domaindeath(libxl__egc *egc, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index b081ef7..bdc0465 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2158,7 +2158,7 @@ out: } static void save_device_model_datacopier_done(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); void libxl__domain_save_device_model(libxl__egc *egc, libxl__domain_suspend_state *dss, @@ -2218,11 +2218,11 @@ void libxl__domain_save_device_model(libxl__egc *egc, return; out: - save_device_model_datacopier_done(egc, dc, -1, 0); + save_device_model_datacopier_done(egc, dc, rc, -1, EIO); } static void save_device_model_datacopier_done(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval) + libxl__datacopier_state *dc, int our_rc, int onwrite, int errnoval) { libxl__domain_suspend_state *dss = CONTAINER_OF(dc, *dss, save_dm_datacopier); @@ -2230,14 +2230,10 @@ static void save_device_model_datacopier_done(libxl__egc *egc, /* Convenience aliases */ const char *const filename = dss->dm_savefile; - int our_rc = 0; int rc; libxl__datacopier_kill(dc); - if (onwrite || errnoval) - our_rc = ERROR_FAIL; - if (dc->readfd >= 0) { close(dc->readfd); dc->readfd = -1; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ad20168..1407251 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2620,17 +2620,21 @@ _hidden void libxl__device_disk_local_initiate_detach(libxl__egc *egc, typedef struct libxl__datacopier_state libxl__datacopier_state; typedef struct libxl__datacopier_buf libxl__datacopier_buf; -/* onwrite==1 means failure happened when writing, logged, errnoval is valid - * onwrite==0 means failure happened when reading - * errnoval==0 means we got eof and all data was written - * errnoval!=0 means we had a read error, logged - * onwrite==-1 means some other internal failure, errnoval not valid, logged - * If we get POLLHUP, we call callback_pollhup(..., onwrite, -1); +/* onwrite==1 means problem happened when writing + * rc==FAIL errnoval >0 we had a write error, logged + * onwrite==0 means problem happened when reading + * rc==0 errnoval==0 we got eof and all data was written + * rc==FAIL errnoval >0 we had a read error, logged + * onwrite==-1 means some other internal problem + * rc==FAIL errnoval==EIO some other internal failure, logged + * rc==ABORTED errnoval==0 abort requested, not logged + * If we get POLLHUP, we call callback_pollhup with + * rc==FAIL errnoval==-1 POLLHUP signalled * or if callback_pollhup==0 this is treated as eof (if POLLIN|POLLHUP * on the reading fd) or an internal failure (otherwise), as above. * In all cases copier is killed before calling this callback */ typedef void libxl__datacopier_callback(libxl__egc *egc, - libxl__datacopier_state *dc, int onwrite, int errnoval); + libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); struct libxl__datacopier_buf { /* private to datacopier */ -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:05:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9OS1-0008H9-MD; Mon, 29 Jun 2015 02:05:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORz-0008Gq-OQ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:35 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id E7/C0-32733-FE7A0955; Mon, 29 Jun 2015 02:05:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1435543531!26515972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5749 invoked from network); 29 Jun 2015 02:05:32 -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; 29 Jun 2015 02:05:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORv-0002SI-J7 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORv-0005dW-ED for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:31 +0000 Date: Mon, 29 Jun 2015 02:05:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Make datacopiers abortable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ab4dfe90e497173e9d3da7dfb0d53b6fdc02d00 Author: Ian Jackson AuthorDate: Tue Feb 10 19:52:11 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Make datacopiers abortable libxl__datacopier_* can now actually generate a callback with rc==ABORTED. This provides abort support during some corner cases, including (at least) copying the device model data during the end of domain save. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_aoutils.c | 16 ++++++++++++++++ tools/libxl/libxl_internal.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 1245828..0931eee 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -103,6 +103,7 @@ static void xswait_report_error(libxl__egc *egc, libxl__xswait_state *xswa, void libxl__datacopier_init(libxl__datacopier_state *dc) { assert(dc->ao); + libxl__ao_abortable_init(&dc->abrt); libxl__ev_fd_init(&dc->toread); libxl__ev_fd_init(&dc->towrite); LIBXL_TAILQ_INIT(&dc->bufs); @@ -113,6 +114,7 @@ void libxl__datacopier_kill(libxl__datacopier_state *dc) STATE_AO_GC(dc->ao); libxl__datacopier_buf *buf, *tbuf; + libxl__ao_abortable_deregister(&dc->abrt); libxl__ev_fd_deregister(gc, &dc->toread); libxl__ev_fd_deregister(gc, &dc->towrite); LIBXL_TAILQ_FOREACH_SAFE(buf, &dc->bufs, entry, tbuf) @@ -201,6 +203,15 @@ static int datacopier_pollhup_handled(libxl__egc *egc, return 0; } +static void datacopier_abort(libxl__egc *egc, libxl__ao_abortable *abrt, + int rc) +{ + libxl__datacopier_state *dc = CONTAINER_OF(abrt, *dc, abrt); + STATE_AO_GC(dc->ao); + + datacopier_callback(egc, dc, rc, -1, 0); +} + static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, toread); @@ -359,6 +370,11 @@ int libxl__datacopier_start(libxl__datacopier_state *dc) assert(dc->readfd >= 0 || dc->writefd >= 0); assert(!(dc->readbuf && dc->bytes_to_read == -1)); + dc->abrt.ao = ao; + dc->abrt.callback = datacopier_abort; + rc = libxl__ao_abortable_register(&dc->abrt); + if (rc) goto out; + if (dc->readfd >= 0) { rc = libxl__ev_fd_register(gc, &dc->toread, datacopier_readable, dc->readfd, POLLIN); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1407251..d52589e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2657,6 +2657,7 @@ struct libxl__datacopier_state { fd. The buffer should be at least as large as the bytes_to_read parameter, which should not be -1. */ /* remaining fields are private to datacopier */ + libxl__ao_abortable abrt; libxl__ev_fd toread, towrite; ssize_t used; LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:05:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9OS1-0008H9-MD; Mon, 29 Jun 2015 02:05:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORz-0008Gq-OQ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:35 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id E7/C0-32733-FE7A0955; Mon, 29 Jun 2015 02:05:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1435543531!26515972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5749 invoked from network); 29 Jun 2015 02:05:32 -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; 29 Jun 2015 02:05:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ORv-0002SI-J7 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ORv-0005dW-ED for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:31 +0000 Date: Mon, 29 Jun 2015 02:05:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ao abort: Make datacopiers abortable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ab4dfe90e497173e9d3da7dfb0d53b6fdc02d00 Author: Ian Jackson AuthorDate: Tue Feb 10 19:52:11 2015 +0000 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: ao abort: Make datacopiers abortable libxl__datacopier_* can now actually generate a callback with rc==ABORTED. This provides abort support during some corner cases, including (at least) copying the device model data during the end of domain save. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: New in this version of the series. --- tools/libxl/libxl_aoutils.c | 16 ++++++++++++++++ tools/libxl/libxl_internal.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 1245828..0931eee 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -103,6 +103,7 @@ static void xswait_report_error(libxl__egc *egc, libxl__xswait_state *xswa, void libxl__datacopier_init(libxl__datacopier_state *dc) { assert(dc->ao); + libxl__ao_abortable_init(&dc->abrt); libxl__ev_fd_init(&dc->toread); libxl__ev_fd_init(&dc->towrite); LIBXL_TAILQ_INIT(&dc->bufs); @@ -113,6 +114,7 @@ void libxl__datacopier_kill(libxl__datacopier_state *dc) STATE_AO_GC(dc->ao); libxl__datacopier_buf *buf, *tbuf; + libxl__ao_abortable_deregister(&dc->abrt); libxl__ev_fd_deregister(gc, &dc->toread); libxl__ev_fd_deregister(gc, &dc->towrite); LIBXL_TAILQ_FOREACH_SAFE(buf, &dc->bufs, entry, tbuf) @@ -201,6 +203,15 @@ static int datacopier_pollhup_handled(libxl__egc *egc, return 0; } +static void datacopier_abort(libxl__egc *egc, libxl__ao_abortable *abrt, + int rc) +{ + libxl__datacopier_state *dc = CONTAINER_OF(abrt, *dc, abrt); + STATE_AO_GC(dc->ao); + + datacopier_callback(egc, dc, rc, -1, 0); +} + static void datacopier_readable(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { libxl__datacopier_state *dc = CONTAINER_OF(ev, *dc, toread); @@ -359,6 +370,11 @@ int libxl__datacopier_start(libxl__datacopier_state *dc) assert(dc->readfd >= 0 || dc->writefd >= 0); assert(!(dc->readbuf && dc->bytes_to_read == -1)); + dc->abrt.ao = ao; + dc->abrt.callback = datacopier_abort; + rc = libxl__ao_abortable_register(&dc->abrt); + if (rc) goto out; + if (dc->readfd >= 0) { rc = libxl__ev_fd_register(gc, &dc->toread, datacopier_readable, dc->readfd, POLLIN); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1407251..d52589e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2657,6 +2657,7 @@ struct libxl__datacopier_state { fd. The buffer should be at least as large as the bytes_to_read parameter, which should not be -1. */ /* remaining fields are private to datacopier */ + libxl__ao_abortable abrt; libxl__ev_fd toread, towrite; ssize_t used; LIBXL_TAILQ_HEAD(libxl__datacopier_bufs, libxl__datacopier_buf) bufs; -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:05:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9OS8-0008IS-OY; Mon, 29 Jun 2015 02:05:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OS8-0008IH-38 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:44 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 50/C1-08467-7F7A0955; Mon, 29 Jun 2015 02:05:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435543541!12154008!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11937 invoked from network); 29 Jun 2015 02:05:42 -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; 29 Jun 2015 02:05:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OS5-0002SQ-PQ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OS5-0005e5-O0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:41 +0000 Date: Mon, 29 Jun 2015 02:05:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix libxl__get_domid error reporting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bfca4503f7c2a1b93e7b0f161907d3beac230de0 Author: Ian Jackson AuthorDate: Tue Jun 23 18:02:40 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: Fix libxl__get_domid error reporting Make it log something if the xenstore path does not exist. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 37069b7..e9a2d26 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1962,8 +1962,10 @@ int libxl__get_domid(libxl__gc *gc, uint32_t *domid) const char *xs_domid; rc = libxl__xs_read_checked(gc, XBT_NULL, DOMID_XS_PATH, &xs_domid); - if (rc || !xs_domid) { - rc = rc ? rc : ERROR_FAIL; + if (rc) goto out; + if (!xs_domid) { + LOG(ERROR, "failed to get own domid (%s)", DOMID_XS_PATH); + rc = ERROR_FAIL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:05:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9OS8-0008IS-OY; Mon, 29 Jun 2015 02:05:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OS8-0008IH-38 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:44 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 50/C1-08467-7F7A0955; Mon, 29 Jun 2015 02:05:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435543541!12154008!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11937 invoked from network); 29 Jun 2015 02:05:42 -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; 29 Jun 2015 02:05:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OS5-0002SQ-PQ for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OS5-0005e5-O0 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:41 +0000 Date: Mon, 29 Jun 2015 02:05:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix libxl__get_domid error reporting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bfca4503f7c2a1b93e7b0f161907d3beac230de0 Author: Ian Jackson AuthorDate: Tue Jun 23 18:02:40 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: Fix libxl__get_domid error reporting Make it log something if the xenstore path does not exist. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 37069b7..e9a2d26 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1962,8 +1962,10 @@ int libxl__get_domid(libxl__gc *gc, uint32_t *domid) const char *xs_domid; rc = libxl__xs_read_checked(gc, XBT_NULL, DOMID_XS_PATH, &xs_domid); - if (rc || !xs_domid) { - rc = rc ? rc : ERROR_FAIL; + if (rc) goto out; + if (!xs_domid) { + LOG(ERROR, "failed to get own domid (%s)", DOMID_XS_PATH); + rc = ERROR_FAIL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:05:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9OSI-0008K8-Qy; Mon, 29 Jun 2015 02:05:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSI-0008Jy-4x for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:54 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 02/28-21325-108A0955; Mon, 29 Jun 2015 02:05:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435543552!17436315!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21851 invoked from network); 29 Jun 2015 02:05:52 -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; 29 Jun 2015 02:05:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSF-0002SY-Tn for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSF-0005eg-Sz for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:51 +0000 Date: Mon, 29 Jun 2015 02:05:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: spawn: Always debug log middle child process death X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2adbf6dc29dd15de88df4109185ad4d88ada2077 Author: Ian Jackson AuthorDate: Tue Jun 23 18:10:51 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: spawn: Always debug log middle child process death Otherwise the debug log is strangely devoid of an explanation for the spawn completing. We decorate `what', as otherwise the logged message is rather alarming (especially if the death is due to us sending SIGKILL, which even happens on the success path). Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_exec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 85cbde0..ecb30cf 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -411,6 +411,8 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, ((WIFEXITED(status) && WEXITSTATUS(status)==0) || (WIFSIGNALED(status) && WTERMSIG(status)==SIGKILL))) { /* as expected */ + const char *what = GCSPRINTF("%s (dying as expected)", ss->what); + libxl_report_child_exitstatus(CTX, XTL_DEBUG, what, pid, status); } else if (!WIFEXITED(status)) { int loglevel = ss->detaching ? XTL_WARN : XTL_ERROR; const char *what = -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:05:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:05: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 1Z9OSI-0008K8-Qy; Mon, 29 Jun 2015 02:05:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSI-0008Jy-4x for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:54 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 02/28-21325-108A0955; Mon, 29 Jun 2015 02:05:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435543552!17436315!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21851 invoked from network); 29 Jun 2015 02:05:52 -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; 29 Jun 2015 02:05:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSF-0002SY-Tn for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSF-0005eg-Sz for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:05:51 +0000 Date: Mon, 29 Jun 2015 02:05:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: spawn: Always debug log middle child process death X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2adbf6dc29dd15de88df4109185ad4d88ada2077 Author: Ian Jackson AuthorDate: Tue Jun 23 18:10:51 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: spawn: Always debug log middle child process death Otherwise the debug log is strangely devoid of an explanation for the spawn completing. We decorate `what', as otherwise the logged message is rather alarming (especially if the death is due to us sending SIGKILL, which even happens on the success path). Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_exec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 85cbde0..ecb30cf 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -411,6 +411,8 @@ static void spawn_middle_death(libxl__egc *egc, libxl__ev_child *childw, ((WIFEXITED(status) && WEXITSTATUS(status)==0) || (WIFSIGNALED(status) && WTERMSIG(status)==SIGKILL))) { /* as expected */ + const char *what = GCSPRINTF("%s (dying as expected)", ss->what); + libxl_report_child_exitstatus(CTX, XTL_DEBUG, what, pid, status); } else if (!WIFEXITED(status)) { int loglevel = ss->detaching ? XTL_WARN : XTL_ERROR; const char *what = -- generated by git-patchbot for /home/xen/git/xen.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 Jun 29 02:06:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:06: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 1Z9OSY-0008MS-Tl; Mon, 29 Jun 2015 02:06:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSX-0008MC-TY for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:10 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 56/F0-32733-118A0955; Mon, 29 Jun 2015 02:06:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1435543565!19841293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18019 invoked from network); 29 Jun 2015 02:06:06 -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; 29 Jun 2015 02:06:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSQ-0002TB-4d for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSQ-0005fd-0b for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:02 +0000 Date: Mon, 29 Jun 2015 02:06:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl__ev_child pass actual pid to callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6ffc6bac68e87f04f97b2c32c3092f7d0a36212 Author: Ian Jackson AuthorDate: Tue Jun 23 19:22:07 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: libxl__ev_child pass actual pid to callback The callbacks actually ignore this except for logging, but we should log the correct pid. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_fork.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 144208a..4486687 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -447,9 +447,10 @@ static int perhaps_sigchld_needed(libxl__gc *gc, bool creating) static void childproc_reaped_ours(libxl__egc *egc, libxl__ev_child *ch, int status) { + pid_t pid = ch->pid; LIBXL_LIST_REMOVE(ch, entry); ch->pid = -1; - ch->callback(egc, ch, ch->pid, status); + ch->callback(egc, ch, pid, status); } static int childproc_reaped(libxl__egc *egc, pid_t pid, int 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 Mon Jun 29 02:06:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:06: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 1Z9OSY-0008MS-Tl; Mon, 29 Jun 2015 02:06:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSX-0008MC-TY for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:10 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 56/F0-32733-118A0955; Mon, 29 Jun 2015 02:06:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1435543565!19841293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18019 invoked from network); 29 Jun 2015 02:06:06 -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; 29 Jun 2015 02:06:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSQ-0002TB-4d for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSQ-0005fd-0b for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:02 +0000 Date: Mon, 29 Jun 2015 02:06:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl__ev_child pass actual pid to callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6ffc6bac68e87f04f97b2c32c3092f7d0a36212 Author: Ian Jackson AuthorDate: Tue Jun 23 19:22:07 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: libxl__ev_child pass actual pid to callback The callbacks actually ignore this except for logging, but we should log the correct pid. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_fork.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 144208a..4486687 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -447,9 +447,10 @@ static int perhaps_sigchld_needed(libxl__gc *gc, bool creating) static void childproc_reaped_ours(libxl__egc *egc, libxl__ev_child *ch, int status) { + pid_t pid = ch->pid; LIBXL_LIST_REMOVE(ch, entry); ch->pid = -1; - ch->callback(egc, ch, ch->pid, status); + ch->callback(egc, ch, pid, status); } static int childproc_reaped(libxl__egc *egc, pid_t pid, int 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 Mon Jun 29 02:06:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:06: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 1Z9OSh-0008Nl-0O; Mon, 29 Jun 2015 02:06:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSg-0008Nd-Ab for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:18 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 14/AB-21300-918A0955; Mon, 29 Jun 2015 02:06:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1435543576!27422895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11091 invoked from network); 29 Jun 2015 02:06:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:06:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSd-0002TK-W6 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSd-0005gM-PI for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:15 +0000 Date: Mon, 29 Jun 2015 02:06:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: When save/restore helper dies, do not overwrite rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acc9a611055f72d5898fda1edbfb4e08956cca3c Author: Ian Jackson AuthorDate: Tue Jun 23 19:22:41 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: When save/restore helper dies, do not overwrite rc If we already have an rc (eg from ao abort), keep it. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_save_callout.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 93a884b..087c2d5 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -332,19 +332,22 @@ static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, if (status) { libxl_report_child_exitstatus(CTX, XTL_ERROR, what, pid, status); - shs->rc = ERROR_FAIL; + if (!shs->rc) + shs->rc = ERROR_FAIL; } if (shs->need_results) { - if (!shs->rc) + if (!shs->rc) { LOG(ERROR,"%s exited without providing results",what); - shs->rc = ERROR_FAIL; + shs->rc = ERROR_FAIL; + } } if (!shs->completed) { - if (!shs->rc) + if (!shs->rc) { LOG(ERROR,"%s exited without signaling completion",what); - shs->rc = ERROR_FAIL; + shs->rc = ERROR_FAIL; + } } helper_done(egc, shs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:06:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:06: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 1Z9OSh-0008Nl-0O; Mon, 29 Jun 2015 02:06:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSg-0008Nd-Ab for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:18 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 14/AB-21300-918A0955; Mon, 29 Jun 2015 02:06:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1435543576!27422895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11091 invoked from network); 29 Jun 2015 02:06:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 29 Jun 2015 02:06:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSd-0002TK-W6 for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSd-0005gM-PI for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:15 +0000 Date: Mon, 29 Jun 2015 02:06:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: When save/restore helper dies, do not overwrite rc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acc9a611055f72d5898fda1edbfb4e08956cca3c Author: Ian Jackson AuthorDate: Tue Jun 23 19:22:41 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 16:53:51 2015 +0100 libxl: When save/restore helper dies, do not overwrite rc If we already have an rc (eg from ao abort), keep it. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v4: New patch in this version of the series. --- tools/libxl/libxl_save_callout.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 93a884b..087c2d5 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -332,19 +332,22 @@ static void helper_exited(libxl__egc *egc, libxl__ev_child *ch, if (status) { libxl_report_child_exitstatus(CTX, XTL_ERROR, what, pid, status); - shs->rc = ERROR_FAIL; + if (!shs->rc) + shs->rc = ERROR_FAIL; } if (shs->need_results) { - if (!shs->rc) + if (!shs->rc) { LOG(ERROR,"%s exited without providing results",what); - shs->rc = ERROR_FAIL; + shs->rc = ERROR_FAIL; + } } if (!shs->completed) { - if (!shs->rc) + if (!shs->rc) { LOG(ERROR,"%s exited without signaling completion",what); - shs->rc = ERROR_FAIL; + shs->rc = ERROR_FAIL; + } } helper_done(egc, shs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 29 02:06:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:06: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 1Z9OSt-0000At-33; Mon, 29 Jun 2015 02:06:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSs-0000Aj-AH for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:30 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 48/74-18676-528A0955; Mon, 29 Jun 2015 02:06:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543586!27443080!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31769 invoked from network); 29 Jun 2015 02:06:27 -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; 29 Jun 2015 02:06:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSo-0002TW-3p for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSo-0005gr-2x for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:26 +0000 Date: Mon, 29 Jun 2015 02:06:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add missing #include of X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c40317f11b3f05e7c06a2213560c8471081f2662 Author: Ian Jackson AuthorDate: Fri Jun 26 18:24:22 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 18:24:22 2015 +0100 libxl: Add missing #include of "libxl: ao abort: Handle SIGTERM in save/restore helper" requires this; without it we fail to build on BSD. Reported-by: Ian Campbell CC: Ian Campbell CC: Roger Pau Monne Signed-off-by: Ian Jackson --- tools/libxl/libxl_save_helper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 0be77c9..14675ae 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "libxl.h" #include "libxl_utils.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 Jun 29 02:06:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 29 Jun 2015 02:06: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 1Z9OSt-0000At-33; Mon, 29 Jun 2015 02:06:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSs-0000Aj-AH for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:30 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 48/74-18676-528A0955; Mon, 29 Jun 2015 02:06:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435543586!27443080!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31769 invoked from network); 29 Jun 2015 02:06:27 -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; 29 Jun 2015 02:06:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9OSo-0002TW-3p for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9OSo-0005gr-2x for xen-changelog@lists.xensource.com; Mon, 29 Jun 2015 02:06:26 +0000 Date: Mon, 29 Jun 2015 02:06:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add missing #include of X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c40317f11b3f05e7c06a2213560c8471081f2662 Author: Ian Jackson AuthorDate: Fri Jun 26 18:24:22 2015 +0100 Commit: Ian Jackson CommitDate: Fri Jun 26 18:24:22 2015 +0100 libxl: Add missing #include of "libxl: ao abort: Handle SIGTERM in save/restore helper" requires this; without it we fail to build on BSD. Reported-by: Ian Campbell CC: Ian Campbell CC: Roger Pau Monne Signed-off-by: Ian Jackson --- tools/libxl/libxl_save_helper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 0be77c9..14675ae 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "libxl.h" #include "libxl_utils.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 Tue Jun 30 05:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oVl-0004Ld-OF; Tue, 30 Jun 2015 05:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVk-0004LW-S7 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:12 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 3A/0D-25925-04F22955; Tue, 30 Jun 2015 05:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435643710!17750720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4709 invoked from network); 30 Jun 2015 05:55:11 -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; 30 Jun 2015 05:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVi-00059X-Gn for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oVd-0002Q6-Qy for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:10 +0000 Date: Tue, 30 Jun 2015 05:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] cpupool: assigning a CPU to a pool can fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d660a98a801e12c779344cc3afcf17cba95df5f Author: Dario Faggioli AuthorDate: Thu Jun 18 09:17:16 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:17:16 2015 +0200 cpupool: assigning a CPU to a pool can fail which means such an event must be handled at the call sites of cpupool_assign_cpu_locked(), and the error, if occurring, properly propagated. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross master commit: d415a81b2245ac4b27f8cbf4e314449ef275333a master date: 2015-05-07 15:15:53 +0200 --- xen/common/cpupool.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 2c283b9..dd35fdc 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -457,8 +457,10 @@ void cpupool_rm_domain(struct domain *d) * unless we are resuming from S3, in which case we put the cpu back * in the cpupool it was in prior to suspend. */ -static void cpupool_cpu_add(unsigned int cpu) +static int cpupool_cpu_add(unsigned int cpu) { + int ret = -EINVAL; + spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); cpumask_set_cpu(cpu, &cpupool_free_cpus); @@ -471,15 +473,20 @@ static void cpupool_cpu_add(unsigned int cpu) { if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) { - cpupool_assign_cpu_locked(*c, cpu); + ret = cpupool_assign_cpu_locked(*c, cpu); + if ( ret ) + goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); } } } if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) - cpupool_assign_cpu_locked(cpupool0, cpu); + ret = cpupool_assign_cpu_locked(cpupool0, cpu); + out: spin_unlock(&cpupool_lock); + + return ret; } /* @@ -703,7 +710,7 @@ static int cpu_callback( { case CPU_DOWN_FAILED: case CPU_ONLINE: - cpupool_cpu_add(cpu); + rc = cpupool_cpu_add(cpu); break; case CPU_DOWN_PREPARE: rc = cpupool_cpu_remove(cpu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oVl-0004Ld-OF; Tue, 30 Jun 2015 05:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVk-0004LW-S7 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:12 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 3A/0D-25925-04F22955; Tue, 30 Jun 2015 05:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435643710!17750720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4709 invoked from network); 30 Jun 2015 05:55:11 -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; 30 Jun 2015 05:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVi-00059X-Gn for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oVd-0002Q6-Qy for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:10 +0000 Date: Tue, 30 Jun 2015 05:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] cpupool: assigning a CPU to a pool can fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d660a98a801e12c779344cc3afcf17cba95df5f Author: Dario Faggioli AuthorDate: Thu Jun 18 09:17:16 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:17:16 2015 +0200 cpupool: assigning a CPU to a pool can fail which means such an event must be handled at the call sites of cpupool_assign_cpu_locked(), and the error, if occurring, properly propagated. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross master commit: d415a81b2245ac4b27f8cbf4e314449ef275333a master date: 2015-05-07 15:15:53 +0200 --- xen/common/cpupool.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 2c283b9..dd35fdc 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -457,8 +457,10 @@ void cpupool_rm_domain(struct domain *d) * unless we are resuming from S3, in which case we put the cpu back * in the cpupool it was in prior to suspend. */ -static void cpupool_cpu_add(unsigned int cpu) +static int cpupool_cpu_add(unsigned int cpu) { + int ret = -EINVAL; + spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); cpumask_set_cpu(cpu, &cpupool_free_cpus); @@ -471,15 +473,20 @@ static void cpupool_cpu_add(unsigned int cpu) { if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) { - cpupool_assign_cpu_locked(*c, cpu); + ret = cpupool_assign_cpu_locked(*c, cpu); + if ( ret ) + goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); } } } if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) - cpupool_assign_cpu_locked(cpupool0, cpu); + ret = cpupool_assign_cpu_locked(cpupool0, cpu); + out: spin_unlock(&cpupool_lock); + + return ret; } /* @@ -703,7 +710,7 @@ static int cpu_callback( { case CPU_DOWN_FAILED: case CPU_ONLINE: - cpupool_cpu_add(cpu); + rc = cpupool_cpu_add(cpu); break; case CPU_DOWN_PREPARE: rc = cpupool_cpu_remove(cpu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVz-0004Mb-Qp; Tue, 30 Jun 2015 05:55:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVy-0004MJ-Ec for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:26 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 3F/D0-17050-B4F22955; Tue, 30 Jun 2015 05:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1435643721!21023924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3497 invoked from network); 30 Jun 2015 05:55:22 -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; 30 Jun 2015 05:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVt-0005AN-81 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oVt-0002QU-15 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:21 +0000 Date: Tue, 30 Jun 2015 05:55:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] cpupools: avoid crashing if shutting down with free CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adee06215d66319e2f9a4809bcab801053465e00 Author: Dario Faggioli AuthorDate: Thu Jun 18 09:17:48 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:17:48 2015 +0200 cpupools: avoid crashing if shutting down with free CPUs in fact, before this change, shutting down or suspending the system with some CPUs not assigned to any cpupool, would crash as follows: (XEN) Xen call trace: (XEN) [] disable_nonboot_cpus+0xb5/0x138 (XEN) [] enter_state_helper+0xbd/0x369 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Xen BUG at cpu.c:191 (XEN) **************************************** This is because, for free CPUs, -EBUSY were being returned when trying to tear them down, making cpu_down() unhappy. It is certainly unpractical to forbid shutting down or suspenging if there are unassigned CPUs, so this change fixes the above by just avoiding returning -EBUSY for those CPUs. If shutting off, that does not matter much anyway. If suspending, we make sure that the CPUs remain unassigned when resuming. While there, take the chance to: - fix the doc comment of cpupool_cpu_remove() (it was wrong); - improve comments in general around and in cpupool_cpu_remove() and cpupool_cpu_add(); - add a couple of ASSERT()-s for checking consistency. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Tested-by: Juergen Gross master commit: 7ff6f1fc39ebf2fa939d78a6ca3f883adff04bc9 master date: 2015-05-13 15:08:30 +0200 --- xen/common/cpupool.c | 82 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index dd35fdc..f089d24 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -452,14 +452,16 @@ void cpupool_rm_domain(struct domain *d) } /* - * called to add a new cpu to pool admin - * we add a hotplugged cpu to the cpupool0 to be able to add it to dom0, - * unless we are resuming from S3, in which case we put the cpu back - * in the cpupool it was in prior to suspend. + * Called to add a cpu to a pool. CPUs being hot-plugged are added to pool0, + * as they must have been in there when unplugged. + * + * If, on the other hand, we are adding CPUs because we are resuming (e.g., + * after ACPI S3) we put the cpu back in the pool where it was in prior when + * we suspended. */ static int cpupool_cpu_add(unsigned int cpu) { - int ret = -EINVAL; + int ret = 0; spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); @@ -477,12 +479,28 @@ static int cpupool_cpu_add(unsigned int cpu) if ( ret ) goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); + break; } } - } - if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) + /* + * Either cpu has been found as suspended in a pool, and added back + * there, or it stayed free (if it did not belong to any pool when + * suspending), and we don't want to do anything. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_valid)); + } + else + { + /* + * If we are not resuming, we are hot-plugging cpu, and in which case + * we add it to pool0, as it certainly was there when hot-unplagged + * (or unplugging would have failed) and that is the default behavior + * anyway. + */ ret = cpupool_assign_cpu_locked(cpupool0, cpu); + } out: spin_unlock(&cpupool_lock); @@ -490,29 +508,52 @@ static int cpupool_cpu_add(unsigned int cpu) } /* - * called to remove a cpu from pool admin - * the cpu to be removed is locked to avoid removing it from dom0 - * returns failure if not in pool0 + * Called to remove a CPU from a pool. The CPU is locked, to forbid removing + * it from pool0. In fact, if we want to hot-unplug a CPU, it must belong to + * pool0, or we fail. + * + * However, if we are suspending (e.g., to ACPI S3), we mark the CPU in such + * a way that it can be put back in its pool when resuming. */ static int cpupool_cpu_remove(unsigned int cpu) { int ret = -EBUSY; - struct cpupool **c; spin_lock(&cpupool_lock); - if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) - ret = 0; - else + if ( system_state == SYS_STATE_suspend ) { + struct cpupool **c; + for_each_cpupool(c) { - if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) { - ret = 0; + cpumask_set_cpu(cpu, (*c)->cpu_suspended); break; } } + + /* + * Either we found cpu in a pool, or it must be free (if it has been + * hot-unplagged, then we must have found it in pool0). It is, of + * course, fine to suspend or shutdown with CPUs not assigned to a + * pool, and (in case of suspend) they will stay free when resuming. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_suspended)); + ASSERT(cpumask_test_cpu(cpu, &cpu_online_map) || + cpumask_test_cpu(cpu, cpupool0->cpu_suspended)); + ret = 0; + } + else if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + { + /* + * If we are not suspending, we are hot-unplugging cpu, and that is + * allowed only for CPUs in pool0. + */ + ret = 0; } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); @@ -697,15 +738,6 @@ static int cpu_callback( unsigned int cpu = (unsigned long)hcpu; int rc = 0; - if ( system_state == SYS_STATE_suspend ) - { - struct cpupool **c; - - for_each_cpupool(c) - if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) - cpumask_set_cpu(cpu, (*c)->cpu_suspended); - } - switch ( action ) { case CPU_DOWN_FAILED: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVz-0004Mb-Qp; Tue, 30 Jun 2015 05:55:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVy-0004MJ-Ec for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:26 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 3F/D0-17050-B4F22955; Tue, 30 Jun 2015 05:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1435643721!21023924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3497 invoked from network); 30 Jun 2015 05:55:22 -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; 30 Jun 2015 05:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oVt-0005AN-81 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oVt-0002QU-15 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:21 +0000 Date: Tue, 30 Jun 2015 05:55:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] cpupools: avoid crashing if shutting down with free CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adee06215d66319e2f9a4809bcab801053465e00 Author: Dario Faggioli AuthorDate: Thu Jun 18 09:17:48 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:17:48 2015 +0200 cpupools: avoid crashing if shutting down with free CPUs in fact, before this change, shutting down or suspending the system with some CPUs not assigned to any cpupool, would crash as follows: (XEN) Xen call trace: (XEN) [] disable_nonboot_cpus+0xb5/0x138 (XEN) [] enter_state_helper+0xbd/0x369 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Xen BUG at cpu.c:191 (XEN) **************************************** This is because, for free CPUs, -EBUSY were being returned when trying to tear them down, making cpu_down() unhappy. It is certainly unpractical to forbid shutting down or suspenging if there are unassigned CPUs, so this change fixes the above by just avoiding returning -EBUSY for those CPUs. If shutting off, that does not matter much anyway. If suspending, we make sure that the CPUs remain unassigned when resuming. While there, take the chance to: - fix the doc comment of cpupool_cpu_remove() (it was wrong); - improve comments in general around and in cpupool_cpu_remove() and cpupool_cpu_add(); - add a couple of ASSERT()-s for checking consistency. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Tested-by: Juergen Gross master commit: 7ff6f1fc39ebf2fa939d78a6ca3f883adff04bc9 master date: 2015-05-13 15:08:30 +0200 --- xen/common/cpupool.c | 82 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index dd35fdc..f089d24 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -452,14 +452,16 @@ void cpupool_rm_domain(struct domain *d) } /* - * called to add a new cpu to pool admin - * we add a hotplugged cpu to the cpupool0 to be able to add it to dom0, - * unless we are resuming from S3, in which case we put the cpu back - * in the cpupool it was in prior to suspend. + * Called to add a cpu to a pool. CPUs being hot-plugged are added to pool0, + * as they must have been in there when unplugged. + * + * If, on the other hand, we are adding CPUs because we are resuming (e.g., + * after ACPI S3) we put the cpu back in the pool where it was in prior when + * we suspended. */ static int cpupool_cpu_add(unsigned int cpu) { - int ret = -EINVAL; + int ret = 0; spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); @@ -477,12 +479,28 @@ static int cpupool_cpu_add(unsigned int cpu) if ( ret ) goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); + break; } } - } - if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) + /* + * Either cpu has been found as suspended in a pool, and added back + * there, or it stayed free (if it did not belong to any pool when + * suspending), and we don't want to do anything. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_valid)); + } + else + { + /* + * If we are not resuming, we are hot-plugging cpu, and in which case + * we add it to pool0, as it certainly was there when hot-unplagged + * (or unplugging would have failed) and that is the default behavior + * anyway. + */ ret = cpupool_assign_cpu_locked(cpupool0, cpu); + } out: spin_unlock(&cpupool_lock); @@ -490,29 +508,52 @@ static int cpupool_cpu_add(unsigned int cpu) } /* - * called to remove a cpu from pool admin - * the cpu to be removed is locked to avoid removing it from dom0 - * returns failure if not in pool0 + * Called to remove a CPU from a pool. The CPU is locked, to forbid removing + * it from pool0. In fact, if we want to hot-unplug a CPU, it must belong to + * pool0, or we fail. + * + * However, if we are suspending (e.g., to ACPI S3), we mark the CPU in such + * a way that it can be put back in its pool when resuming. */ static int cpupool_cpu_remove(unsigned int cpu) { int ret = -EBUSY; - struct cpupool **c; spin_lock(&cpupool_lock); - if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) - ret = 0; - else + if ( system_state == SYS_STATE_suspend ) { + struct cpupool **c; + for_each_cpupool(c) { - if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) { - ret = 0; + cpumask_set_cpu(cpu, (*c)->cpu_suspended); break; } } + + /* + * Either we found cpu in a pool, or it must be free (if it has been + * hot-unplagged, then we must have found it in pool0). It is, of + * course, fine to suspend or shutdown with CPUs not assigned to a + * pool, and (in case of suspend) they will stay free when resuming. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_suspended)); + ASSERT(cpumask_test_cpu(cpu, &cpu_online_map) || + cpumask_test_cpu(cpu, cpupool0->cpu_suspended)); + ret = 0; + } + else if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + { + /* + * If we are not suspending, we are hot-unplugging cpu, and that is + * allowed only for CPUs in pool0. + */ + ret = 0; } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); @@ -697,15 +738,6 @@ static int cpu_callback( unsigned int cpu = (unsigned long)hcpu; int rc = 0; - if ( system_state == SYS_STATE_suspend ) - { - struct cpupool **c; - - for_each_cpupool(c) - if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) - cpumask_set_cpu(cpu, (*c)->cpu_suspended); - } - switch ( action ) { case CPU_DOWN_FAILED: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oW9-0004Nn-Te; Tue, 30 Jun 2015 05:55:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oW9-0004NW-19 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:37 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 5F/2E-03035-65F22955; Tue, 30 Jun 2015 05:55:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435643732!21105105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20511 invoked from network); 30 Jun 2015 05:55:33 -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; 30 Jun 2015 05:55:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oW3-0005AZ-T1 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oW3-0002RN-Jc for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:31 +0000 Date: Tue, 30 Jun 2015 05:55:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/EFI: keep EFI runtime services top level page tables up-to-date X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34b61e901f620e43b7638803cc8f25d53c7d1040 Author: Jan Beulich AuthorDate: Thu Jun 18 09:19:23 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:19:23 2015 +0200 x86/EFI: keep EFI runtime services top level page tables up-to-date Updates to idle_pg_table[] need to be mirrored into the page tables used for invoking EFI runtime services. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: db83975f0fcd30370392ed288a7bd2420624ed4e master date: 2015-05-19 11:39:09 +0200 --- xen/arch/x86/efi/runtime.c | 7 +++++++ xen/arch/x86/efi/stub.c | 3 +++ xen/arch/x86/mm.c | 5 ++++- xen/include/asm-x86/page.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 7fd7431..441ec90 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -4,6 +4,7 @@ #include #include #include +#include #include DEFINE_XEN_GUEST_HANDLE(CHAR16); @@ -45,6 +46,12 @@ l4_pgentry_t *__read_mostly efi_l4_pgtable; const struct efi_pci_rom *__read_mostly efi_pci_roms; +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) +{ + if ( efi_l4_pgtable ) + l4e_write(efi_l4_pgtable + l4idx, l4e); +} + unsigned long efi_rs_enter(void) { static const u16 fcw = FCW_DEFAULT; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index b8f49f8..627009f 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef efi_enabled const bool_t efi_enabled = 0; @@ -9,6 +10,8 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } + paddr_t efi_rs_page_table(void) { BUG(); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 088ce35..68cc33b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5286,7 +5286,10 @@ static l3_pgentry_t *virt_to_xen_l3e(unsigned long v) spin_lock(&map_pgdir_lock); if ( !(l4e_get_flags(*pl4e) & _PAGE_PRESENT) ) { - l4e_write(pl4e, l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR)); + l4_pgentry_t l4e = l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR); + + l4e_write(pl4e, l4e); + efi_update_l4_pgtable(l4_table_offset(v), l4e); pl3e = NULL; } if ( locking ) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index ccc268d..91e9e92 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -286,6 +286,7 @@ extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */ #define _PAGE_NONE _AC(0x000,U) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oW9-0004Nn-Te; Tue, 30 Jun 2015 05:55:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oW9-0004NW-19 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:37 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 5F/2E-03035-65F22955; Tue, 30 Jun 2015 05:55:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1435643732!21105105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20511 invoked from network); 30 Jun 2015 05:55:33 -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; 30 Jun 2015 05:55:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oW3-0005AZ-T1 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oW3-0002RN-Jc for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:31 +0000 Date: Tue, 30 Jun 2015 05:55:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/EFI: keep EFI runtime services top level page tables up-to-date X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34b61e901f620e43b7638803cc8f25d53c7d1040 Author: Jan Beulich AuthorDate: Thu Jun 18 09:19:23 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:19:23 2015 +0200 x86/EFI: keep EFI runtime services top level page tables up-to-date Updates to idle_pg_table[] need to be mirrored into the page tables used for invoking EFI runtime services. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: db83975f0fcd30370392ed288a7bd2420624ed4e master date: 2015-05-19 11:39:09 +0200 --- xen/arch/x86/efi/runtime.c | 7 +++++++ xen/arch/x86/efi/stub.c | 3 +++ xen/arch/x86/mm.c | 5 ++++- xen/include/asm-x86/page.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 7fd7431..441ec90 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -4,6 +4,7 @@ #include #include #include +#include #include DEFINE_XEN_GUEST_HANDLE(CHAR16); @@ -45,6 +46,12 @@ l4_pgentry_t *__read_mostly efi_l4_pgtable; const struct efi_pci_rom *__read_mostly efi_pci_roms; +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) +{ + if ( efi_l4_pgtable ) + l4e_write(efi_l4_pgtable + l4idx, l4e); +} + unsigned long efi_rs_enter(void) { static const u16 fcw = FCW_DEFAULT; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index b8f49f8..627009f 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef efi_enabled const bool_t efi_enabled = 0; @@ -9,6 +10,8 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } + paddr_t efi_rs_page_table(void) { BUG(); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 088ce35..68cc33b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5286,7 +5286,10 @@ static l3_pgentry_t *virt_to_xen_l3e(unsigned long v) spin_lock(&map_pgdir_lock); if ( !(l4e_get_flags(*pl4e) & _PAGE_PRESENT) ) { - l4e_write(pl4e, l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR)); + l4_pgentry_t l4e = l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR); + + l4e_write(pl4e, l4e); + efi_update_l4_pgtable(l4_table_offset(v), l4e); pl3e = NULL; } if ( locking ) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index ccc268d..91e9e92 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -286,6 +286,7 @@ extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */ #define _PAGE_NONE _AC(0x000,U) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oWI-0004PD-W9; Tue, 30 Jun 2015 05:55:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWH-0004Ov-NP for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:45 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id AA/AD-03371-16F22955; Tue, 30 Jun 2015 05:55:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1435643743!27826967!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20675 invoked from network); 30 Jun 2015 05:55:44 -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; 30 Jun 2015 05:55:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWF-0005Ak-5I for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWE-0002Rm-Aa for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:42 +0000 Date: Tue, 30 Jun 2015 05:55:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't unconditionally touch the hvm_domain union during domain construction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2691b20668f039c091dcec9828d904cfcc812ab6 Author: Andrew Cooper AuthorDate: Thu Jun 18 09:19:53 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:19:53 2015 +0200 x86: don't unconditionally touch the hvm_domain union during domain construction It may not be the appropriate half to touch. Drop the superfluous mem_sharing_enabled assignment, and move the hap_enabled assignment to a suitable conditional before it is actually needed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 74d0932448245cc4776d50811ceb80365623893c master date: 2015-05-20 13:25:12 +0200 --- xen/arch/x86/domain.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8a276f9..062cff0 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -492,12 +492,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) int i, paging_initialised = 0; int rc = -ENOMEM; - d->arch.hvm_domain.hap_enabled = - has_hvm_container_domain(d) && - hvm_funcs.hap_supported && - (domcr_flags & DOMCRF_hap); - d->arch.hvm_domain.mem_sharing_enabled = 0; - d->arch.s3_integrity = !!(domcr_flags & DOMCRF_s3_integrity); INIT_LIST_HEAD(&d->arch.pdev_list); @@ -520,7 +514,12 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) } if ( has_hvm_container_domain(d) ) + { + d->arch.hvm_domain.hap_enabled = + hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + } else if ( is_idle_domain(d) ) rc = 0; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oWI-0004PD-W9; Tue, 30 Jun 2015 05:55:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWH-0004Ov-NP for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:45 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id AA/AD-03371-16F22955; Tue, 30 Jun 2015 05:55:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1435643743!27826967!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20675 invoked from network); 30 Jun 2015 05:55:44 -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; 30 Jun 2015 05:55:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWF-0005Ak-5I for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWE-0002Rm-Aa for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:42 +0000 Date: Tue, 30 Jun 2015 05:55:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't unconditionally touch the hvm_domain union during domain construction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2691b20668f039c091dcec9828d904cfcc812ab6 Author: Andrew Cooper AuthorDate: Thu Jun 18 09:19:53 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:19:53 2015 +0200 x86: don't unconditionally touch the hvm_domain union during domain construction It may not be the appropriate half to touch. Drop the superfluous mem_sharing_enabled assignment, and move the hap_enabled assignment to a suitable conditional before it is actually needed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 74d0932448245cc4776d50811ceb80365623893c master date: 2015-05-20 13:25:12 +0200 --- xen/arch/x86/domain.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8a276f9..062cff0 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -492,12 +492,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) int i, paging_initialised = 0; int rc = -ENOMEM; - d->arch.hvm_domain.hap_enabled = - has_hvm_container_domain(d) && - hvm_funcs.hap_supported && - (domcr_flags & DOMCRF_hap); - d->arch.hvm_domain.mem_sharing_enabled = 0; - d->arch.s3_integrity = !!(domcr_flags & DOMCRF_s3_integrity); INIT_LIST_HEAD(&d->arch.pdev_list); @@ -520,7 +514,12 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) } if ( has_hvm_container_domain(d) ) + { + d->arch.hvm_domain.hap_enabled = + hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + } else if ( is_idle_domain(d) ) rc = 0; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oWS-0004Qi-2U; Tue, 30 Jun 2015 05:55:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWR-0004QX-FA for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:55 +0000 Content-Length: 2061 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 26/A0-08244-A6F22955; Tue, 30 Jun 2015 05:55:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435643753!17750812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8277 invoked from network); 30 Jun 2015 05:55:54 -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; 30 Jun 2015 05:55:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWP-0005Aw-Ap for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWP-0002S8-91 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:53 +0000 Date: Tue, 30 Jun 2015 05:55:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/pvh: disable posted interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5537229699144700959==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5537229699144700959== Content-Length: 1647 Content-Transfer-Encoding: quoted-printable commit 7140a69485e867e9914b0fc5a2f3fa57110f8533 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 09:28:02 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:28:02 2015 +0200 x86/pvh: disable posted interrupts Enabling posted interrupts requires the virtual interrupt delivery feature, which is disabled for PVH guests, so make sure posted interrupts are also disabled or else vmlaunch will fail. Signed-off-by: Roger Pau Monn=C3=A9 Reported-and-Tested-by: Lars Eggert Acked-by: Kevin Tian master commit: cf6b3ccf28faee01a078311fcfe671148c81ea75 master date: 2015-05-28 10:56:08 +0200 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index ee1f4d5..4a97563 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -909,6 +909,10 @@ static int construct_vmcs(struct vcpu *v) | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); v->arch.hvm_vmx.exec_control &=3D ~CPU_BASED_TPR_SHADOW; + /* In turn, disable posted interrupts. */ + __vmwrite(PIN_BASED_VM_EXEC_CONTROL, + vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============5537229699144700959== 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 --===============5537229699144700959==-- From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:55:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:55: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 1Z9oWS-0004Qi-2U; Tue, 30 Jun 2015 05:55:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWR-0004QX-FA for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:55 +0000 Content-Length: 2061 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 26/A0-08244-A6F22955; Tue, 30 Jun 2015 05:55:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1435643753!17750812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8277 invoked from network); 30 Jun 2015 05:55:54 -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; 30 Jun 2015 05:55:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWP-0005Aw-Ap for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWP-0002S8-91 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:55:53 +0000 Date: Tue, 30 Jun 2015 05:55:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/pvh: disable posted interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5537229699144700959==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5537229699144700959== Content-Length: 1647 Content-Transfer-Encoding: quoted-printable commit 7140a69485e867e9914b0fc5a2f3fa57110f8533 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 09:28:02 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:28:02 2015 +0200 x86/pvh: disable posted interrupts Enabling posted interrupts requires the virtual interrupt delivery feature, which is disabled for PVH guests, so make sure posted interrupts are also disabled or else vmlaunch will fail. Signed-off-by: Roger Pau Monn=C3=A9 Reported-and-Tested-by: Lars Eggert Acked-by: Kevin Tian master commit: cf6b3ccf28faee01a078311fcfe671148c81ea75 master date: 2015-05-28 10:56:08 +0200 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index ee1f4d5..4a97563 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -909,6 +909,10 @@ static int construct_vmcs(struct vcpu *v) | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); v->arch.hvm_vmx.exec_control &=3D ~CPU_BASED_TPR_SHADOW; + /* In turn, disable posted interrupts. */ + __vmwrite(PIN_BASED_VM_EXEC_CONTROL, + vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============5537229699144700959== 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 --===============5537229699144700959==-- From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oWd-0004ST-5K; Tue, 30 Jun 2015 05:56:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWc-0004SH-7B for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:06 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 5A/BE-30658-57F22955; Tue, 30 Jun 2015 05:56:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435643763!27739811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16231 invoked from network); 30 Jun 2015 05:56: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; 30 Jun 2015 05:56:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWZ-0005BW-IE for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWZ-0002Sk-Ee for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:03 +0000 Date: Tue, 30 Jun 2015 05:56:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't crash when mapping a page using EFI runtime 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 c76aeb51249fcce1a524d4102b71812744112645 Author: Ross Lagerwall AuthorDate: Thu Jun 18 09:28:37 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:28:37 2015 +0200 x86: don't crash when mapping a page using EFI runtime page tables When an interrupt is received during an EFI runtime service call, Xen may call map_domain_page() while using the EFI runtime page tables. This fails because, although the EFI runtime page tables are a copy of the idle domain's page tables, current points at a different domain's vCPU. To fix this, return NULL from mapcache_current_vcpu() when using the EFI runtime page tables which is treated equivalently to running in an idle vCPU. This issue can be reproduced by repeatedly calling GetVariable() from dom0 while using VT-d, since VT-d frequently maps a page from interrupt context. Example call trace: [] __find_next_zero_bit+0x28/0x60 [] map_domain_page+0x4c6/0x4eb [] map_vtd_domain_page+0xd/0xf [] msi_msg_read_remap_rte+0xe3/0x1d8 [] iommu_read_msi_from_ire+0x31/0x34 [] set_msi_affinity+0x134/0x17a [] move_masked_irq+0x5c/0x98 [] move_native_irq+0x25/0x36 [] ack_nonmaskable_msi_irq+0x19/0x20 [] ack_maskable_msi_irq+0x9/0x37 [] do_IRQ+0x251/0x635 [] common_interrupt+0x62/0x70 [<00000000df7ed2be>] 00000000df7ed2be Signed-off-by: Ross Lagerwall master commit: 591e1e357c29589e9d6121d8faadc4f4d3b9013e master date: 2015-06-01 11:59:14 +0200 --- xen/arch/x86/domain_page.c | 13 +++++++++---- xen/arch/x86/efi/runtime.c | 10 ++++++++-- xen/arch/x86/efi/stub.c | 2 +- xen/include/xen/efi.h | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 158a164..9bdab61 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -32,20 +32,25 @@ static inline struct vcpu *mapcache_current_vcpu(void) return NULL; /* + * When using efi runtime page tables, we have the equivalent of the idle + * domain's page tables but current may point at another domain's VCPU. + * Return NULL as though current is not properly set up yet. + */ + if ( efi_enabled && efi_rs_using_pgtables() ) + return NULL; + + /* * If guest_table is NULL, and we are running a paravirtualised guest, * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { - unsigned long cr3; - /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || - (efi_enabled && cr3 == efi_rs_page_table())); + ASSERT(read_cr3() == __pa(idle_pg_table)); } return v; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 441ec90..fe851d9 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -26,6 +26,7 @@ const CHAR16 *__read_mostly efi_fw_vendor; EFI_RUNTIME_SERVICES *__read_mostly efi_rs; static DEFINE_SPINLOCK(efi_rs_lock); +static unsigned int efi_rs_on_cpu = NR_CPUS; UINTN __read_mostly efi_memmap_size; UINTN __read_mostly efi_mdesc_size; @@ -67,6 +68,8 @@ unsigned long efi_rs_enter(void) spin_lock(&efi_rs_lock); + efi_rs_on_cpu = smp_processor_id(); + /* prevent fixup_page_fault() from doing anything */ irq_enter(); @@ -101,13 +104,16 @@ void efi_rs_leave(unsigned long cr3) asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } irq_exit(); + efi_rs_on_cpu = NR_CPUS; spin_unlock(&efi_rs_lock); stts(); } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { - return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; + return efi_l4_pgtable && + (smp_processor_id() == efi_rs_on_cpu) && + (read_cr3() == virt_to_maddr(efi_l4_pgtable)); } unsigned long efi_get_time(void) diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 627009f..07c2bd0 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -12,7 +12,7 @@ void __init efi_init_memory(void) { } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { BUG(); return 0; diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 5e02724..f2782ce 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,7 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); -paddr_t efi_rs_page_table(void); +bool_t efi_rs_using_pgtables(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oWd-0004ST-5K; Tue, 30 Jun 2015 05:56:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWc-0004SH-7B for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:06 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 5A/BE-30658-57F22955; Tue, 30 Jun 2015 05:56:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1435643763!27739811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16231 invoked from network); 30 Jun 2015 05:56: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; 30 Jun 2015 05:56:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWZ-0005BW-IE for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWZ-0002Sk-Ee for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:03 +0000 Date: Tue, 30 Jun 2015 05:56:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't crash when mapping a page using EFI runtime 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 c76aeb51249fcce1a524d4102b71812744112645 Author: Ross Lagerwall AuthorDate: Thu Jun 18 09:28:37 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:28:37 2015 +0200 x86: don't crash when mapping a page using EFI runtime page tables When an interrupt is received during an EFI runtime service call, Xen may call map_domain_page() while using the EFI runtime page tables. This fails because, although the EFI runtime page tables are a copy of the idle domain's page tables, current points at a different domain's vCPU. To fix this, return NULL from mapcache_current_vcpu() when using the EFI runtime page tables which is treated equivalently to running in an idle vCPU. This issue can be reproduced by repeatedly calling GetVariable() from dom0 while using VT-d, since VT-d frequently maps a page from interrupt context. Example call trace: [] __find_next_zero_bit+0x28/0x60 [] map_domain_page+0x4c6/0x4eb [] map_vtd_domain_page+0xd/0xf [] msi_msg_read_remap_rte+0xe3/0x1d8 [] iommu_read_msi_from_ire+0x31/0x34 [] set_msi_affinity+0x134/0x17a [] move_masked_irq+0x5c/0x98 [] move_native_irq+0x25/0x36 [] ack_nonmaskable_msi_irq+0x19/0x20 [] ack_maskable_msi_irq+0x9/0x37 [] do_IRQ+0x251/0x635 [] common_interrupt+0x62/0x70 [<00000000df7ed2be>] 00000000df7ed2be Signed-off-by: Ross Lagerwall master commit: 591e1e357c29589e9d6121d8faadc4f4d3b9013e master date: 2015-06-01 11:59:14 +0200 --- xen/arch/x86/domain_page.c | 13 +++++++++---- xen/arch/x86/efi/runtime.c | 10 ++++++++-- xen/arch/x86/efi/stub.c | 2 +- xen/include/xen/efi.h | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 158a164..9bdab61 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -32,20 +32,25 @@ static inline struct vcpu *mapcache_current_vcpu(void) return NULL; /* + * When using efi runtime page tables, we have the equivalent of the idle + * domain's page tables but current may point at another domain's VCPU. + * Return NULL as though current is not properly set up yet. + */ + if ( efi_enabled && efi_rs_using_pgtables() ) + return NULL; + + /* * If guest_table is NULL, and we are running a paravirtualised guest, * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { - unsigned long cr3; - /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || - (efi_enabled && cr3 == efi_rs_page_table())); + ASSERT(read_cr3() == __pa(idle_pg_table)); } return v; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 441ec90..fe851d9 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -26,6 +26,7 @@ const CHAR16 *__read_mostly efi_fw_vendor; EFI_RUNTIME_SERVICES *__read_mostly efi_rs; static DEFINE_SPINLOCK(efi_rs_lock); +static unsigned int efi_rs_on_cpu = NR_CPUS; UINTN __read_mostly efi_memmap_size; UINTN __read_mostly efi_mdesc_size; @@ -67,6 +68,8 @@ unsigned long efi_rs_enter(void) spin_lock(&efi_rs_lock); + efi_rs_on_cpu = smp_processor_id(); + /* prevent fixup_page_fault() from doing anything */ irq_enter(); @@ -101,13 +104,16 @@ void efi_rs_leave(unsigned long cr3) asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); } irq_exit(); + efi_rs_on_cpu = NR_CPUS; spin_unlock(&efi_rs_lock); stts(); } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { - return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; + return efi_l4_pgtable && + (smp_processor_id() == efi_rs_on_cpu) && + (read_cr3() == virt_to_maddr(efi_l4_pgtable)); } unsigned long efi_get_time(void) diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 627009f..07c2bd0 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -12,7 +12,7 @@ void __init efi_init_memory(void) { } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } -paddr_t efi_rs_page_table(void) +bool_t efi_rs_using_pgtables(void) { BUG(); return 0; diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 5e02724..f2782ce 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,7 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); -paddr_t efi_rs_page_table(void); +bool_t efi_rs_using_pgtables(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oWn-0004UE-AZ; Tue, 30 Jun 2015 05:56:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWm-0004U1-4J for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:16 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 67/ED-25925-F7F22955; Tue, 30 Jun 2015 05:56:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1435643773!17799601!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7442 invoked from network); 30 Jun 2015 05:56:14 -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; 30 Jun 2015 05:56:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWj-0005Be-NH for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWj-0002T8-M4 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:13 +0000 Date: Tue, 30 Jun 2015 05:56:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] efi: fix allocation problems if ExitBootServices() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ed66bfdd16a96325955ccdd962248aeec107d8c Author: Ross Lagerwall AuthorDate: Thu Jun 18 09:32:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:32:40 2015 +0200 efi: fix allocation problems if ExitBootServices() fails If calling ExitBootServices() fails, the required memory map size may have increased. When initially allocating the memory map, allocate a slightly larger buffer (by an arbitrary 8 entries) to fix this. The ARM code path was already allocating a larger buffer than required, so this moves the code to be common for all architectures. This was seen on the following machine when using the iscsidxe UEFI driver. The machine would consistently fail the first call to ExitBootServices(). System Information Manufacturer: Supermicro Product Name: X10SLE-F/HF BIOS Information Vendor: American Megatrends Inc. Version: 2.00 Release Date: 04/24/2014 Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich Reviewed-by: Roy Franz Acked-by: Ian Campbell EFI: map allocation size must be set to zero Commit 8a753b3f1c ("efi: fix allocation problems if ExitBootServices() fails") replaced the use of a static (and hence zero-initialized) variable by an automatic (and hence uninitialized) one. Also drop the variable introduced by that commit in favor of re-using another available and suitable one. Signed-off-by: Jan Beulich Acked-by: Ross Lagerwall Acked-by: Ian Campbell master commit: 8a753b3f1cf5e4714974196df9517849bf174324 master date: 2015-06-02 13:44:24 +0200 master commit: 4c94684bb7c20ff01d03fb1f22c03cc0c2fc417b master date: 2015-06-11 14:47:54 +0200 --- xen/arch/x86/efi/boot.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index de240f8..598cf76 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1379,9 +1379,11 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) } } - status = efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key, - &efi_mdesc_size, &mdesc_ver); - mbi.mem_upper -= efi_memmap_size; + info_size = 0; + efi_bs->GetMemoryMap(&info_size, NULL, &map_key, + &efi_mdesc_size, &mdesc_ver); + info_size += 8 * efi_mdesc_size; + mbi.mem_upper -= info_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) blexit(L"Out of static memory"); @@ -1390,6 +1392,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { struct e820entry *e; + efi_memmap_size = info_size; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(status) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oWn-0004UE-AZ; Tue, 30 Jun 2015 05:56:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWm-0004U1-4J for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:16 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 67/ED-25925-F7F22955; Tue, 30 Jun 2015 05:56:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1435643773!17799601!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7442 invoked from network); 30 Jun 2015 05:56:14 -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; 30 Jun 2015 05:56:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWj-0005Be-NH for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWj-0002T8-M4 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:13 +0000 Date: Tue, 30 Jun 2015 05:56:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] efi: fix allocation problems if ExitBootServices() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ed66bfdd16a96325955ccdd962248aeec107d8c Author: Ross Lagerwall AuthorDate: Thu Jun 18 09:32:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:32:40 2015 +0200 efi: fix allocation problems if ExitBootServices() fails If calling ExitBootServices() fails, the required memory map size may have increased. When initially allocating the memory map, allocate a slightly larger buffer (by an arbitrary 8 entries) to fix this. The ARM code path was already allocating a larger buffer than required, so this moves the code to be common for all architectures. This was seen on the following machine when using the iscsidxe UEFI driver. The machine would consistently fail the first call to ExitBootServices(). System Information Manufacturer: Supermicro Product Name: X10SLE-F/HF BIOS Information Vendor: American Megatrends Inc. Version: 2.00 Release Date: 04/24/2014 Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich Reviewed-by: Roy Franz Acked-by: Ian Campbell EFI: map allocation size must be set to zero Commit 8a753b3f1c ("efi: fix allocation problems if ExitBootServices() fails") replaced the use of a static (and hence zero-initialized) variable by an automatic (and hence uninitialized) one. Also drop the variable introduced by that commit in favor of re-using another available and suitable one. Signed-off-by: Jan Beulich Acked-by: Ross Lagerwall Acked-by: Ian Campbell master commit: 8a753b3f1cf5e4714974196df9517849bf174324 master date: 2015-06-02 13:44:24 +0200 master commit: 4c94684bb7c20ff01d03fb1f22c03cc0c2fc417b master date: 2015-06-11 14:47:54 +0200 --- xen/arch/x86/efi/boot.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index de240f8..598cf76 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1379,9 +1379,11 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) } } - status = efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key, - &efi_mdesc_size, &mdesc_ver); - mbi.mem_upper -= efi_memmap_size; + info_size = 0; + efi_bs->GetMemoryMap(&info_size, NULL, &map_key, + &efi_mdesc_size, &mdesc_ver); + info_size += 8 * efi_mdesc_size; + mbi.mem_upper -= info_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) blexit(L"Out of static memory"); @@ -1390,6 +1392,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { struct e820entry *e; + efi_memmap_size = info_size; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(status) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oWx-0004WU-D5; Tue, 30 Jun 2015 05:56:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWw-0004WG-8W for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:26 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 72/8D-31258-98F22955; Tue, 30 Jun 2015 05:56:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1435643784!27834939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2568 invoked from network); 30 Jun 2015 05:56:24 -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; 30 Jun 2015 05:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWt-0005Bm-Tp for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWt-0002Ta-So for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:23 +0000 Date: Tue, 30 Jun 2015 05:56:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/apic: Disable the LAPIC later in smp_send_stop() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab1cc71fa279ef157f08aaea2ac993886accd881 Author: Andrew Cooper AuthorDate: Thu Jun 18 09:33:51 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:33:51 2015 +0200 x86/apic: Disable the LAPIC later in smp_send_stop() __stop_this_cpu() may reset the LAPIC mode back from x2apic to xapic, but will leave x2apic_enabled alone. This may cause disconnect_bsp_APIC() in disable_IO_APIC() to suffer a #GP fault. Disabling the LAPIC can safely be deferred to being the last action. Signed-off-by: Andrew Cooper master commit: d639bdd9bbed8d003ad9be0b13535aca636b9d18 master date: 2015-06-03 09:25:43 +0200 --- xen/arch/x86/smp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 0433f30..e828aca 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -321,9 +321,9 @@ void smp_send_stop(void) mdelay(1); local_irq_disable(); - __stop_this_cpu(); disable_IO_APIC(); hpet_disable(); + __stop_this_cpu(); local_irq_enable(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oWx-0004WU-D5; Tue, 30 Jun 2015 05:56:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWw-0004WG-8W for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:26 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 72/8D-31258-98F22955; Tue, 30 Jun 2015 05:56:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1435643784!27834939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2568 invoked from network); 30 Jun 2015 05:56:24 -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; 30 Jun 2015 05:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oWt-0005Bm-Tp for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oWt-0002Ta-So for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:23 +0000 Date: Tue, 30 Jun 2015 05:56:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/apic: Disable the LAPIC later in smp_send_stop() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab1cc71fa279ef157f08aaea2ac993886accd881 Author: Andrew Cooper AuthorDate: Thu Jun 18 09:33:51 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:33:51 2015 +0200 x86/apic: Disable the LAPIC later in smp_send_stop() __stop_this_cpu() may reset the LAPIC mode back from x2apic to xapic, but will leave x2apic_enabled alone. This may cause disconnect_bsp_APIC() in disable_IO_APIC() to suffer a #GP fault. Disabling the LAPIC can safely be deferred to being the last action. Signed-off-by: Andrew Cooper master commit: d639bdd9bbed8d003ad9be0b13535aca636b9d18 master date: 2015-06-03 09:25:43 +0200 --- xen/arch/x86/smp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 0433f30..e828aca 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -321,9 +321,9 @@ void smp_send_stop(void) mdelay(1); local_irq_disable(); - __stop_this_cpu(); disable_IO_APIC(); hpet_disable(); + __stop_this_cpu(); local_irq_enable(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oX7-0004Xy-Fh; Tue, 30 Jun 2015 05:56:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oX6-0004Xj-H9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:36 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id C9/53-18676-39F22955; Tue, 30 Jun 2015 05:56:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1435643794!27807105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12149 invoked from network); 30 Jun 2015 05:56: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; 30 Jun 2015 05:56:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oX4-0005Bw-79 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oX4-0002Uj-0z for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:34 +0000 Date: Tue, 30 Jun 2015 05:56:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/crash: don't use set_fixmap() in the crash path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d568854ab62c2c6c251646074c6a49a84a06f89c Author: Andrew Cooper AuthorDate: Thu Jun 18 09:34:11 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:34:11 2015 +0200 x86/crash: don't use set_fixmap() in the crash path Experimentally, this can result in memory allocation, and in particular a failed assertion that interrupts are enabled when performing a TLB flush. (XEN) Assertion 'local_irq_is_enabled()' failed at smp.c:223 (XEN) [] flush_area_mask+0x7/0x134 (XEN) [] alloc_domheap_pages+0xa9/0x12a (XEN) [] alloc_xenheap_pages+0x64/0xdb (XEN) [] alloc_xen_pagetable+0x1c/0xa0 (XEN) [] virt_to_xen_l1e+0x38/0x1be (XEN) [] map_pages_to_xen+0x80e/0xfd9 (XEN) [] __set_fixmap+0x2c/0x2e (XEN) [] machine_crash_shutdown+0x186/0x2b2 (XEN) [] kexec_crash+0x3f/0x5b (XEN) [] panic+0x100/0x118 (XEN) [] set_guest_machinecheck_trapbounce+0/0x6d (XEN) [] do_page_fault+0x40b/0x541 (XEN) [] handle_exception_saved+0x2e/0x6c Instead, use the directmap mapping which are writable and involve far less complexity than set_fixmap() Signed-off-by: Andrew Cooper master commit: 8228055568ef195df5e0c205972a4a4c278e186b master date: 2015-06-03 09:26:13 +0200 --- xen/arch/x86/crash.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 3d03bc1..c5332a5 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -137,13 +137,10 @@ static void nmi_shootdown_cpus(void) * Ideally would be: * exception_table[TRAP_nmi] = &do_nmi_crash; * - * but the exception_table is read only. Borrow an unused fixmap entry - * to construct a writable mapping. + * but the exception_table is read only. Access it via its directmap + * mappings. */ - set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); - write_atomic((unsigned long *) - (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + - ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + write_atomic((unsigned long *)__va(__pa(&exception_table[TRAP_nmi])), (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oX7-0004Xy-Fh; Tue, 30 Jun 2015 05:56:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oX6-0004Xj-H9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:36 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id C9/53-18676-39F22955; Tue, 30 Jun 2015 05:56:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1435643794!27807105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12149 invoked from network); 30 Jun 2015 05:56: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; 30 Jun 2015 05:56:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oX4-0005Bw-79 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oX4-0002Uj-0z for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:34 +0000 Date: Tue, 30 Jun 2015 05:56:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/crash: don't use set_fixmap() in the crash path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d568854ab62c2c6c251646074c6a49a84a06f89c Author: Andrew Cooper AuthorDate: Thu Jun 18 09:34:11 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:34:11 2015 +0200 x86/crash: don't use set_fixmap() in the crash path Experimentally, this can result in memory allocation, and in particular a failed assertion that interrupts are enabled when performing a TLB flush. (XEN) Assertion 'local_irq_is_enabled()' failed at smp.c:223 (XEN) [] flush_area_mask+0x7/0x134 (XEN) [] alloc_domheap_pages+0xa9/0x12a (XEN) [] alloc_xenheap_pages+0x64/0xdb (XEN) [] alloc_xen_pagetable+0x1c/0xa0 (XEN) [] virt_to_xen_l1e+0x38/0x1be (XEN) [] map_pages_to_xen+0x80e/0xfd9 (XEN) [] __set_fixmap+0x2c/0x2e (XEN) [] machine_crash_shutdown+0x186/0x2b2 (XEN) [] kexec_crash+0x3f/0x5b (XEN) [] panic+0x100/0x118 (XEN) [] set_guest_machinecheck_trapbounce+0/0x6d (XEN) [] do_page_fault+0x40b/0x541 (XEN) [] handle_exception_saved+0x2e/0x6c Instead, use the directmap mapping which are writable and involve far less complexity than set_fixmap() Signed-off-by: Andrew Cooper master commit: 8228055568ef195df5e0c205972a4a4c278e186b master date: 2015-06-03 09:26:13 +0200 --- xen/arch/x86/crash.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 3d03bc1..c5332a5 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -137,13 +137,10 @@ static void nmi_shootdown_cpus(void) * Ideally would be: * exception_table[TRAP_nmi] = &do_nmi_crash; * - * but the exception_table is read only. Borrow an unused fixmap entry - * to construct a writable mapping. + * but the exception_table is read only. Access it via its directmap + * mappings. */ - set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); - write_atomic((unsigned long *) - (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + - ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + write_atomic((unsigned long *)__va(__pa(&exception_table[TRAP_nmi])), (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oXI-0004Zu-I9; Tue, 30 Jun 2015 05:56:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXH-0004Zm-H7 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:47 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 09/73-18676-E9F22955; Tue, 30 Jun 2015 05:56:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435643804!16397242!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27645 invoked from network); 30 Jun 2015 05:56:45 -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; 30 Jun 2015 05:56:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXE-0005C4-MZ for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXE-0002V5-KA for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:44 +0000 Date: Tue, 30 Jun 2015 05:56:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/VPMU: add lost Intel processor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd98a75a32cd22fa3fda88bc391865e38023fc61 Author: Alan Robinson AuthorDate: Thu Jun 18 09:34:59 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:34:59 2015 +0200 x86/VPMU: add lost Intel processor commit 6d112f2b50 ("x86/vPMU: change Intel model numbers from decimal to hex") translated 47 to 0x27, now corrected to 0x2f. Signed-off-by: Alan Robinson Signed-off-by: Dietmar Hahn Reviewed-by: Jan Beulich master commit: 0fcc6f3c2f7bc57d8ea7f263274296929f5162ef master date: 2015-06-08 14:17:06 +0200 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 833d710..cdea71e 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -904,7 +904,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* Westmere: */ case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x27: /* 32 nm Westmere-EX */ + case 0x2f: /* 32 nm Westmere-EX */ case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oXI-0004Zu-I9; Tue, 30 Jun 2015 05:56:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXH-0004Zm-H7 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:47 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 09/73-18676-E9F22955; Tue, 30 Jun 2015 05:56:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435643804!16397242!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27645 invoked from network); 30 Jun 2015 05:56:45 -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; 30 Jun 2015 05:56:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXE-0005C4-MZ for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXE-0002V5-KA for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:44 +0000 Date: Tue, 30 Jun 2015 05:56:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/VPMU: add lost Intel processor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd98a75a32cd22fa3fda88bc391865e38023fc61 Author: Alan Robinson AuthorDate: Thu Jun 18 09:34:59 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:34:59 2015 +0200 x86/VPMU: add lost Intel processor commit 6d112f2b50 ("x86/vPMU: change Intel model numbers from decimal to hex") translated 47 to 0x27, now corrected to 0x2f. Signed-off-by: Alan Robinson Signed-off-by: Dietmar Hahn Reviewed-by: Jan Beulich master commit: 0fcc6f3c2f7bc57d8ea7f263274296929f5162ef master date: 2015-06-08 14:17:06 +0200 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 833d710..cdea71e 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -904,7 +904,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) /* Westmere: */ case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x27: /* 32 nm Westmere-EX */ + case 0x2f: /* 32 nm Westmere-EX */ case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oXT-0004bI-Kf; Tue, 30 Jun 2015 05:56:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXR-0004b5-Q9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:57 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F1/93-01068-9AF22955; Tue, 30 Jun 2015 05:56:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435643815!20925369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13297 invoked from network); 30 Jun 2015 05:56:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Jun 2015 05:56:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXP-0005CJ-9L for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXO-0002VR-SA for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:55 +0000 Date: Tue, 30 Jun 2015 05:56:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] efi: avoid calling boot services after ExitBootServices() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e50f0478955a800aa31a643dcfbeb13d33194dc9 Author: Ross Lagerwall AuthorDate: Thu Jun 18 09:36:25 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:36:25 2015 +0200 efi: avoid calling boot services after ExitBootServices() After the first call to ExitBootServices(), avoid calling any boot services (except GetMemoryMap() and ExitBootServices()) by setting setting efi_bs to NULL and halting in blexit(). Only GetMemoryMap() and ExitBootServices() are explicitly allowed to be called after the first call to ExitBootServices() and so are are called via SystemTable->BootServices. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: d4300db3a03a0cd999745135d7879fc4b6b5aa61 master date: 2015-06-10 12:00:10 +0200 --- xen/arch/x86/efi/boot.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 598cf76..98dd60f 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -189,6 +189,13 @@ static void __init __attribute__((__noreturn__)) blexit(const CHAR16 *str) PrintStr((CHAR16 *)str); PrintStr(newline); + if ( !efi_bs ) + { + local_irq_disable(); + for ( ; ; ) + halt(); + } + if ( cfg.addr ) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); if ( kernel.addr ) @@ -1393,8 +1400,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) struct e820entry *e; efi_memmap_size = info_size; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); + status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, + efi_memmap, &map_key, + &efi_mdesc_size, + &mdesc_ver); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot obtain memory map", status); @@ -1457,7 +1466,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) relocate_trampoline(cfg.addr); } - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = SystemTable->BootServices->ExitBootServices(ImageHandle, + map_key); + efi_bs = NULL; if ( status != EFI_INVALID_PARAMETER || retry ) break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:56:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:56: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 1Z9oXT-0004bI-Kf; Tue, 30 Jun 2015 05:56:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXR-0004b5-Q9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:57 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F1/93-01068-9AF22955; Tue, 30 Jun 2015 05:56:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1435643815!20925369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13297 invoked from network); 30 Jun 2015 05:56:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Jun 2015 05:56:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXP-0005CJ-9L for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXO-0002VR-SA for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:56:55 +0000 Date: Tue, 30 Jun 2015 05:56:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] efi: avoid calling boot services after ExitBootServices() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e50f0478955a800aa31a643dcfbeb13d33194dc9 Author: Ross Lagerwall AuthorDate: Thu Jun 18 09:36:25 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:36:25 2015 +0200 efi: avoid calling boot services after ExitBootServices() After the first call to ExitBootServices(), avoid calling any boot services (except GetMemoryMap() and ExitBootServices()) by setting setting efi_bs to NULL and halting in blexit(). Only GetMemoryMap() and ExitBootServices() are explicitly allowed to be called after the first call to ExitBootServices() and so are are called via SystemTable->BootServices. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: d4300db3a03a0cd999745135d7879fc4b6b5aa61 master date: 2015-06-10 12:00:10 +0200 --- xen/arch/x86/efi/boot.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 598cf76..98dd60f 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -189,6 +189,13 @@ static void __init __attribute__((__noreturn__)) blexit(const CHAR16 *str) PrintStr((CHAR16 *)str); PrintStr(newline); + if ( !efi_bs ) + { + local_irq_disable(); + for ( ; ; ) + halt(); + } + if ( cfg.addr ) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); if ( kernel.addr ) @@ -1393,8 +1400,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) struct e820entry *e; efi_memmap_size = info_size; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); + status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, + efi_memmap, &map_key, + &efi_mdesc_size, + &mdesc_ver); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot obtain memory map", status); @@ -1457,7 +1466,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) relocate_trampoline(cfg.addr); } - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = SystemTable->BootServices->ExitBootServices(ImageHandle, + map_key); + efi_bs = NULL; if ( status != EFI_INVALID_PARAMETER || retry ) break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oXd-0004cj-N6; Tue, 30 Jun 2015 05:57:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXc-0004cR-1D for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:08 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 8C/E8-16518-3BF22955; Tue, 30 Jun 2015 05:57:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435643825!20991273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29112 invoked from network); 30 Jun 2015 05:57:06 -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; 30 Jun 2015 05:57:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXZ-0005Ct-Fh for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXZ-0002W6-D6 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:05 +0000 Date: Tue, 30 Jun 2015 05:57:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/EFI: fix EFI_MEMORY_WP handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7c37b2680f4e94c9de778195cad4c26315785a6 Author: Jan Beulich AuthorDate: Thu Jun 18 09:37:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:37:12 2015 +0200 x86/EFI: fix EFI_MEMORY_WP handling Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Backport: Also fix EFI_MEMORY_XP handling (along the lines of what master commit abcf15fa8f ["x86: switch default mapping attributes to non-executable"] does): We must not set the NX bit when the CPU doesn't support it, as the bit being set may trigger Reserved Bit faults in that case. Signed-off-by: Jan Beulich master commit: af23e79f46583abc18e8cffdec0b69297cfbdff0 master date: 2015-06-10 12:01:35 +0200 --- xen/arch/x86/efi/boot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 98dd60f..8026d95 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1621,8 +1621,8 @@ void __init efi_init_memory(void) } if ( desc->Attribute & EFI_MEMORY_WP ) - prot &= _PAGE_RW; - if ( desc->Attribute & EFI_MEMORY_XP ) + prot &= ~_PAGE_RW; + if ( (desc->Attribute & EFI_MEMORY_XP) && cpu_has_nx ) prot |= _PAGE_NX_BIT; if ( pfn_to_pdx(emfn - 1) < (DIRECTMAP_SIZE >> PAGE_SHIFT) && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oXd-0004cj-N6; Tue, 30 Jun 2015 05:57:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXc-0004cR-1D for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:08 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 8C/E8-16518-3BF22955; Tue, 30 Jun 2015 05:57:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435643825!20991273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29112 invoked from network); 30 Jun 2015 05:57:06 -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; 30 Jun 2015 05:57:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXZ-0005Ct-Fh for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXZ-0002W6-D6 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:05 +0000 Date: Tue, 30 Jun 2015 05:57:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/EFI: fix EFI_MEMORY_WP handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7c37b2680f4e94c9de778195cad4c26315785a6 Author: Jan Beulich AuthorDate: Thu Jun 18 09:37:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:37:12 2015 +0200 x86/EFI: fix EFI_MEMORY_WP handling Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Backport: Also fix EFI_MEMORY_XP handling (along the lines of what master commit abcf15fa8f ["x86: switch default mapping attributes to non-executable"] does): We must not set the NX bit when the CPU doesn't support it, as the bit being set may trigger Reserved Bit faults in that case. Signed-off-by: Jan Beulich master commit: af23e79f46583abc18e8cffdec0b69297cfbdff0 master date: 2015-06-10 12:01:35 +0200 --- xen/arch/x86/efi/boot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 98dd60f..8026d95 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1621,8 +1621,8 @@ void __init efi_init_memory(void) } if ( desc->Attribute & EFI_MEMORY_WP ) - prot &= _PAGE_RW; - if ( desc->Attribute & EFI_MEMORY_XP ) + prot &= ~_PAGE_RW; + if ( (desc->Attribute & EFI_MEMORY_XP) && cpu_has_nx ) prot |= _PAGE_NX_BIT; if ( pfn_to_pdx(emfn - 1) < (DIRECTMAP_SIZE >> PAGE_SHIFT) && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oXn-0004eB-Pj; Tue, 30 Jun 2015 05:57:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXm-0004dw-9B for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:18 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 08/67-32406-DBF22955; Tue, 30 Jun 2015 05:57:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435643835!20991298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29538 invoked from network); 30 Jun 2015 05:57:16 -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; 30 Jun 2015 05:57:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXj-0005D1-MD for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXj-0002Wt-JS for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:15 +0000 Date: Tue, 30 Jun 2015 05:57:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI/early: add /mapbs to map EfiBootServices{Code, Data} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f29e20506ca0a385aa3ddb70a0fb2e8b423793d Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 09:37:41 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:37:41 2015 +0200 EFI/early: add /mapbs to map EfiBootServices{Code,Data} From: Konrad Rzeszutek Wilk To help on certain platforms to run. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich master commit: f36886bdf48ca2968379e3a0aa607044537ecf76 master date: 2015-06-10 12:02:43 +0200 --- xen/arch/x86/efi/boot.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 8026d95..7c50e80 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -65,6 +65,7 @@ static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; +static bool_t __initdata map_bs; static struct file __initdata cfg; static struct file __initdata kernel; @@ -840,6 +841,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) base_video = 1; + else if ( wstrcmp(ptr + 1, L"mapbs") == 0 ) + map_bs = 1; else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) cfg_file_name = ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) @@ -849,6 +852,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { PrintStr(L"Xen EFI Loader options:\r\n"); PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-mapbs map EfiBootServices{Code,Data}\r\n"); PrintStr(L"-cfg= specify configuration file\r\n"); PrintStr(L"-help, -? display this help\r\n"); blexit(NULL); @@ -1417,12 +1421,16 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) switch ( desc->Type ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: case EfiBootServicesCode: case EfiBootServicesData: + if ( map_bs ) + { + default: + type = E820_RESERVED; + break; + } + /* fall through */ + case EfiConventionalMemory: if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && len >= cfg.size && @@ -1584,7 +1592,8 @@ void __init efi_init_memory(void) } *extra, *extra_head = NULL; #endif - printk(XENLOG_INFO "EFI memory map:\n"); + printk(XENLOG_INFO "EFI memory map:%s\n", + map_bs ? " (mapping BootServices)" : ""); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; @@ -1597,7 +1606,11 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || + (!(desc->Attribute & EFI_MEMORY_RUNTIME) && + (!map_bs || + (desc->Type != EfiBootServicesCode && + desc->Type != EfiBootServicesData))) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1683,7 +1696,10 @@ void __init efi_init_memory(void) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + if ( ((desc->Attribute & EFI_MEMORY_RUNTIME) || + (map_bs && + (desc->Type == EfiBootServicesCode || + desc->Type == EfiBootServicesData))) && desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && desc->VirtualStart != desc->PhysicalStart ) copy_mapping(PFN_DOWN(desc->PhysicalStart), -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oXn-0004eB-Pj; Tue, 30 Jun 2015 05:57:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXm-0004dw-9B for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:18 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 08/67-32406-DBF22955; Tue, 30 Jun 2015 05:57:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1435643835!20991298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29538 invoked from network); 30 Jun 2015 05:57:16 -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; 30 Jun 2015 05:57:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXj-0005D1-MD for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXj-0002Wt-JS for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:15 +0000 Date: Tue, 30 Jun 2015 05:57:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI/early: add /mapbs to map EfiBootServices{Code, Data} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f29e20506ca0a385aa3ddb70a0fb2e8b423793d Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 09:37:41 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:37:41 2015 +0200 EFI/early: add /mapbs to map EfiBootServices{Code,Data} From: Konrad Rzeszutek Wilk To help on certain platforms to run. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich master commit: f36886bdf48ca2968379e3a0aa607044537ecf76 master date: 2015-06-10 12:02:43 +0200 --- xen/arch/x86/efi/boot.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 8026d95..7c50e80 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -65,6 +65,7 @@ static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; +static bool_t __initdata map_bs; static struct file __initdata cfg; static struct file __initdata kernel; @@ -840,6 +841,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) base_video = 1; + else if ( wstrcmp(ptr + 1, L"mapbs") == 0 ) + map_bs = 1; else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) cfg_file_name = ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) @@ -849,6 +852,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { PrintStr(L"Xen EFI Loader options:\r\n"); PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-mapbs map EfiBootServices{Code,Data}\r\n"); PrintStr(L"-cfg= specify configuration file\r\n"); PrintStr(L"-help, -? display this help\r\n"); blexit(NULL); @@ -1417,12 +1421,16 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) switch ( desc->Type ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: case EfiBootServicesCode: case EfiBootServicesData: + if ( map_bs ) + { + default: + type = E820_RESERVED; + break; + } + /* fall through */ + case EfiConventionalMemory: if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && len >= cfg.size && @@ -1584,7 +1592,8 @@ void __init efi_init_memory(void) } *extra, *extra_head = NULL; #endif - printk(XENLOG_INFO "EFI memory map:\n"); + printk(XENLOG_INFO "EFI memory map:%s\n", + map_bs ? " (mapping BootServices)" : ""); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; @@ -1597,7 +1606,11 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || + (!(desc->Attribute & EFI_MEMORY_RUNTIME) && + (!map_bs || + (desc->Type != EfiBootServicesCode && + desc->Type != EfiBootServicesData))) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1683,7 +1696,10 @@ void __init efi_init_memory(void) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + if ( ((desc->Attribute & EFI_MEMORY_RUNTIME) || + (map_bs && + (desc->Type == EfiBootServicesCode || + desc->Type == EfiBootServicesData))) && desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && desc->VirtualStart != desc->PhysicalStart ) copy_mapping(PFN_DOWN(desc->PhysicalStart), -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oXx-0004fq-U9; Tue, 30 Jun 2015 05:57:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXw-0004ff-Ox for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:28 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 64/19-16518-7CF22955; Tue, 30 Jun 2015 05:57:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435643846!21051916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9251 invoked from network); 30 Jun 2015 05:57:26 -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; 30 Jun 2015 05:57:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXt-0005D9-QH for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXt-0002XG-PC for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:25 +0000 Date: Tue, 30 Jun 2015 05:57:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: support default attributes to map Runtime service areas with none given X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d108622ce5874ced4c3951d4c94a886e302e30e1 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 09:38:37 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:38:37 2015 +0200 EFI: support default attributes to map Runtime service areas with none given From: Konrad Rzeszutek Wilk For example on Dell machines we see: (XEN) 00000fed18000-00000fed19fff type=11 attr=8000000000000000 (XEN) Unknown cachability for MFNs 0xfed18-0xfed19 Let's allow them to be mapped as UC. We also alter the 'efi-rs' to be 'efi=rs' or 'efi=no-rs'. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell master commit: 74cdad5dae72c78af4f6b343f38fd55e6a526ab1 master date: 2015-06-10 12:04:07 +0200 --- docs/misc/xen-command-line.markdown | 18 +++++++++++++++--- xen/arch/x86/efi/boot.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 304588e..77790af 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -497,12 +497,24 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. -### efi-rs -> `= ` +### efi +> `= List of [ rs | attr ]` + +All options are of boolean kind and can be prefixed with `no-` to +effect the inverse meaning. + +> `rs` > Default: `true` -Force or disable use of EFI runtime services. +>> Force or disable use of EFI runtime services. + +> `attr=uc` + +> Default: `off` + +>> Allows mapping of RuntimeServices which have no cachability attribute +>> set as UC. ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 7c50e80..8178aea 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1530,7 +1530,31 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) static bool_t __initdata efi_rs_enable = 1; -boolean_param("efi-rs", efi_rs_enable); +static bool_t __initdata efi_map_uc; + +static void __init parse_efi_param(char *s) +{ + char *ss; + + do { + bool_t val = !!strncmp(s, "no-", 3); + + if ( !val ) + s += 3; + + ss = strchr(s, ','); + if ( ss ) + *ss = '\0'; + + if ( !strcmp(s, "rs") ) + efi_rs_enable = val; + else if ( !strcmp(s, "attr=uc") ) + efi_map_uc = val; + + s = ss + 1; + } while ( ss ); +} +custom_param("efi", parse_efi_param); #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, @@ -1628,9 +1652,11 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; else { - printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx\n", - smfn, emfn - 1); - continue; + printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", + smfn, emfn - 1, efi_map_uc ? ", assuming UC" : ""); + if ( !efi_map_uc ) + continue; + prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } if ( desc->Attribute & EFI_MEMORY_WP ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oXx-0004fq-U9; Tue, 30 Jun 2015 05:57:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXw-0004ff-Ox for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:28 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 64/19-16518-7CF22955; Tue, 30 Jun 2015 05:57:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1435643846!21051916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9251 invoked from network); 30 Jun 2015 05:57:26 -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; 30 Jun 2015 05:57:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oXt-0005D9-QH for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oXt-0002XG-PC for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:25 +0000 Date: Tue, 30 Jun 2015 05:57:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: support default attributes to map Runtime service areas with none given X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d108622ce5874ced4c3951d4c94a886e302e30e1 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jun 18 09:38:37 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:38:37 2015 +0200 EFI: support default attributes to map Runtime service areas with none given From: Konrad Rzeszutek Wilk For example on Dell machines we see: (XEN) 00000fed18000-00000fed19fff type=11 attr=8000000000000000 (XEN) Unknown cachability for MFNs 0xfed18-0xfed19 Let's allow them to be mapped as UC. We also alter the 'efi-rs' to be 'efi=rs' or 'efi=no-rs'. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell master commit: 74cdad5dae72c78af4f6b343f38fd55e6a526ab1 master date: 2015-06-10 12:04:07 +0200 --- docs/misc/xen-command-line.markdown | 18 +++++++++++++++--- xen/arch/x86/efi/boot.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 304588e..77790af 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -497,12 +497,24 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. -### efi-rs -> `= ` +### efi +> `= List of [ rs | attr ]` + +All options are of boolean kind and can be prefixed with `no-` to +effect the inverse meaning. + +> `rs` > Default: `true` -Force or disable use of EFI runtime services. +>> Force or disable use of EFI runtime services. + +> `attr=uc` + +> Default: `off` + +>> Allows mapping of RuntimeServices which have no cachability attribute +>> set as UC. ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 7c50e80..8178aea 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1530,7 +1530,31 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) static bool_t __initdata efi_rs_enable = 1; -boolean_param("efi-rs", efi_rs_enable); +static bool_t __initdata efi_map_uc; + +static void __init parse_efi_param(char *s) +{ + char *ss; + + do { + bool_t val = !!strncmp(s, "no-", 3); + + if ( !val ) + s += 3; + + ss = strchr(s, ','); + if ( ss ) + *ss = '\0'; + + if ( !strcmp(s, "rs") ) + efi_rs_enable = val; + else if ( !strcmp(s, "attr=uc") ) + efi_map_uc = val; + + s = ss + 1; + } while ( ss ); +} +custom_param("efi", parse_efi_param); #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, @@ -1628,9 +1652,11 @@ void __init efi_init_memory(void) prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; else { - printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx\n", - smfn, emfn - 1); - continue; + printk(XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n", + smfn, emfn - 1, efi_map_uc ? ", assuming UC" : ""); + if ( !efi_map_uc ) + continue; + prot |= _PAGE_PWT | _PAGE_PCD | MAP_SMALL_PAGES; } if ( desc->Attribute & EFI_MEMORY_WP ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oY8-0004hM-0Q; Tue, 30 Jun 2015 05:57:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oY6-0004h6-DL for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:38 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id E6/DC-32733-1DF22955; Tue, 30 Jun 2015 05:57:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435643856!27816461!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11471 invoked from network); 30 Jun 2015 05:57:37 -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; 30 Jun 2015 05:57:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oY4-0005DJ-3P for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oY3-0002Yb-Tq for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:36 +0000 Date: Tue, 30 Jun 2015 05:57:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: extend quirks to newer desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 726dd5a49e00335aa90954cfcaa4433880351b44 Author: Jan Beulich AuthorDate: Thu Jun 18 09:39:32 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:39:32 2015 +0200 VT-d: extend quirks to newer desktop chipsets We're being told that while on the server side the issue we're trying to work around is fixed starting with IvyBridge (another round of double checking is going on before we're going to remove the one IvyBridge ID that we're currently applying the workaround for), on the desktop side even Skylake still requires the workaround. Hence we need to add a whole bunch of desktop IDs. Signed-off-by: Jan Beulich Acked-by: Don Dugger master commit: cdc6204b7749a53e6a4d95fac4440601c35a539d master date: 2015-06-11 11:55:05 +0200 --- xen/drivers/passthrough/vtd/quirks.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 2fac35d..feeeea2 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -477,9 +477,13 @@ void pci_vtd_quirk(const struct pci_dev *pdev) case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ - case 0x0a04: /* Haswell ULT */ - case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ - case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ + case 0x0a00: case 0x0a04: case 0x0a08: case 0x0a0f: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: case 0x0c0f: /* Haswell */ + case 0x0d00: case 0x0d04: case 0x0d08: case 0x0d0f: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: case 0x160f: /* Broadwell */ + case 0x1610: case 0x1614: case 0x1618: /* Broadwell */ + case 0x1900: case 0x1904: case 0x1908: case 0x190c: case 0x190f: /* Skylake */ + case 0x1910: case 0x1918: case 0x191f: /* Skylake */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oY8-0004hM-0Q; Tue, 30 Jun 2015 05:57:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oY6-0004h6-DL for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:38 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id E6/DC-32733-1DF22955; Tue, 30 Jun 2015 05:57:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435643856!27816461!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11471 invoked from network); 30 Jun 2015 05:57:37 -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; 30 Jun 2015 05:57:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oY4-0005DJ-3P for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oY3-0002Yb-Tq for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:36 +0000 Date: Tue, 30 Jun 2015 05:57:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: extend quirks to newer desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 726dd5a49e00335aa90954cfcaa4433880351b44 Author: Jan Beulich AuthorDate: Thu Jun 18 09:39:32 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:39:32 2015 +0200 VT-d: extend quirks to newer desktop chipsets We're being told that while on the server side the issue we're trying to work around is fixed starting with IvyBridge (another round of double checking is going on before we're going to remove the one IvyBridge ID that we're currently applying the workaround for), on the desktop side even Skylake still requires the workaround. Hence we need to add a whole bunch of desktop IDs. Signed-off-by: Jan Beulich Acked-by: Don Dugger master commit: cdc6204b7749a53e6a4d95fac4440601c35a539d master date: 2015-06-11 11:55:05 +0200 --- xen/drivers/passthrough/vtd/quirks.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 2fac35d..feeeea2 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -477,9 +477,13 @@ void pci_vtd_quirk(const struct pci_dev *pdev) case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ - case 0x0a04: /* Haswell ULT */ - case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ - case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ + case 0x0a00: case 0x0a04: case 0x0a08: case 0x0a0f: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: case 0x0c0f: /* Haswell */ + case 0x0d00: case 0x0d04: case 0x0d08: case 0x0d0f: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: case 0x160f: /* Broadwell */ + case 0x1610: case 0x1614: case 0x1618: /* Broadwell */ + case 0x1900: case 0x1904: case 0x1908: case 0x190c: case 0x190f: /* Skylake */ + case 0x1910: case 0x1918: case 0x191f: /* Skylake */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oYI-0004ie-34; Tue, 30 Jun 2015 05:57:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYG-0004iR-Fd for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:48 +0000 Content-Length: 1715 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 46/C6-06739-BDF22955; Tue, 30 Jun 2015 05:57:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1435643866!27839777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13252 invoked from network); 30 Jun 2015 05:57:47 -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; 30 Jun 2015 05:57:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYE-0005DR-8J for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYE-0002Yx-73 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:46 +0000 Date: Tue, 30 Jun 2015 05:57:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libelf: fix elf_parse_bsdsyms 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: multipart/mixed; boundary="===============7774524659051318640==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7774524659051318640== Content-Length: 1296 Content-Transfer-Encoding: quoted-printable commit 472bdfefadabcd12ec61bc0c3aa378b961bd1035 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 09:40:10 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:40:10 2015 +0200 libelf: fix elf_parse_bsdsyms call elf_parse_bsdsyms expects the second paramater to be a physical address, not a virtual one. Signed-off-by: Roger Pau Monn=C3=A9 master commit: 90b18f1666a89e7829912456ee32099c7669cb10 master date: 2015-06-12 12:05:54 +0200 --- xen/common/libelf/libelf-dominfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 6120dd4..86403b9 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -438,7 +438,7 @@ static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, if ( parms->bsd_symtab ) { - elf_parse_bsdsyms(elf, parms->virt_kend); + elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) parms->virt_kend =3D elf->bsd_symtab_pend + parms->virt_offset; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============7774524659051318640== 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 --===============7774524659051318640==-- From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:57:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:57: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 1Z9oYI-0004ie-34; Tue, 30 Jun 2015 05:57:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYG-0004iR-Fd for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:48 +0000 Content-Length: 1715 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 46/C6-06739-BDF22955; Tue, 30 Jun 2015 05:57:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1435643866!27839777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13252 invoked from network); 30 Jun 2015 05:57:47 -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; 30 Jun 2015 05:57:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYE-0005DR-8J for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYE-0002Yx-73 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:46 +0000 Date: Tue, 30 Jun 2015 05:57:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libelf: fix elf_parse_bsdsyms 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: multipart/mixed; boundary="===============7774524659051318640==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7774524659051318640== Content-Length: 1296 Content-Transfer-Encoding: quoted-printable commit 472bdfefadabcd12ec61bc0c3aa378b961bd1035 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Jun 18 09:40:10 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:40:10 2015 +0200 libelf: fix elf_parse_bsdsyms call elf_parse_bsdsyms expects the second paramater to be a physical address, not a virtual one. Signed-off-by: Roger Pau Monn=C3=A9 master commit: 90b18f1666a89e7829912456ee32099c7669cb10 master date: 2015-06-12 12:05:54 +0200 --- xen/common/libelf/libelf-dominfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index 6120dd4..86403b9 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -438,7 +438,7 @@ static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, if ( parms->bsd_symtab ) { - elf_parse_bsdsyms(elf, parms->virt_kend); + elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) parms->virt_kend =3D elf->bsd_symtab_pend + parms->virt_offset; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============7774524659051318640== 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 --===============7774524659051318640==-- From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58: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 1Z9oYS-0004kA-5b; Tue, 30 Jun 2015 05:58:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYR-0004jx-C1 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:59 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 01/07-08467-6EF22955; Tue, 30 Jun 2015 05:57:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435643876!17743521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1053 invoked from network); 30 Jun 2015 05:57:57 -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; 30 Jun 2015 05:57:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYO-0005Dc-EZ for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYO-0002ZJ-Cg for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:56 +0000 Date: Tue, 30 Jun 2015 05:57:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] cpupool: fix shutdown with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de53397e342682dfe37d569a137007067a86b768 Author: Dario Faggioli AuthorDate: Thu Jun 18 09:40:32 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:40:32 2015 +0200 cpupool: fix shutdown with cpupools with different schedulers trying to shutdown the host when a cpupool exists, has pCPUs, and has a scheduler different than the Xen's default one, produces this: root@Zhaman:~# xl cpupool-cpu-remove Pool-0 8 root@Zhaman:~# xl cpupool-create name=\"Pool-1\" sched=\"credit2\" Using config file "command line" cpupool name: Pool-1 scheduler: credit2 number of cpus: 0 root@Zhaman:~# xl cpupool-cpu-add Pool-1 8 root@Zhaman:~# shutdown -h now (XEN) ----[ Xen-4.6-unstable x86_64 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] kill_timer+0x56/0x298 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor ... ... ... (XEN) Xen call trace: (XEN) [] kill_timer+0x56/0x298 (XEN) [] csched_free_pdata+0x9b/0xcf (XEN) [] cpu_schedule_callback+0x64/0x8b (XEN) [] notifier_call_chain+0x67/0x87 (XEN) [] cpu_down+0xd9/0x12c (XEN) [] disable_nonboot_cpus+0x93/0x138 (XEN) [] enter_state_helper+0xbd/0x365 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b ... ... ... (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000041 (XEN) **************************************** The fix is, when tearing down a pCPU, call the free_pdata() hook from the scheduler of the cpupool the pCPU belongs to, not always the one from the default scheduler. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Acked-by: George Dunlap master commit: 98c51d0c7eb188745f564813443adcb5fd5db00b master date: 2015-06-12 12:06:24 +0200 --- xen/common/schedule.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 2f28487..79768c5 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1322,9 +1322,10 @@ static int cpu_schedule_up(unsigned int cpu) static void cpu_schedule_down(unsigned int cpu) { struct schedule_data *sd = &per_cpu(schedule_data, cpu); + struct scheduler *sched = per_cpu(scheduler, cpu); if ( sd->sched_priv != NULL ) - SCHED_OP(&ops, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58: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 1Z9oYS-0004kA-5b; Tue, 30 Jun 2015 05:58:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYR-0004jx-C1 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:59 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 01/07-08467-6EF22955; Tue, 30 Jun 2015 05:57:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1435643876!17743521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1053 invoked from network); 30 Jun 2015 05:57:57 -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; 30 Jun 2015 05:57:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYO-0005Dc-EZ for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYO-0002ZJ-Cg for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:57:56 +0000 Date: Tue, 30 Jun 2015 05:57:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] cpupool: fix shutdown with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de53397e342682dfe37d569a137007067a86b768 Author: Dario Faggioli AuthorDate: Thu Jun 18 09:40:32 2015 +0200 Commit: Jan Beulich CommitDate: Thu Jun 18 09:40:32 2015 +0200 cpupool: fix shutdown with cpupools with different schedulers trying to shutdown the host when a cpupool exists, has pCPUs, and has a scheduler different than the Xen's default one, produces this: root@Zhaman:~# xl cpupool-cpu-remove Pool-0 8 root@Zhaman:~# xl cpupool-create name=\"Pool-1\" sched=\"credit2\" Using config file "command line" cpupool name: Pool-1 scheduler: credit2 number of cpus: 0 root@Zhaman:~# xl cpupool-cpu-add Pool-1 8 root@Zhaman:~# shutdown -h now (XEN) ----[ Xen-4.6-unstable x86_64 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] kill_timer+0x56/0x298 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor ... ... ... (XEN) Xen call trace: (XEN) [] kill_timer+0x56/0x298 (XEN) [] csched_free_pdata+0x9b/0xcf (XEN) [] cpu_schedule_callback+0x64/0x8b (XEN) [] notifier_call_chain+0x67/0x87 (XEN) [] cpu_down+0xd9/0x12c (XEN) [] disable_nonboot_cpus+0x93/0x138 (XEN) [] enter_state_helper+0xbd/0x365 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b ... ... ... (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000041 (XEN) **************************************** The fix is, when tearing down a pCPU, call the free_pdata() hook from the scheduler of the cpupool the pCPU belongs to, not always the one from the default scheduler. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Acked-by: George Dunlap master commit: 98c51d0c7eb188745f564813443adcb5fd5db00b master date: 2015-06-12 12:06:24 +0200 --- xen/common/schedule.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 2f28487..79768c5 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1322,9 +1322,10 @@ static int cpu_schedule_up(unsigned int cpu) static void cpu_schedule_down(unsigned int cpu) { struct schedule_data *sd = &per_cpu(schedule_data, cpu); + struct scheduler *sched = per_cpu(scheduler, cpu); if ( sd->sched_priv != NULL ) - SCHED_OP(&ops, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58: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 1Z9oYb-0004lZ-8Y; Tue, 30 Jun 2015 05:58:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYa-0004lP-T9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:08 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 19/47-05081-0FF22955; Tue, 30 Jun 2015 05:58:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435643886!17732555!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24894 invoked from network); 30 Jun 2015 05:58:07 -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 Jun 2015 05:58:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYY-0005ED-Kr for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYY-0002Zv-J7 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:06 +0000 Date: Tue, 30 Jun 2015 05:58:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Call context_saved() with interrupts enabled during context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c756224f797038966da09f0e8f642967971e79cc Author: denys drozdov AuthorDate: Wed Feb 4 19:13:05 2015 +0200 Commit: Ian Campbell CommitDate: Mon Jun 22 10:15:51 2015 +0100 xen/arm: Call context_saved() with interrupts enabled during context switch This is a requirement of the scheduler interface, violating this causes for example with the RT scheduler: (XEN) Assertion 'local_irq_is_enabled()' failed at spinlock.c:137 (XEN) ----[ Xen-4.5.0 arm32 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) PC: 0022a074 _spin_lock_irq+0x18/0x94 (XEN) Xen call trace: (XEN) [<0022a074>] _spin_lock_irq+0x18/0x94 (PC) (XEN) [<002256b8>] rt_context_saved+0x3c/0x144 (LR) (XEN) [<002256b8>] rt_context_saved+0x3c/0x144 (XEN) [<00228ed8>] context_saved+0x4c/0x80 (XEN) [<002524b4>] schedule_tail+0x148/0x2f0 (XEN) [<00252668>] continue_new_vcpu+0xc/0x70 (XEN) [<00252a18>] context_switch+0x74/0x7c Signed-off-by: denys drozdov Acked-by: Ian Campbell Reviewed-by: Dario Faggioli Reviewed-by: Julien Grall (cherry picked from commit e8bb583bec290a4f903cf065814af33ce49d4d0b) Conflicts: xen/arch/arm/domain.c --- xen/arch/arm/domain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 67de12a..d39669f 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -131,7 +131,6 @@ static void ctxt_switch_from(struct vcpu *p) gic_save_state(p); isb(); - context_saved(p); } static void ctxt_switch_to(struct vcpu *n) @@ -231,6 +230,8 @@ static void schedule_tail(struct vcpu *prev) local_irq_enable(); + context_saved(prev); + if ( prev != current ) update_runstate_area(current); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58: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 1Z9oYb-0004lZ-8Y; Tue, 30 Jun 2015 05:58:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYa-0004lP-T9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:08 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 19/47-05081-0FF22955; Tue, 30 Jun 2015 05:58:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1435643886!17732555!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24894 invoked from network); 30 Jun 2015 05:58:07 -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 Jun 2015 05:58:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYY-0005ED-Kr for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYY-0002Zv-J7 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:06 +0000 Date: Tue, 30 Jun 2015 05:58:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Call context_saved() with interrupts enabled during context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c756224f797038966da09f0e8f642967971e79cc Author: denys drozdov AuthorDate: Wed Feb 4 19:13:05 2015 +0200 Commit: Ian Campbell CommitDate: Mon Jun 22 10:15:51 2015 +0100 xen/arm: Call context_saved() with interrupts enabled during context switch This is a requirement of the scheduler interface, violating this causes for example with the RT scheduler: (XEN) Assertion 'local_irq_is_enabled()' failed at spinlock.c:137 (XEN) ----[ Xen-4.5.0 arm32 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) PC: 0022a074 _spin_lock_irq+0x18/0x94 (XEN) Xen call trace: (XEN) [<0022a074>] _spin_lock_irq+0x18/0x94 (PC) (XEN) [<002256b8>] rt_context_saved+0x3c/0x144 (LR) (XEN) [<002256b8>] rt_context_saved+0x3c/0x144 (XEN) [<00228ed8>] context_saved+0x4c/0x80 (XEN) [<002524b4>] schedule_tail+0x148/0x2f0 (XEN) [<00252668>] continue_new_vcpu+0xc/0x70 (XEN) [<00252a18>] context_switch+0x74/0x7c Signed-off-by: denys drozdov Acked-by: Ian Campbell Reviewed-by: Dario Faggioli Reviewed-by: Julien Grall (cherry picked from commit e8bb583bec290a4f903cf065814af33ce49d4d0b) Conflicts: xen/arch/arm/domain.c --- xen/arch/arm/domain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 67de12a..d39669f 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -131,7 +131,6 @@ static void ctxt_switch_from(struct vcpu *p) gic_save_state(p); isb(); - context_saved(p); } static void ctxt_switch_to(struct vcpu *n) @@ -231,6 +230,8 @@ static void schedule_tail(struct vcpu *prev) local_irq_enable(); + context_saved(prev); + if ( prev != current ) update_runstate_area(current); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58: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 1Z9oYn-0004n5-BB; Tue, 30 Jun 2015 05:58:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYm-0004mx-Fl for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:20 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 55/0F-31880-BFF22955; Tue, 30 Jun 2015 05:58:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1435643898!17799922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20292 invoked from network); 30 Jun 2015 05:58:19 -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; 30 Jun 2015 05:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYk-0005EL-6L for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYi-0002aJ-OM for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:17 +0000 Date: Tue, 30 Jun 2015 05:58:16 +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 4b63c53a019cd73c553dd202d298b9bdc0400488 Author: Ian Jackson AuthorDate: Tue Jun 23 11:43:01 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:01 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 73cc769..1cbc2cf 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 ?= 5fabc183544e966ddb9147e218246c26d2561157 -# Wed Jun 10 14:12:16 2015 +0100 -# xen/pt: unknown PCI config space fields should be read-only +QEMU_TAG ?= fd5c04144e204539f04e2f7994b12eef7724c31a +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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 Tue Jun 30 05:58:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58: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 1Z9oYn-0004n5-BB; Tue, 30 Jun 2015 05:58:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYm-0004mx-Fl for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:20 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 55/0F-31880-BFF22955; Tue, 30 Jun 2015 05:58:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1435643898!17799922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20292 invoked from network); 30 Jun 2015 05:58:19 -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; 30 Jun 2015 05:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYk-0005EL-6L for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYi-0002aJ-OM for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:17 +0000 Date: Tue, 30 Jun 2015 05:58:16 +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 4b63c53a019cd73c553dd202d298b9bdc0400488 Author: Ian Jackson AuthorDate: Tue Jun 23 11:43:01 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 11:43:01 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 73cc769..1cbc2cf 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 ?= 5fabc183544e966ddb9147e218246c26d2561157 -# Wed Jun 10 14:12:16 2015 +0100 -# xen/pt: unknown PCI config space fields should be read-only +QEMU_TAG ?= fd5c04144e204539f04e2f7994b12eef7724c31a +# Sun May 24 10:53:44 2015 +0200 +# pcnet: force the buffer access to be in bounds during tx # 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 Tue Jun 30 05:58:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYy-0004oU-Dd; Tue, 30 Jun 2015 05:58:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYx-0004oL-Hk for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:31 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 53/5F-03371-60032955; Tue, 30 Jun 2015 05:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435643909!27816621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18577 invoked from network); 30 Jun 2015 05:58:29 -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; 30 Jun 2015 05:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYu-0005EV-WD for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYu-0002ah-TV for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:28 +0000 Date: Tue, 30 Jun 2015 05:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13623d5d8e854f20b2da885f4d452dc870912205 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Tue Jun 23 11:50:49 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) (cherry picked from commit 0b19348f3cd176e4badb173dd0054c49346a6ce1) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 59e3292..2805e6c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -976,22 +976,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -1001,8 +999,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1065,7 +1065,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYy-0004oU-Dd; Tue, 30 Jun 2015 05:58:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYx-0004oL-Hk for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:31 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 53/5F-03371-60032955; Tue, 30 Jun 2015 05:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1435643909!27816621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18577 invoked from network); 30 Jun 2015 05:58:29 -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; 30 Jun 2015 05:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oYu-0005EV-WD for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oYu-0002ah-TV for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:28 +0000 Date: Tue, 30 Jun 2015 05:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13623d5d8e854f20b2da885f4d452dc870912205 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Tue Jun 23 11:50:49 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) (cherry picked from commit 0b19348f3cd176e4badb173dd0054c49346a6ce1) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 59e3292..2805e6c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -976,22 +976,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -1001,8 +999,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1065,7 +1065,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZ8-0004qI-IX; Tue, 30 Jun 2015 05:58:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZ7-0004q7-Cr for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:41 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id BE/74-25881-01032955; Tue, 30 Jun 2015 05:58:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1435643919!17746248!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18563 invoked from network); 30 Jun 2015 05:58:40 -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; 30 Jun 2015 05:58:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZ5-0005Ed-6w for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oZ5-0002bs-5f for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:39 +0000 Date: Tue, 30 Jun 2015 05:58:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] ocaml/xenctrl: Check return values from 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 10a95535b0dcde7daa3402b92f3c8d4494781c28 Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:52:40 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) (cherry picked from commit c91ed889ea3c3781a94a30909f30c3aad56c97d5) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index ff29b47..7bcb87e 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -455,6 +455,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -817,6 +820,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZ8-0004qI-IX; Tue, 30 Jun 2015 05:58:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZ7-0004q7-Cr for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:41 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id BE/74-25881-01032955; Tue, 30 Jun 2015 05:58:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1435643919!17746248!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18563 invoked from network); 30 Jun 2015 05:58:40 -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; 30 Jun 2015 05:58:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZ5-0005Ed-6w for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oZ5-0002bs-5f for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:39 +0000 Date: Tue, 30 Jun 2015 05:58:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] ocaml/xenctrl: Check return values from 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 10a95535b0dcde7daa3402b92f3c8d4494781c28 Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:52:40 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) (cherry picked from commit c91ed889ea3c3781a94a30909f30c3aad56c97d5) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index ff29b47..7bcb87e 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -455,6 +455,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -817,6 +820,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZI-0004rl-L2; Tue, 30 Jun 2015 05:58:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZH-0004rW-OY for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:51 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 74/55-16813-B1032955; Tue, 30 Jun 2015 05:58:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1435643929!27793839!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8980 invoked from network); 30 Jun 2015 05:58:50 -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; 30 Jun 2015 05:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZF-0005El-BY for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oZF-0002cE-AK for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:49 +0000 Date: Tue, 30 Jun 2015 05:58:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9702e084d09550495c2e71f2639c1c2c43aeaf63 Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:52:44 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) (cherry picked from commit 032673c8836e28d9e291e0d02235001c41aedaab) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 7bcb87e..53ca4b1 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:58:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZI-0004rl-L2; Tue, 30 Jun 2015 05:58:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZH-0004rW-OY for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:51 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 74/55-16813-B1032955; Tue, 30 Jun 2015 05:58:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1435643929!27793839!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8980 invoked from network); 30 Jun 2015 05:58:50 -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; 30 Jun 2015 05:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZF-0005El-BY for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oZF-0002cE-AK for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:49 +0000 Date: Tue, 30 Jun 2015 05:58:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9702e084d09550495c2e71f2639c1c2c43aeaf63 Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:52:44 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) (cherry picked from commit 032673c8836e28d9e291e0d02235001c41aedaab) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 7bcb87e..53ca4b1 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:59:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:59:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZT-0004t8-NY; Tue, 30 Jun 2015 05:59:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZS-0004sw-5t for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:59:02 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 10/F8-13047-52032955; Tue, 30 Jun 2015 05:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435643939!16397659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4842 invoked from network); 30 Jun 2015 05:59:00 -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; 30 Jun 2015 05:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZP-0005Ew-HB for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oZP-0002ch-Fk for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:59 +0000 Date: Tue, 30 Jun 2015 05:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c669c244246a7e45cedb03a30d59656c95d09719 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:52:47 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) (cherry picked from commit cfc4c43be14e60608ed0b8173365c737950afe41) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 53ca4b1..5ed0008 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -526,26 +526,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 05:59:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 05:59:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZT-0004t8-NY; Tue, 30 Jun 2015 05:59:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZS-0004sw-5t for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:59:02 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 10/F8-13047-52032955; Tue, 30 Jun 2015 05:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1435643939!16397659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4842 invoked from network); 30 Jun 2015 05:59:00 -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; 30 Jun 2015 05:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9oZP-0005Ew-HB for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oZP-0002ch-Fk for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 05:58:59 +0000 Date: Tue, 30 Jun 2015 05:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c669c244246a7e45cedb03a30d59656c95d09719 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:52:47 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) (cherry picked from commit cfc4c43be14e60608ed0b8173365c737950afe41) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 53ca4b1..5ed0008 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -526,26 +526,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9ocO-00056C-E0; Tue, 30 Jun 2015 06:02:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocM-000563-SU for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:02 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id DF/37-08244-AD032955; Tue, 30 Jun 2015 06:02:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1435644119!17760000!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14943 invoked from network); 30 Jun 2015 06:02:00 -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; 30 Jun 2015 06:02:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocJ-0005ME-FE for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:01:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oaZ-0002eR-4C for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:01:57 +0000 Date: Tue, 30 Jun 2015 06:00:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a490f8df8c989483624ebd6befb63377be55722b Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:53:05 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) (cherry picked from commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9ocO-00056C-E0; Tue, 30 Jun 2015 06:02:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocM-000563-SU for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:02 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id DF/37-08244-AD032955; Tue, 30 Jun 2015 06:02:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1435644119!17760000!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14943 invoked from network); 30 Jun 2015 06:02:00 -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; 30 Jun 2015 06:02:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocJ-0005ME-FE for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:01:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9oaZ-0002eR-4C for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:01:57 +0000 Date: Tue, 30 Jun 2015 06:00:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a490f8df8c989483624ebd6befb63377be55722b Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:53:05 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) (cherry picked from commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9ocZ-00057X-GP; Tue, 30 Jun 2015 06:02:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocX-00057D-Mk for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:13 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id FA/9B-06739-5E032955; Tue, 30 Jun 2015 06:02:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435644131!27828556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18905 invoked from network); 30 Jun 2015 06:02:12 -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 Jun 2015 06:02:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocV-0005Mo-8L for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocU-0002ix-Jo for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:11 +0000 Date: Tue, 30 Jun 2015 06:02:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2895efbcde8c54f0c9d9a6808ace02fe58e6944 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:07:03 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:53:59 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 12e817e281034f5881f46e0e4f1d127820101a78) --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 40ca771..46eef92 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1669,7 +1669,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9ocZ-00057X-GP; Tue, 30 Jun 2015 06:02:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocX-00057D-Mk for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:13 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id FA/9B-06739-5E032955; Tue, 30 Jun 2015 06:02:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1435644131!27828556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18905 invoked from network); 30 Jun 2015 06:02:12 -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 Jun 2015 06:02:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocV-0005Mo-8L for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocU-0002ix-Jo for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:11 +0000 Date: Tue, 30 Jun 2015 06:02:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2895efbcde8c54f0c9d9a6808ace02fe58e6944 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:07:03 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:53:59 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 12e817e281034f5881f46e0e4f1d127820101a78) --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 40ca771..46eef92 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1669,7 +1669,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9ocj-00058z-Iu; Tue, 30 Jun 2015 06:02:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9och-00058m-Md for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:23 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 74/E7-08244-FE032955; Tue, 30 Jun 2015 06:02:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1435644141!12351325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2056 invoked from network); 30 Jun 2015 06:02:22 -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; 30 Jun 2015 06:02:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocf-0005N1-Hp for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocf-0002jt-BI for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:21 +0000 Date: Tue, 30 Jun 2015 06:02:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba683105b52f60e312151654d72b0b0e8508cee5 Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:56:09 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index ea8c744..0011bb8 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1598,19 +1598,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9ocj-00058z-Iu; Tue, 30 Jun 2015 06:02:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9och-00058m-Md for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:23 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 74/E7-08244-FE032955; Tue, 30 Jun 2015 06:02:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1435644141!12351325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2056 invoked from network); 30 Jun 2015 06:02:22 -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; 30 Jun 2015 06:02:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocf-0005N1-Hp for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocf-0002jt-BI for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:21 +0000 Date: Tue, 30 Jun 2015 06:02:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba683105b52f60e312151654d72b0b0e8508cee5 Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:56:09 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index ea8c744..0011bb8 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1598,19 +1598,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9oct-0005Af-LP; Tue, 30 Jun 2015 06:02:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocs-0005AO-09 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:34 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3C/AF-08467-9F032955; Tue, 30 Jun 2015 06:02:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435644152!12470255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27415 invoked from network); 30 Jun 2015 06:02:32 -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; 30 Jun 2015 06:02:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocp-0005NB-R2 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocp-0002kK-LL for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:31 +0000 Date: Tue, 30 Jun 2015 06:02:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfed6d96fd6af00c9970e2a1c600d6bb991d137e Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:56:13 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 0011bb8..98cf565 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1703,7 +1703,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9oct-0005Af-LP; Tue, 30 Jun 2015 06:02:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocs-0005AO-09 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:34 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3C/AF-08467-9F032955; Tue, 30 Jun 2015 06:02:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1435644152!12470255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27415 invoked from network); 30 Jun 2015 06:02:32 -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; 30 Jun 2015 06:02:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9ocp-0005NB-R2 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocp-0002kK-LL for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:31 +0000 Date: Tue, 30 Jun 2015 06:02:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfed6d96fd6af00c9970e2a1c600d6bb991d137e Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 11:56:13 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 0011bb8..98cf565 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1703,7 +1703,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9od3-0005Cb-Pk; Tue, 30 Jun 2015 06:02:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9od2-0005CK-Fz for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:44 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id C2/66-29123-30132955; Tue, 30 Jun 2015 06:02:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435644162!21698313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23017 invoked from network); 30 Jun 2015 06:02:43 -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; 30 Jun 2015 06:02:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9od0-0005NJ-5l for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocz-0002n6-U9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:41 +0000 Date: Tue, 30 Jun 2015 06:02:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Revert "tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7062ac62f03fe22adeb4955f7323e20f5941a9da Author: Ian Jackson AuthorDate: Tue Jun 23 14:42:52 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 14:42:52 2015 +0100 Revert "tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125" Revert mistakenly half-applied patch. This reverts commit a2895efbcde8c54f0c9d9a6808ace02fe58e6944. --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 46eef92..40ca771 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1669,7 +1669,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); + nr = min(nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9od3-0005Cb-Pk; Tue, 30 Jun 2015 06:02:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9od2-0005CK-Fz for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:44 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id C2/66-29123-30132955; Tue, 30 Jun 2015 06:02:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1435644162!21698313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23017 invoked from network); 30 Jun 2015 06:02:43 -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; 30 Jun 2015 06:02:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9od0-0005NJ-5l for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9ocz-0002n6-U9 for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:41 +0000 Date: Tue, 30 Jun 2015 06:02:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Revert "tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7062ac62f03fe22adeb4955f7323e20f5941a9da Author: Ian Jackson AuthorDate: Tue Jun 23 14:42:52 2015 +0100 Commit: Ian Jackson CommitDate: Tue Jun 23 14:42:52 2015 +0100 Revert "tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125" Revert mistakenly half-applied patch. This reverts commit a2895efbcde8c54f0c9d9a6808ace02fe58e6944. --- tools/libxc/xc_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 46eef92..40ca771 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1669,7 +1669,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); + nr = min(nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 30 06:02:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9odD-0005EB-SS; Tue, 30 Jun 2015 06:02:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9odC-0005Dw-PM for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:54 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 07/53-10437-E0132955; Tue, 30 Jun 2015 06:02:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435644172!18617461!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3951 invoked from network); 30 Jun 2015 06:02:53 -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; 30 Jun 2015 06:02:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9odA-0005NU-CM for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9odA-0002nS-9w for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:52 +0000 Date: Tue, 30 Jun 2015 06:02:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c1cb3dba4ff97dd40909670755f24fcdf903012 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:11:12 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 14:43:21 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- tools/libxc/xc_domain.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 40ca771..6f93ebd 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1641,12 +1641,9 @@ failed: return -1; } -#ifndef min -#define min(X, Y) ({ \ - const typeof (X) _x = (X); \ - const typeof (Y) _y = (Y); \ - (void) (&_x == &_y); \ - (_x < _y) ? _x : _y; }) +#ifndef min_t +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #endif int xc_domain_memory_mapping( xc_interface *xch, @@ -1669,7 +1666,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; @@ -1705,7 +1702,7 @@ int xc_domain_memory_mapping( return ret; } -#undef min +#undef min_t int xc_domain_ioport_mapping( xc_interface *xch, uint32_t 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 Tue Jun 30 06:02:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 30 Jun 2015 06:02: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 1Z9odD-0005EB-SS; Tue, 30 Jun 2015 06:02:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9odC-0005Dw-PM for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:54 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 07/53-10437-E0132955; Tue, 30 Jun 2015 06:02:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1435644172!18617461!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3951 invoked from network); 30 Jun 2015 06:02:53 -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; 30 Jun 2015 06:02:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z9odA-0005NU-CM for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Z9odA-0002nS-9w for xen-changelog@lists.xensource.com; Tue, 30 Jun 2015 06:02:52 +0000 Date: Tue, 30 Jun 2015 06:02:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c1cb3dba4ff97dd40909670755f24fcdf903012 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:11:12 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jun 23 14:43:21 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- tools/libxc/xc_domain.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 40ca771..6f93ebd 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1641,12 +1641,9 @@ failed: return -1; } -#ifndef min -#define min(X, Y) ({ \ - const typeof (X) _x = (X); \ - const typeof (Y) _y = (Y); \ - (void) (&_x == &_y); \ - (_x < _y) ? _x : _y; }) +#ifndef min_t +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #endif int xc_domain_memory_mapping( xc_interface *xch, @@ -1669,7 +1666,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; @@ -1705,7 +1702,7 @@ int xc_domain_memory_mapping( return ret; } -#undef min +#undef min_t int xc_domain_ioport_mapping( xc_interface *xch, uint32_t 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