From xen-changelog-bounces@lists.xen.org Fri Mar 01 23:55:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Mar 2013 23:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBZnG-0001Nr-To; Fri, 01 Mar 2013 23:55:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBZnF-0001Nk-2g for xen-changelog@lists.xensource.com; Fri, 01 Mar 2013 23:55:13 +0000 Received: from [85.158.143.99:59055] by server-2.bemta-4.messagelabs.com id 53/52-12656-0EF31315; Fri, 01 Mar 2013 23:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1362182108!19501787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9178 invoked from network); 1 Mar 2013 23:55:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2013 23:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBZn5-0005sA-Dz for xen-changelog@lists.xensource.com; Fri, 01 Mar 2013 23:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UBZn4-0000VE-O6 for xen-changelog@lists.xensource.com; Fri, 01 Mar 2013 23:55:02 +0000 Date: Fri, 01 Mar 2013 23:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools: Fix memset(&p, 0, sizeof(p)) idiom in several places. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f5e3cd97398468d624cf907979c2bb12ff7ee7e Author: Michael Young AuthorDate: Wed Feb 13 17:00:15 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 11:45:47 2013 +0000 tools: Fix memset(&p,0,sizeof(p)) idiom in several places. gcc 4.8 identifies several places where code of the form memset(x, 0, sizeof(x)); is used incorrectly, meaning that less memory is set to zero than required. Signed-off-by: Michael Young Committed-by: Keir Fraser (cherry picked from commit d119301b5816b39b5ba722a2f8b301b37e8e34bd) --- tools/blktap2/drivers/md5.c | 2 +- tools/debugger/kdd/kdd-xen.c | 2 +- tools/libxc/xc_dom_boot.c | 2 +- tools/libxl/libxl_qmp.c | 2 +- tools/python/xen/lowlevel/netlink/libnetlink.c | 2 +- tools/xenstat/libxenstat/src/xenstat_linux.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/blktap2/drivers/md5.c b/tools/blktap2/drivers/md5.c index 27a360e..e765832 100644 --- a/tools/blktap2/drivers/md5.c +++ b/tools/blktap2/drivers/md5.c @@ -174,7 +174,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) MD5Transform(ctx->buf, (uint32_t *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */ diff --git a/tools/debugger/kdd/kdd-xen.c b/tools/debugger/kdd/kdd-xen.c index b2488c8..4fbea7d 100644 --- a/tools/debugger/kdd/kdd-xen.c +++ b/tools/debugger/kdd/kdd-xen.c @@ -333,7 +333,7 @@ int kdd_get_regs(kdd_guest *g, int cpuid, kdd_regs *r, int w64) if (!cpu) return -1; - memset(r, 0, sizeof(r)); + memset(r, 0, sizeof(*r)); if (w64) kdd_get_regs_x86_64(cpu, &r->r64); diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index a9a868c..438852b 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -266,7 +266,7 @@ int xc_dom_boot_image(struct xc_dom_image *dom) return rc; /* let the vm run */ - memset(ctxt, 0, sizeof(ctxt)); + memset(ctxt, 0, sizeof(*ctxt)); if ( (rc = dom->arch_hooks->vcpu(dom, ctxt)) != 0 ) return rc; xc_dom_unmap_all(dom); diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index b4cc247..dee9503 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -378,7 +378,7 @@ static int qmp_open(libxl__qmp_handler *qmp, const char *qmp_socket_path, ret = libxl_fd_set_cloexec(qmp->ctx, qmp->qmp_fd, 1); if (ret) return -1; - memset(&qmp->addr, 0, sizeof (&qmp->addr)); + memset(&qmp->addr, 0, sizeof (qmp->addr)); qmp->addr.sun_family = AF_UNIX; strncpy(qmp->addr.sun_path, qmp_socket_path, sizeof (qmp->addr.sun_path)); diff --git a/tools/python/xen/lowlevel/netlink/libnetlink.c b/tools/python/xen/lowlevel/netlink/libnetlink.c index 75e4a51..c5fc0bf 100644 --- a/tools/python/xen/lowlevel/netlink/libnetlink.c +++ b/tools/python/xen/lowlevel/netlink/libnetlink.c @@ -37,7 +37,7 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int sndbuf = 32768; int rcvbuf = 32768; - memset(rth, 0, sizeof(rth)); + memset(rth, 0, sizeof(*rth)); rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol); if (rth->fd < 0) { diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c index 1543fb2..931b24e 100644 --- a/tools/xenstat/libxenstat/src/xenstat_linux.c +++ b/tools/xenstat/libxenstat/src/xenstat_linux.c @@ -113,7 +113,7 @@ int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign /* Initialize all variables called has passed as non-NULL to zeros */ if (iface != NULL) - memset(iface, 0, sizeof(iface)); + memset(iface, 0, sizeof(*iface)); if (rxBytes != NULL) *rxBytes = 0; if (rxPackets != NULL) -- 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 Mar 01 23:55:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Mar 2013 23:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBZnG-0001Nr-To; Fri, 01 Mar 2013 23:55:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBZnF-0001Nk-2g for xen-changelog@lists.xensource.com; Fri, 01 Mar 2013 23:55:13 +0000 Received: from [85.158.143.99:59055] by server-2.bemta-4.messagelabs.com id 53/52-12656-0EF31315; Fri, 01 Mar 2013 23:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1362182108!19501787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9178 invoked from network); 1 Mar 2013 23:55:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Mar 2013 23:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBZn5-0005sA-Dz for xen-changelog@lists.xensource.com; Fri, 01 Mar 2013 23:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UBZn4-0000VE-O6 for xen-changelog@lists.xensource.com; Fri, 01 Mar 2013 23:55:02 +0000 Date: Fri, 01 Mar 2013 23:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools: Fix memset(&p, 0, sizeof(p)) idiom in several places. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f5e3cd97398468d624cf907979c2bb12ff7ee7e Author: Michael Young AuthorDate: Wed Feb 13 17:00:15 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 11:45:47 2013 +0000 tools: Fix memset(&p,0,sizeof(p)) idiom in several places. gcc 4.8 identifies several places where code of the form memset(x, 0, sizeof(x)); is used incorrectly, meaning that less memory is set to zero than required. Signed-off-by: Michael Young Committed-by: Keir Fraser (cherry picked from commit d119301b5816b39b5ba722a2f8b301b37e8e34bd) --- tools/blktap2/drivers/md5.c | 2 +- tools/debugger/kdd/kdd-xen.c | 2 +- tools/libxc/xc_dom_boot.c | 2 +- tools/libxl/libxl_qmp.c | 2 +- tools/python/xen/lowlevel/netlink/libnetlink.c | 2 +- tools/xenstat/libxenstat/src/xenstat_linux.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/blktap2/drivers/md5.c b/tools/blktap2/drivers/md5.c index 27a360e..e765832 100644 --- a/tools/blktap2/drivers/md5.c +++ b/tools/blktap2/drivers/md5.c @@ -174,7 +174,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) MD5Transform(ctx->buf, (uint32_t *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */ diff --git a/tools/debugger/kdd/kdd-xen.c b/tools/debugger/kdd/kdd-xen.c index b2488c8..4fbea7d 100644 --- a/tools/debugger/kdd/kdd-xen.c +++ b/tools/debugger/kdd/kdd-xen.c @@ -333,7 +333,7 @@ int kdd_get_regs(kdd_guest *g, int cpuid, kdd_regs *r, int w64) if (!cpu) return -1; - memset(r, 0, sizeof(r)); + memset(r, 0, sizeof(*r)); if (w64) kdd_get_regs_x86_64(cpu, &r->r64); diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index a9a868c..438852b 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -266,7 +266,7 @@ int xc_dom_boot_image(struct xc_dom_image *dom) return rc; /* let the vm run */ - memset(ctxt, 0, sizeof(ctxt)); + memset(ctxt, 0, sizeof(*ctxt)); if ( (rc = dom->arch_hooks->vcpu(dom, ctxt)) != 0 ) return rc; xc_dom_unmap_all(dom); diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index b4cc247..dee9503 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -378,7 +378,7 @@ static int qmp_open(libxl__qmp_handler *qmp, const char *qmp_socket_path, ret = libxl_fd_set_cloexec(qmp->ctx, qmp->qmp_fd, 1); if (ret) return -1; - memset(&qmp->addr, 0, sizeof (&qmp->addr)); + memset(&qmp->addr, 0, sizeof (qmp->addr)); qmp->addr.sun_family = AF_UNIX; strncpy(qmp->addr.sun_path, qmp_socket_path, sizeof (qmp->addr.sun_path)); diff --git a/tools/python/xen/lowlevel/netlink/libnetlink.c b/tools/python/xen/lowlevel/netlink/libnetlink.c index 75e4a51..c5fc0bf 100644 --- a/tools/python/xen/lowlevel/netlink/libnetlink.c +++ b/tools/python/xen/lowlevel/netlink/libnetlink.c @@ -37,7 +37,7 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int sndbuf = 32768; int rcvbuf = 32768; - memset(rth, 0, sizeof(rth)); + memset(rth, 0, sizeof(*rth)); rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol); if (rth->fd < 0) { diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c index 1543fb2..931b24e 100644 --- a/tools/xenstat/libxenstat/src/xenstat_linux.c +++ b/tools/xenstat/libxenstat/src/xenstat_linux.c @@ -113,7 +113,7 @@ int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign /* Initialize all variables called has passed as non-NULL to zeros */ if (iface != NULL) - memset(iface, 0, sizeof(iface)); + memset(iface, 0, sizeof(*iface)); if (rxBytes != NULL) *rxBytes = 0; if (rxPackets != NULL) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 03 00:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 03 Mar 2013 00: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 1UBx2A-0005c0-IQ; Sun, 03 Mar 2013 00:44:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx29-0005bv-6J for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:09 +0000 Received: from [193.109.254.147:25758] by server-15.bemta-14.messagelabs.com id 05/A8-24599-8DC92315; Sun, 03 Mar 2013 00:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1362271446!9936039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24986 invoked from network); 3 Mar 2013 00:44:07 -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; 3 Mar 2013 00:44:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx24-0006vi-4K for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UBx23-00044M-I7 for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:03 +0000 Date: Sun, 03 Mar 2013 00:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] tools: Fix memset(&p, 0, sizeof(p)) idiom in several places. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdce365321497ed92e03e8a8e57f481740849eef Author: Michael Young AuthorDate: Wed Feb 13 17:00:15 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 11:48:29 2013 +0000 tools: Fix memset(&p,0,sizeof(p)) idiom in several places. gcc 4.8 identifies several places where code of the form memset(x, 0, sizeof(x)); is used incorrectly, meaning that less memory is set to zero than required. Signed-off-by: Michael Young Committed-by: Keir Fraser (cherry picked from commit d119301b5816b39b5ba722a2f8b301b37e8e34bd) --- tools/blktap2/drivers/md5.c | 2 +- tools/debugger/kdd/kdd-xen.c | 2 +- tools/libxc/xc_dom_boot.c | 2 +- tools/python/xen/lowlevel/netlink/libnetlink.c | 2 +- tools/xenstat/libxenstat/src/xenstat_linux.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/blktap2/drivers/md5.c b/tools/blktap2/drivers/md5.c index 27a360e..e765832 100644 --- a/tools/blktap2/drivers/md5.c +++ b/tools/blktap2/drivers/md5.c @@ -174,7 +174,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) MD5Transform(ctx->buf, (uint32_t *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */ diff --git a/tools/debugger/kdd/kdd-xen.c b/tools/debugger/kdd/kdd-xen.c index b2488c8..4fbea7d 100644 --- a/tools/debugger/kdd/kdd-xen.c +++ b/tools/debugger/kdd/kdd-xen.c @@ -333,7 +333,7 @@ int kdd_get_regs(kdd_guest *g, int cpuid, kdd_regs *r, int w64) if (!cpu) return -1; - memset(r, 0, sizeof(r)); + memset(r, 0, sizeof(*r)); if (w64) kdd_get_regs_x86_64(cpu, &r->r64); diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index 65f60df..9a5b245 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -265,7 +265,7 @@ int xc_dom_boot_image(struct xc_dom_image *dom) return rc; /* let the vm run */ - memset(ctxt, 0, sizeof(ctxt)); + memset(ctxt, 0, sizeof(*ctxt)); if ( (rc = dom->arch_hooks->vcpu(dom, ctxt)) != 0 ) return rc; xc_dom_unmap_all(dom); diff --git a/tools/python/xen/lowlevel/netlink/libnetlink.c b/tools/python/xen/lowlevel/netlink/libnetlink.c index 75e4a51..c5fc0bf 100644 --- a/tools/python/xen/lowlevel/netlink/libnetlink.c +++ b/tools/python/xen/lowlevel/netlink/libnetlink.c @@ -37,7 +37,7 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int sndbuf = 32768; int rcvbuf = 32768; - memset(rth, 0, sizeof(rth)); + memset(rth, 0, sizeof(*rth)); rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol); if (rth->fd < 0) { diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c index 1543fb2..931b24e 100644 --- a/tools/xenstat/libxenstat/src/xenstat_linux.c +++ b/tools/xenstat/libxenstat/src/xenstat_linux.c @@ -113,7 +113,7 @@ int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign /* Initialize all variables called has passed as non-NULL to zeros */ if (iface != NULL) - memset(iface, 0, sizeof(iface)); + memset(iface, 0, sizeof(*iface)); if (rxBytes != NULL) *rxBytes = 0; if (rxPackets != NULL) -- 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 Sun Mar 03 00:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 03 Mar 2013 00: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 1UBx2A-0005c0-IQ; Sun, 03 Mar 2013 00:44:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx29-0005bv-6J for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:09 +0000 Received: from [193.109.254.147:25758] by server-15.bemta-14.messagelabs.com id 05/A8-24599-8DC92315; Sun, 03 Mar 2013 00:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1362271446!9936039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24986 invoked from network); 3 Mar 2013 00:44:07 -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; 3 Mar 2013 00:44:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx24-0006vi-4K for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UBx23-00044M-I7 for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:03 +0000 Date: Sun, 03 Mar 2013 00:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] tools: Fix memset(&p, 0, sizeof(p)) idiom in several places. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdce365321497ed92e03e8a8e57f481740849eef Author: Michael Young AuthorDate: Wed Feb 13 17:00:15 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 11:48:29 2013 +0000 tools: Fix memset(&p,0,sizeof(p)) idiom in several places. gcc 4.8 identifies several places where code of the form memset(x, 0, sizeof(x)); is used incorrectly, meaning that less memory is set to zero than required. Signed-off-by: Michael Young Committed-by: Keir Fraser (cherry picked from commit d119301b5816b39b5ba722a2f8b301b37e8e34bd) --- tools/blktap2/drivers/md5.c | 2 +- tools/debugger/kdd/kdd-xen.c | 2 +- tools/libxc/xc_dom_boot.c | 2 +- tools/python/xen/lowlevel/netlink/libnetlink.c | 2 +- tools/xenstat/libxenstat/src/xenstat_linux.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/blktap2/drivers/md5.c b/tools/blktap2/drivers/md5.c index 27a360e..e765832 100644 --- a/tools/blktap2/drivers/md5.c +++ b/tools/blktap2/drivers/md5.c @@ -174,7 +174,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) MD5Transform(ctx->buf, (uint32_t *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */ diff --git a/tools/debugger/kdd/kdd-xen.c b/tools/debugger/kdd/kdd-xen.c index b2488c8..4fbea7d 100644 --- a/tools/debugger/kdd/kdd-xen.c +++ b/tools/debugger/kdd/kdd-xen.c @@ -333,7 +333,7 @@ int kdd_get_regs(kdd_guest *g, int cpuid, kdd_regs *r, int w64) if (!cpu) return -1; - memset(r, 0, sizeof(r)); + memset(r, 0, sizeof(*r)); if (w64) kdd_get_regs_x86_64(cpu, &r->r64); diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index 65f60df..9a5b245 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -265,7 +265,7 @@ int xc_dom_boot_image(struct xc_dom_image *dom) return rc; /* let the vm run */ - memset(ctxt, 0, sizeof(ctxt)); + memset(ctxt, 0, sizeof(*ctxt)); if ( (rc = dom->arch_hooks->vcpu(dom, ctxt)) != 0 ) return rc; xc_dom_unmap_all(dom); diff --git a/tools/python/xen/lowlevel/netlink/libnetlink.c b/tools/python/xen/lowlevel/netlink/libnetlink.c index 75e4a51..c5fc0bf 100644 --- a/tools/python/xen/lowlevel/netlink/libnetlink.c +++ b/tools/python/xen/lowlevel/netlink/libnetlink.c @@ -37,7 +37,7 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int sndbuf = 32768; int rcvbuf = 32768; - memset(rth, 0, sizeof(rth)); + memset(rth, 0, sizeof(*rth)); rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol); if (rth->fd < 0) { diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c index 1543fb2..931b24e 100644 --- a/tools/xenstat/libxenstat/src/xenstat_linux.c +++ b/tools/xenstat/libxenstat/src/xenstat_linux.c @@ -113,7 +113,7 @@ int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign /* Initialize all variables called has passed as non-NULL to zeros */ if (iface != NULL) - memset(iface, 0, sizeof(iface)); + memset(iface, 0, sizeof(*iface)); if (rxBytes != NULL) *rxBytes = 0; if (rxPackets != NULL) -- 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 Sun Mar 03 00:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 03 Mar 2013 00:44: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 1UBx2P-0005cf-Ll; Sun, 03 Mar 2013 00:44:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx2O-0005cY-Sl for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:25 +0000 Received: from [85.158.137.99:5168] by server-5.bemta-3.messagelabs.com id 98/85-30636-3EC92315; Sun, 03 Mar 2013 00:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1362271456!13459690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8440 invoked from network); 3 Mar 2013 00:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2013 00:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx2G-0006vl-Ag for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UBx2F-00044s-Td for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:16 +0000 Date: Sun, 03 Mar 2013 00:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] Add .gitignore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b5e82064759e5fdc5bd41e8b5a1aca92c6527df Author: Ian Jackson AuthorDate: Thu Feb 28 11:50:08 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 11:50:27 2013 +0000 Add .gitignore Copy .gitignore from staging-4.2 current tip (ie from 3f5e3cd97398468d624cf907979c2bb12ff7ee7e). Signed-off-by: Ian Jackson --- .gitignore | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 394 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..776e4b2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,394 @@ +.hg +*.orig +*.rej +*~ +*.o +*.d +*.opic +*.a +*.so +*.so.[0-9]* +*.bin +*.bak +*.tmp +*.spot +*.spit +TAGS +cscope.files +cscope.in.out +cscope.out +cscope.po.out +.config + +dist +stubdom/*.tar.gz + +build-* +dist/* +docs/*.aux +docs/*.dvi +docs/*.log +docs/*.pdf +docs/*.ps +docs/*.toc +docs/api/* +docs/figs/xenserver.eps +docs/html/* +docs/interface/WARNINGS +docs/interface/images.pl +docs/interface/images.tex +docs/interface/img1.png +docs/interface/index.html +docs/interface/interface.css +docs/interface/interface.html +docs/interface/labels.pl +docs/man1/ +docs/man5/ +docs/pdf/* +docs/ps/* +docs/user/WARNINGS +docs/user/images.pl +docs/user/images.tex +docs/user/img1.png +docs/user/img2.png +docs/user/img3.png +docs/user/index.html +docs/user/internals.pl +docs/user/labels.pl +docs/user/user.css +docs/user/user.html +docs/xen-api/vm_lifecycle.eps +docs/xen-api/xenapi-datamodel-graph.eps +docs/xen-api/xenapi.out +docs/xen-api/xenapi.dvi +docs/xen-api/xenapi.pdf +docs/xen-api/xenapi.ps +docs/xen-api/xenapi.toc +extras/mini-os/arch/ia64/gen_off.s +extras/mini-os/include/mini-os +extras/mini-os/include/ia64/mini-os +extras/mini-os/include/ia64/offsets.h +extras/mini-os/include/x86/mini-os +extras/mini-os/include/xen +extras/mini-os/include/list.h +extras/mini-os/mini-os* +install/* +linux-[^/]*-paravirt/* +linux-2.6[^/]*/* +linux-[^/]*-rc/* +linux-[^/]*-tip/* +linux-[^/]*-git/* +linux-[^/]*.patch +mkddbxen +netbsd-[^/]*-tools/* +netbsd-[^/]*-xen0/* +netbsd-[^/]*-xenU/* +netbsd-[^/]*.patch +patches/*/.makedep +patches/ebtables-brnf-5_vs_2.4.25.diff +patches/ebtables.diff +patches/tmp/* +pristine-* +ref-* +tmp-* +stubdom/binutils-* +stubdom/cross-root-* +stubdom/gcc-* +stubdom/include +stubdom/ioemu +stubdom/xenstore +stubdom/libxc-* +stubdom/lwip-* +stubdom/mini-os-* +stubdom/mk-headers-* +stubdom/newlib-1.* +stubdom/newlib-x86* +stubdom/pciutils-* +stubdom/zlib-* +stubdom/grub-* +stubdom/ocaml-* +stubdom/lwip/ +stubdom/ioemu/ +stubdom/stubdompath.sh +tools/*/build/lib*/*.py +tools/autom4te.cache +tools/config.h +tools/config.log +tools/config.status +tools/config.cache +config/Tools.mk +tools/blktap2/daemon/blktapctrl +tools/blktap2/drivers/img2qcow +tools/blktap2/drivers/lock-util +tools/blktap2/drivers/qcow-create +tools/blktap2/drivers/qcow2raw +tools/blktap2/drivers/tapdisk +tools/blktap2/drivers/tapdisk-client +tools/blktap2/drivers/tapdisk-diff +tools/blktap2/drivers/tapdisk-stream +tools/blktap2/drivers/tapdisk2 +tools/blktap2/drivers/td-util +tools/blktap2/vhd/vhd-update +tools/blktap2/vhd/vhd-util +tools/blktap/drivers/blktapctrl +tools/blktap/drivers/img2qcow +tools/blktap/drivers/qcow-create +tools/blktap/drivers/qcow2raw +tools/blktap/drivers/tapdisk +tools/check/.* +tools/console/xenconsole +tools/console/xenconsoled +tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* +tools/debugger/gdb/gdb-6.2.1/* +tools/debugger/gdb/gdb-6.2.1.tar.bz2 +tools/debugger/gdbsx/gdbsx +tools/debugger/xenitp/xenitp +tools/firmware/*/biossums +tools/firmware/*.bin +tools/firmware/*.sym +tools/firmware/*bios/*bios*.txt +tools/firmware/etherboot/gpxe/* +tools/firmware/extboot/extboot.img +tools/firmware/extboot/signrom +tools/firmware/hvmloader/acpi/mk_dsdt +tools/firmware/hvmloader/acpi/dsdt*.c +tools/firmware/hvmloader/acpi/dsdt*.asl +tools/firmware/hvmloader/acpi/ssdt_*.h +tools/firmware/hvmloader/hvmloader +tools/firmware/hvmloader/roms.h +tools/firmware/hvmloader/roms.inc +tools/firmware/rombios/BIOS-bochs-[^/]* +tools/firmware/rombios/_rombios[^/]*_.c +tools/firmware/rombios/rombios[^/]*.s +tools/firmware/rombios/32bit/32bitbios_flat.h +tools/firmware/vgabios/vbetables-gen +tools/firmware/vgabios/vbetables.h +tools/flask/utils/flask-getenforce +tools/flask/utils/flask-get-bool +tools/flask/utils/flask-loadpolicy +tools/flask/utils/flask-setenforce +tools/flask/utils/flask-set-bool +tools/flask/utils/flask-label-pci +tools/fs-back/fs-backend +tools/hotplug/common/hotplugpath.sh +tools/include/xen/* +tools/include/xen-foreign/*.(c|h|size) +tools/include/xen-foreign/checker +tools/libxc/ia64/asm/*.h +tools/libxc/ia64/acpi/*.h +tools/libxc/ia64/acpi/platform/*.h +tools/libxc/ia64/dom_fw_asm.S +tools/libxc/ia64/dom_fw_common.c +tools/libxc/ia64/dom_fw_domu.c +tools/libxc/ia64/xen/*.h +tools/libxen/libxenapi- +tools/libxen/test/test_bindings +tools/libxen/test/test_event_handling +tools/libxl/libxlu_cfg_y.output +tools/libxl/xl +tools/libxl/testenum +tools/libxl/testenum.c +tools/libxl/tmp.* +tools/libxl/_libxl.api-for-check +tools/libxl/*.api-ok +tools/libaio/src/*.ol +tools/libaio/src/*.os +tools/misc/cpuperf/cpuperf-perfcntr +tools/misc/cpuperf/cpuperf-xen +tools/misc/lomount/lomount +tools/misc/mbootpack/bin2c +tools/misc/mbootpack/bootsect +tools/misc/mbootpack/bzimage_header.c +tools/misc/mbootpack/mbootpack +tools/misc/mbootpack/setup +tools/misc/miniterm/miniterm +tools/misc/xc_shadow +tools/misc/xen_cpuperf +tools/misc/xen-detect +tools/misc/xen-tmem-list-parse +tools/misc/xenperf +tools/misc/xenpm +tools/misc/xen-hvmctx +tools/misc/gtraceview +tools/misc/gtracestat +tools/misc/xenlockprof +tools/misc/lowmemd +tools/pygrub/build/* +tools/python/build/* +tools/python/xen/util/path.py +tools/remus/imqebt/imqebt +tools/remus/kmod/*(.cmd|.mod|.ko|.mod.c|.symvers|.xen) +tools/security/secpol_tool +tools/security/xen/* +tools/security/xensec_tool +tools/tests/blowfish.bin +tools/tests/blowfish.h +tools/tests/test_x86_emulator +tools/tests/x86_emulate +tools/tests/regression/installed/* +tools/tests/regression/build/* +tools/tests/regression/downloads/* +tools/tests/mem-sharing/memshrtool +tools/tests/mce-test/tools/xen-mceinj +tools/vnet/Make.local +tools/vnet/build/* +tools/vnet/gc +tools/vnet/gc*/* +tools/vnet/vnet-module/*.ko +tools/vnet/vnet-module/.*.cmd +tools/vnet/vnet-module/.tmp_versions/* +tools/vnet/vnet-module/vnet_module.mod.* +tools/vnet/vnetd/vnetd +tools/vtpm/tpm_emulator-*.tar.gz +tools/vtpm/tpm_emulator/* +tools/vtpm/vtpm/* +tools/vtpm_manager/manager/vtpm_managerd +tools/xcutils/lsevtchn +tools/xcutils/xc_restore +tools/xcutils/xc_save +tools/xcutils/readnotes +tools/xenfb/sdlfb +tools/xenfb/vncfb +tools/xenmon/xentrace_setmask +tools/xenmon/xenbaked +tools/xenpaging/xenpaging +tools/xenpmd/xenpmd +tools/xenstat/xentop/xentop +tools/xenstore/testsuite/tmp/* +tools/xenstore/init-xenstore-domain +tools/xenstore/xen +tools/xenstore/xenstore +tools/xenstore/xenstore-chmod +tools/xenstore/xenstore-exists +tools/xenstore/xenstore-list +tools/xenstore/xenstore-read +tools/xenstore/xenstore-rm +tools/xenstore/xenstore-write +tools/xenstore/xenstore-control +tools/xenstore/xenstore-ls +tools/xenstore/xenstored +tools/xenstore/xenstored_test +tools/xenstore/xs_crashme +tools/xenstore/xs_random +tools/xenstore/xs_stress +tools/xenstore/xs_tdb_dump +tools/xenstore/xs_test +tools/xenstore/xs_watch_stress +tools/xentrace/xentrace_setsize +tools/xentrace/tbctl +tools/xentrace/xenctx +tools/xentrace/xentrace +tools/xm-test/ramdisk/buildroot +tools/xm-test/aclocal.m4 +tools/xm-test/autom4te +tools/xm-test/install-sh +tools/xm-test/mkinstalldirs +tools/xm-test/missing +tools/xm-test/config(ure|.log|.status|.guess|.sub) +tools/xm-test/Makefile(.in)* +tools/xm-test/*/Makefile(.in)* +tools/xm-test/lib/XmTestLib/config.py +tools/xm-test/lib/XmTestReport/xmtest.py +tools/xm-test/tests/*.test +tools/ocaml-xenstored* +xen/.banner* +xen/BLOG +xen/System.map +xen/arch/arm/asm-offsets.s +xen/arch/arm/xen.lds +xen/arch/x86/asm-offsets.s +xen/arch/x86/boot/mkelf32 +xen/arch/x86/xen.lds +xen/arch/x86/boot/reloc.S +xen/arch/x86/boot/reloc.bin +xen/arch/x86/boot/reloc.lnk +xen/arch/x86/efi.lds +xen/arch/x86/efi/disabled +xen/arch/x86/efi/mkreloc +xen/ddb/* +xen/include/headers.chk +xen/include/asm +xen/include/asm-*/asm-offsets.h +xen/include/asm-ia64/asm-xsi-offsets.h +xen/include/asm-ia64/.offsets.h.stamp +xen/include/asm-ia64/xen +xen/include/compat/* +xen/include/hypervisor-ifs/arch +xen/include/linux +xen/include/public/public +xen/include/xen/*.new +xen/include/xen/acm_policy.h +xen/include/xen/banner.h +xen/include/xen/compile.h +xen/tools/figlet/figlet +xen/tools/symbols +xen/xen +xen/xen-syms +xen/xen.* +xen/arch/ia64/asm-offsets.s +xen/arch/ia64/asm-xsi-offsets.s +xen/arch/ia64/map.out +xen/arch/ia64/xen.lds.s +unmodified_drivers/linux-2.6/.tmp_versions +unmodified_drivers/linux-2.6/*.cmd +unmodified_drivers/linux-2.6/*.ko +unmodified_drivers/linux-2.6/*.mod.c +LibVNCServer* + +tools/qemu-xen-dir-remote +tools/qemu-xen-dir + +tools/qemu-xen-traditional-dir-remote +tools/qemu-xen-traditional-dir + +tools/firmware/seabios-dir-remote +tools/firmware/seabios-dir + +tools/firmware/rombios/_rombios_.c +tools/firmware/rombios/rombios.s +tools/firmware/rombios/rombios.sym +tools/include/xen-foreign/checker.c +tools/include/xen-foreign/ia64.h +tools/include/xen-foreign/structs.pyc +tools/include/xen-foreign/x86_32.h +tools/include/xen-foreign/x86_64.h + +.git +tools/misc/xen-hptool +tools/libxl/_*.[ch] +tools/libxl/testidl +tools/libxl/testidl.c +tools/libxl/*.pyc +tools/libxl/libxl-save-helper +tools/blktap2/control/tap-ctl +tools/firmware/etherboot/eb-roms.h +tools/firmware/etherboot/gpxe-git-snapshot.tar.gz +tools/misc/xenwatchdogd +tools/misc/xen-hvmcrash +tools/misc/xen-lowmemd +tools/libvchan/vchan-node[12] +tools/ocaml/*/.ocamldep.make +tools/ocaml/*/*.cm[ixao] +tools/ocaml/*/*.cmxa +tools/ocaml/*/*.annot +tools/ocaml/*/*/.ocamldep.make +tools/ocaml/*/*/*.cm[ixao] +tools/ocaml/*/*/*.cmxa +tools/ocaml/*/*/*.annot +tools/ocaml/*/*/META +tools/ocaml/libs/xl/_libxl_types.inc +tools/ocaml/libs/xl/_libxl_types.ml.in +tools/ocaml/libs/xl/_libxl_types.mli.in +tools/ocaml/libs/xl/xenlight.ml +tools/ocaml/libs/xl/xenlight.mli +tools/ocaml/xenstored/oxenstored + +tools/debugger/kdd/kdd +tools/firmware/etherboot/ipxe.tar.gz +tools/firmware/etherboot/ipxe/ +tools/python/xen/lowlevel/xl/_pyxl_types.c +tools/python/xen/lowlevel/xl/_pyxl_types.h +tools/xenstore/xenstore-watch + +docs/txt/misc/*.txt +docs/txt/man/*.txt -- 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 Sun Mar 03 00:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 03 Mar 2013 00:44: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 1UBx2P-0005cf-Ll; Sun, 03 Mar 2013 00:44:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx2O-0005cY-Sl for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:25 +0000 Received: from [85.158.137.99:5168] by server-5.bemta-3.messagelabs.com id 98/85-30636-3EC92315; Sun, 03 Mar 2013 00:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1362271456!13459690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8440 invoked from network); 3 Mar 2013 00:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2013 00:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UBx2G-0006vl-Ag for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UBx2F-00044s-Td for xen-changelog@lists.xensource.com; Sun, 03 Mar 2013 00:44:16 +0000 Date: Sun, 03 Mar 2013 00:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] Add .gitignore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b5e82064759e5fdc5bd41e8b5a1aca92c6527df Author: Ian Jackson AuthorDate: Thu Feb 28 11:50:08 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 11:50:27 2013 +0000 Add .gitignore Copy .gitignore from staging-4.2 current tip (ie from 3f5e3cd97398468d624cf907979c2bb12ff7ee7e). Signed-off-by: Ian Jackson --- .gitignore | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 394 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..776e4b2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,394 @@ +.hg +*.orig +*.rej +*~ +*.o +*.d +*.opic +*.a +*.so +*.so.[0-9]* +*.bin +*.bak +*.tmp +*.spot +*.spit +TAGS +cscope.files +cscope.in.out +cscope.out +cscope.po.out +.config + +dist +stubdom/*.tar.gz + +build-* +dist/* +docs/*.aux +docs/*.dvi +docs/*.log +docs/*.pdf +docs/*.ps +docs/*.toc +docs/api/* +docs/figs/xenserver.eps +docs/html/* +docs/interface/WARNINGS +docs/interface/images.pl +docs/interface/images.tex +docs/interface/img1.png +docs/interface/index.html +docs/interface/interface.css +docs/interface/interface.html +docs/interface/labels.pl +docs/man1/ +docs/man5/ +docs/pdf/* +docs/ps/* +docs/user/WARNINGS +docs/user/images.pl +docs/user/images.tex +docs/user/img1.png +docs/user/img2.png +docs/user/img3.png +docs/user/index.html +docs/user/internals.pl +docs/user/labels.pl +docs/user/user.css +docs/user/user.html +docs/xen-api/vm_lifecycle.eps +docs/xen-api/xenapi-datamodel-graph.eps +docs/xen-api/xenapi.out +docs/xen-api/xenapi.dvi +docs/xen-api/xenapi.pdf +docs/xen-api/xenapi.ps +docs/xen-api/xenapi.toc +extras/mini-os/arch/ia64/gen_off.s +extras/mini-os/include/mini-os +extras/mini-os/include/ia64/mini-os +extras/mini-os/include/ia64/offsets.h +extras/mini-os/include/x86/mini-os +extras/mini-os/include/xen +extras/mini-os/include/list.h +extras/mini-os/mini-os* +install/* +linux-[^/]*-paravirt/* +linux-2.6[^/]*/* +linux-[^/]*-rc/* +linux-[^/]*-tip/* +linux-[^/]*-git/* +linux-[^/]*.patch +mkddbxen +netbsd-[^/]*-tools/* +netbsd-[^/]*-xen0/* +netbsd-[^/]*-xenU/* +netbsd-[^/]*.patch +patches/*/.makedep +patches/ebtables-brnf-5_vs_2.4.25.diff +patches/ebtables.diff +patches/tmp/* +pristine-* +ref-* +tmp-* +stubdom/binutils-* +stubdom/cross-root-* +stubdom/gcc-* +stubdom/include +stubdom/ioemu +stubdom/xenstore +stubdom/libxc-* +stubdom/lwip-* +stubdom/mini-os-* +stubdom/mk-headers-* +stubdom/newlib-1.* +stubdom/newlib-x86* +stubdom/pciutils-* +stubdom/zlib-* +stubdom/grub-* +stubdom/ocaml-* +stubdom/lwip/ +stubdom/ioemu/ +stubdom/stubdompath.sh +tools/*/build/lib*/*.py +tools/autom4te.cache +tools/config.h +tools/config.log +tools/config.status +tools/config.cache +config/Tools.mk +tools/blktap2/daemon/blktapctrl +tools/blktap2/drivers/img2qcow +tools/blktap2/drivers/lock-util +tools/blktap2/drivers/qcow-create +tools/blktap2/drivers/qcow2raw +tools/blktap2/drivers/tapdisk +tools/blktap2/drivers/tapdisk-client +tools/blktap2/drivers/tapdisk-diff +tools/blktap2/drivers/tapdisk-stream +tools/blktap2/drivers/tapdisk2 +tools/blktap2/drivers/td-util +tools/blktap2/vhd/vhd-update +tools/blktap2/vhd/vhd-util +tools/blktap/drivers/blktapctrl +tools/blktap/drivers/img2qcow +tools/blktap/drivers/qcow-create +tools/blktap/drivers/qcow2raw +tools/blktap/drivers/tapdisk +tools/check/.* +tools/console/xenconsole +tools/console/xenconsoled +tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* +tools/debugger/gdb/gdb-6.2.1/* +tools/debugger/gdb/gdb-6.2.1.tar.bz2 +tools/debugger/gdbsx/gdbsx +tools/debugger/xenitp/xenitp +tools/firmware/*/biossums +tools/firmware/*.bin +tools/firmware/*.sym +tools/firmware/*bios/*bios*.txt +tools/firmware/etherboot/gpxe/* +tools/firmware/extboot/extboot.img +tools/firmware/extboot/signrom +tools/firmware/hvmloader/acpi/mk_dsdt +tools/firmware/hvmloader/acpi/dsdt*.c +tools/firmware/hvmloader/acpi/dsdt*.asl +tools/firmware/hvmloader/acpi/ssdt_*.h +tools/firmware/hvmloader/hvmloader +tools/firmware/hvmloader/roms.h +tools/firmware/hvmloader/roms.inc +tools/firmware/rombios/BIOS-bochs-[^/]* +tools/firmware/rombios/_rombios[^/]*_.c +tools/firmware/rombios/rombios[^/]*.s +tools/firmware/rombios/32bit/32bitbios_flat.h +tools/firmware/vgabios/vbetables-gen +tools/firmware/vgabios/vbetables.h +tools/flask/utils/flask-getenforce +tools/flask/utils/flask-get-bool +tools/flask/utils/flask-loadpolicy +tools/flask/utils/flask-setenforce +tools/flask/utils/flask-set-bool +tools/flask/utils/flask-label-pci +tools/fs-back/fs-backend +tools/hotplug/common/hotplugpath.sh +tools/include/xen/* +tools/include/xen-foreign/*.(c|h|size) +tools/include/xen-foreign/checker +tools/libxc/ia64/asm/*.h +tools/libxc/ia64/acpi/*.h +tools/libxc/ia64/acpi/platform/*.h +tools/libxc/ia64/dom_fw_asm.S +tools/libxc/ia64/dom_fw_common.c +tools/libxc/ia64/dom_fw_domu.c +tools/libxc/ia64/xen/*.h +tools/libxen/libxenapi- +tools/libxen/test/test_bindings +tools/libxen/test/test_event_handling +tools/libxl/libxlu_cfg_y.output +tools/libxl/xl +tools/libxl/testenum +tools/libxl/testenum.c +tools/libxl/tmp.* +tools/libxl/_libxl.api-for-check +tools/libxl/*.api-ok +tools/libaio/src/*.ol +tools/libaio/src/*.os +tools/misc/cpuperf/cpuperf-perfcntr +tools/misc/cpuperf/cpuperf-xen +tools/misc/lomount/lomount +tools/misc/mbootpack/bin2c +tools/misc/mbootpack/bootsect +tools/misc/mbootpack/bzimage_header.c +tools/misc/mbootpack/mbootpack +tools/misc/mbootpack/setup +tools/misc/miniterm/miniterm +tools/misc/xc_shadow +tools/misc/xen_cpuperf +tools/misc/xen-detect +tools/misc/xen-tmem-list-parse +tools/misc/xenperf +tools/misc/xenpm +tools/misc/xen-hvmctx +tools/misc/gtraceview +tools/misc/gtracestat +tools/misc/xenlockprof +tools/misc/lowmemd +tools/pygrub/build/* +tools/python/build/* +tools/python/xen/util/path.py +tools/remus/imqebt/imqebt +tools/remus/kmod/*(.cmd|.mod|.ko|.mod.c|.symvers|.xen) +tools/security/secpol_tool +tools/security/xen/* +tools/security/xensec_tool +tools/tests/blowfish.bin +tools/tests/blowfish.h +tools/tests/test_x86_emulator +tools/tests/x86_emulate +tools/tests/regression/installed/* +tools/tests/regression/build/* +tools/tests/regression/downloads/* +tools/tests/mem-sharing/memshrtool +tools/tests/mce-test/tools/xen-mceinj +tools/vnet/Make.local +tools/vnet/build/* +tools/vnet/gc +tools/vnet/gc*/* +tools/vnet/vnet-module/*.ko +tools/vnet/vnet-module/.*.cmd +tools/vnet/vnet-module/.tmp_versions/* +tools/vnet/vnet-module/vnet_module.mod.* +tools/vnet/vnetd/vnetd +tools/vtpm/tpm_emulator-*.tar.gz +tools/vtpm/tpm_emulator/* +tools/vtpm/vtpm/* +tools/vtpm_manager/manager/vtpm_managerd +tools/xcutils/lsevtchn +tools/xcutils/xc_restore +tools/xcutils/xc_save +tools/xcutils/readnotes +tools/xenfb/sdlfb +tools/xenfb/vncfb +tools/xenmon/xentrace_setmask +tools/xenmon/xenbaked +tools/xenpaging/xenpaging +tools/xenpmd/xenpmd +tools/xenstat/xentop/xentop +tools/xenstore/testsuite/tmp/* +tools/xenstore/init-xenstore-domain +tools/xenstore/xen +tools/xenstore/xenstore +tools/xenstore/xenstore-chmod +tools/xenstore/xenstore-exists +tools/xenstore/xenstore-list +tools/xenstore/xenstore-read +tools/xenstore/xenstore-rm +tools/xenstore/xenstore-write +tools/xenstore/xenstore-control +tools/xenstore/xenstore-ls +tools/xenstore/xenstored +tools/xenstore/xenstored_test +tools/xenstore/xs_crashme +tools/xenstore/xs_random +tools/xenstore/xs_stress +tools/xenstore/xs_tdb_dump +tools/xenstore/xs_test +tools/xenstore/xs_watch_stress +tools/xentrace/xentrace_setsize +tools/xentrace/tbctl +tools/xentrace/xenctx +tools/xentrace/xentrace +tools/xm-test/ramdisk/buildroot +tools/xm-test/aclocal.m4 +tools/xm-test/autom4te +tools/xm-test/install-sh +tools/xm-test/mkinstalldirs +tools/xm-test/missing +tools/xm-test/config(ure|.log|.status|.guess|.sub) +tools/xm-test/Makefile(.in)* +tools/xm-test/*/Makefile(.in)* +tools/xm-test/lib/XmTestLib/config.py +tools/xm-test/lib/XmTestReport/xmtest.py +tools/xm-test/tests/*.test +tools/ocaml-xenstored* +xen/.banner* +xen/BLOG +xen/System.map +xen/arch/arm/asm-offsets.s +xen/arch/arm/xen.lds +xen/arch/x86/asm-offsets.s +xen/arch/x86/boot/mkelf32 +xen/arch/x86/xen.lds +xen/arch/x86/boot/reloc.S +xen/arch/x86/boot/reloc.bin +xen/arch/x86/boot/reloc.lnk +xen/arch/x86/efi.lds +xen/arch/x86/efi/disabled +xen/arch/x86/efi/mkreloc +xen/ddb/* +xen/include/headers.chk +xen/include/asm +xen/include/asm-*/asm-offsets.h +xen/include/asm-ia64/asm-xsi-offsets.h +xen/include/asm-ia64/.offsets.h.stamp +xen/include/asm-ia64/xen +xen/include/compat/* +xen/include/hypervisor-ifs/arch +xen/include/linux +xen/include/public/public +xen/include/xen/*.new +xen/include/xen/acm_policy.h +xen/include/xen/banner.h +xen/include/xen/compile.h +xen/tools/figlet/figlet +xen/tools/symbols +xen/xen +xen/xen-syms +xen/xen.* +xen/arch/ia64/asm-offsets.s +xen/arch/ia64/asm-xsi-offsets.s +xen/arch/ia64/map.out +xen/arch/ia64/xen.lds.s +unmodified_drivers/linux-2.6/.tmp_versions +unmodified_drivers/linux-2.6/*.cmd +unmodified_drivers/linux-2.6/*.ko +unmodified_drivers/linux-2.6/*.mod.c +LibVNCServer* + +tools/qemu-xen-dir-remote +tools/qemu-xen-dir + +tools/qemu-xen-traditional-dir-remote +tools/qemu-xen-traditional-dir + +tools/firmware/seabios-dir-remote +tools/firmware/seabios-dir + +tools/firmware/rombios/_rombios_.c +tools/firmware/rombios/rombios.s +tools/firmware/rombios/rombios.sym +tools/include/xen-foreign/checker.c +tools/include/xen-foreign/ia64.h +tools/include/xen-foreign/structs.pyc +tools/include/xen-foreign/x86_32.h +tools/include/xen-foreign/x86_64.h + +.git +tools/misc/xen-hptool +tools/libxl/_*.[ch] +tools/libxl/testidl +tools/libxl/testidl.c +tools/libxl/*.pyc +tools/libxl/libxl-save-helper +tools/blktap2/control/tap-ctl +tools/firmware/etherboot/eb-roms.h +tools/firmware/etherboot/gpxe-git-snapshot.tar.gz +tools/misc/xenwatchdogd +tools/misc/xen-hvmcrash +tools/misc/xen-lowmemd +tools/libvchan/vchan-node[12] +tools/ocaml/*/.ocamldep.make +tools/ocaml/*/*.cm[ixao] +tools/ocaml/*/*.cmxa +tools/ocaml/*/*.annot +tools/ocaml/*/*/.ocamldep.make +tools/ocaml/*/*/*.cm[ixao] +tools/ocaml/*/*/*.cmxa +tools/ocaml/*/*/*.annot +tools/ocaml/*/*/META +tools/ocaml/libs/xl/_libxl_types.inc +tools/ocaml/libs/xl/_libxl_types.ml.in +tools/ocaml/libs/xl/_libxl_types.mli.in +tools/ocaml/libs/xl/xenlight.ml +tools/ocaml/libs/xl/xenlight.mli +tools/ocaml/xenstored/oxenstored + +tools/debugger/kdd/kdd +tools/firmware/etherboot/ipxe.tar.gz +tools/firmware/etherboot/ipxe/ +tools/python/xen/lowlevel/xl/_pyxl_types.c +tools/python/xen/lowlevel/xl/_pyxl_types.h +tools/xenstore/xenstore-watch + +docs/txt/misc/*.txt +docs/txt/man/*.txt -- 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 Mon Mar 04 09:22:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Mar 2013 09: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 1UCRb2-0000AD-8B; Mon, 04 Mar 2013 09:22:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UCRb1-0000A4-8O for xen-changelog@lists.xensource.com; Mon, 04 Mar 2013 09:22:11 +0000 Received: from [193.109.254.147:37512] by server-14.bemta-14.messagelabs.com id 5B/12-05867-2C764315; Mon, 04 Mar 2013 09:22:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1362388923!8546659!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24854 invoked from network); 4 Mar 2013 09:22:05 -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; 4 Mar 2013 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UCRat-0001DQ-CC for xen-changelog@lists.xensource.com; Mon, 04 Mar 2013 09:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UCRat-0002TC-1U for xen-changelog@lists.xensource.com; Mon, 04 Mar 2013 09:22:03 +0000 Message-Id: Date: Mon, 04 Mar 2013 09: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] x86-64: fix HYPERVISOR_iret unwind annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1362388145 -3600 # Node ID 805186ebb4ab418f1ff968a634a59d7658ba126c # Parent 28e95bbec82172230b27c9cdb8bfa8aa0d342bbc x86-64: fix HYPERVISOR_iret unwind annotation Minimally for %rax this needs to reflect that the value is no longer saved: Since the whole hypercall page is covered by a single FDE, subsequent entries would otherwise retain the state of %rax being saved on the stack, yet the offset it's being saved at is out of bounds for the "normal" hypercall stubs. Breaking up the single FDE into per stub ones would increase the size of the resulting .eh_frame section, which is already quite big for this simple a piece of code. Signed-off-by: Jan Beulich --- diff -r 28e95bbec821 -r 805186ebb4ab arch/x86_64/kernel/head-xen.S --- a/arch/x86_64/kernel/head-xen.S Wed Feb 27 11:21:03 2013 +0100 +++ b/arch/x86_64/kernel/head-xen.S Mon Mar 04 10:09:05 2013 +0100 @@ -98,6 +98,9 @@ NEXT_PAGE(hypercall_page) .skip 2 /* syscall */ .if i == __HYPERVISOR_iret CFI_ADJUST_CFA_OFFSET -3*8 + CFI_SAME_VALUE rax + CFI_SAME_VALUE r11 + CFI_SAME_VALUE rcx .else .skip 2 /* pop %r11 */ CFI_ADJUST_CFA_OFFSET -8 diff -r 28e95bbec821 -r 805186ebb4ab include/asm-x86_64/dwarf2.h --- a/include/asm-x86_64/dwarf2.h Wed Feb 27 11:21:03 2013 +0100 +++ b/include/asm-x86_64/dwarf2.h Mon Mar 04 10:09:05 2013 +0100 @@ -28,6 +28,7 @@ #define CFI_REMEMBER_STATE .cfi_remember_state #define CFI_RESTORE_STATE .cfi_restore_state #define CFI_UNDEFINED .cfi_undefined +#define CFI_SAME_VALUE .cfi_same_value #else @@ -45,6 +46,7 @@ #define CFI_REMEMBER_STATE # #define CFI_RESTORE_STATE # #define CFI_UNDEFINED # +#define CFI_SAME_VALUE # #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 04 09:22:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Mar 2013 09: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 1UCRb2-0000AD-8B; Mon, 04 Mar 2013 09:22:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UCRb1-0000A4-8O for xen-changelog@lists.xensource.com; Mon, 04 Mar 2013 09:22:11 +0000 Received: from [193.109.254.147:37512] by server-14.bemta-14.messagelabs.com id 5B/12-05867-2C764315; Mon, 04 Mar 2013 09:22:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1362388923!8546659!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24854 invoked from network); 4 Mar 2013 09:22:05 -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; 4 Mar 2013 09:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UCRat-0001DQ-CC for xen-changelog@lists.xensource.com; Mon, 04 Mar 2013 09:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UCRat-0002TC-1U for xen-changelog@lists.xensource.com; Mon, 04 Mar 2013 09:22:03 +0000 Message-Id: Date: Mon, 04 Mar 2013 09: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] x86-64: fix HYPERVISOR_iret unwind annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1362388145 -3600 # Node ID 805186ebb4ab418f1ff968a634a59d7658ba126c # Parent 28e95bbec82172230b27c9cdb8bfa8aa0d342bbc x86-64: fix HYPERVISOR_iret unwind annotation Minimally for %rax this needs to reflect that the value is no longer saved: Since the whole hypercall page is covered by a single FDE, subsequent entries would otherwise retain the state of %rax being saved on the stack, yet the offset it's being saved at is out of bounds for the "normal" hypercall stubs. Breaking up the single FDE into per stub ones would increase the size of the resulting .eh_frame section, which is already quite big for this simple a piece of code. Signed-off-by: Jan Beulich --- diff -r 28e95bbec821 -r 805186ebb4ab arch/x86_64/kernel/head-xen.S --- a/arch/x86_64/kernel/head-xen.S Wed Feb 27 11:21:03 2013 +0100 +++ b/arch/x86_64/kernel/head-xen.S Mon Mar 04 10:09:05 2013 +0100 @@ -98,6 +98,9 @@ NEXT_PAGE(hypercall_page) .skip 2 /* syscall */ .if i == __HYPERVISOR_iret CFI_ADJUST_CFA_OFFSET -3*8 + CFI_SAME_VALUE rax + CFI_SAME_VALUE r11 + CFI_SAME_VALUE rcx .else .skip 2 /* pop %r11 */ CFI_ADJUST_CFA_OFFSET -8 diff -r 28e95bbec821 -r 805186ebb4ab include/asm-x86_64/dwarf2.h --- a/include/asm-x86_64/dwarf2.h Wed Feb 27 11:21:03 2013 +0100 +++ b/include/asm-x86_64/dwarf2.h Mon Mar 04 10:09:05 2013 +0100 @@ -28,6 +28,7 @@ #define CFI_REMEMBER_STATE .cfi_remember_state #define CFI_RESTORE_STATE .cfi_restore_state #define CFI_UNDEFINED .cfi_undefined +#define CFI_SAME_VALUE .cfi_same_value #else @@ -45,6 +46,7 @@ #define CFI_REMEMBER_STATE # #define CFI_RESTORE_STATE # #define CFI_UNDEFINED # +#define CFI_SAME_VALUE # #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 08 07:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDrnf-0007jN-6b; Fri, 08 Mar 2013 07:33:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrne-0007jG-DD for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:06 +0000 Received: from [85.158.143.99:41807] by server-1.bemta-4.messagelabs.com id 8D/1A-06203-13499315; Fri, 08 Mar 2013 07:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1362727983!21103081!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26046 invoked from network); 8 Mar 2013 07:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnb-0003As-EU for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrna-0007Pp-Vc for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:03 +0000 Date: Fri, 08 Mar 2013 07:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/libxl: Improve videoram setting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18718c3abd4e287844004b7a988704ecdb71c682 Author: Fabio Fantoni AuthorDate: Fri Mar 1 13:22:21 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 4 17:30:51 2013 +0000 tools/libxl: Improve videoram setting - If videoram setting is less than 8 mb shows error and exit. - Added videoram setting for qemu upstream with cirrus (added in qemu 1.3). - Updated xl.cfg man. - Default and minimal videoram changed to 16 mb if stdvga is set and upstream qemu is being used. This is required by qemu 1.4 to avoid a xen memory error (qemu 1.3 doesn't complain about it, probably buggy). Signed-off-by: Fabio Fantoni Acked-by: Stefano Stabellini Committed-by: Ian Campbell Cherry picked from xen-unstable 2e814a017155b885e4d4b5a88dc05e7367a9722a, backport as follows: Signed-off-by: Fabio Fantoni Acked-by: Ian Jackson --- docs/man/xl.cfg.pod.5 | 14 +++++--------- tools/libxl/libxl_create.c | 20 ++++++++++++++++++-- tools/libxl/libxl_dm.c | 6 ++++++ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index a8b635b..4f7b583 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -739,19 +739,15 @@ in the B for configuring virtual frame buffer devices Sets the amount of RAM which the emulated video card will contain, which in turn limits the resolutions and bit depths which will be -available. This option is only available when using the B -option (see below). +available. The default amount of video ram for stdvga is 8MB which is sufficient -for e.g. 1600x1200 at 32bpp. +for e.g. 1600x1200 at 32bpp and videoram option is currently working +only when using the qemu-xen-traditional device-model. When using the emulated Cirrus graphics card (B) the amount of video ram is fixed at 4MB which is sufficient -for 1024x768 at 32 bpp. - -videoram option is currently only available when using the -qemu-xen-traditional device-model. Upstream qemu-xen device-model -currently doesn't support changing the amount of video memory -for the emulated graphics device. +for 1024x768 at 32 bpp and videoram option is currently working +only when using the upstream qemu-xen device-model. =item B diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 89f4e0a..e9a5148 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -232,8 +232,24 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, case LIBXL_DOMAIN_TYPE_HVM: if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 8 * 1024; + + if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD && + b_info->device_model_version == + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 16 * 1024; + else if (b_info->video_memkb < (16 * 1024) ){ + LOG(ERROR, + "videoram must be at least 16 mb with stdvga"); + return ERROR_INVAL; + } + } else if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 8 * 1024; + else if (b_info->video_memkb < (8 * 1024) ){ + LOG(ERROR,"videoram must be at least 8 mb"); + return ERROR_INVAL; + } + if (b_info->u.hvm.timer_mode == LIBXL_TIMER_MODE_DEFAULT) b_info->u.hvm.timer_mode = LIBXL_TIMER_MODE_NO_DELAY_FOR_MISSED_TICKS; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 7662b3d..423e4a4 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -435,6 +435,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, break; case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: flexarray_vappend(dm_args, "-vga", "cirrus", NULL); + if (b_info->video_memkb) { + flexarray_vappend(dm_args, "-global", + libxl__sprintf(gc, "vga.vram_size_mb=%d", + libxl__sizekb_to_mb(b_info->video_memkb)), + NULL); + } break; } -- 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 Mar 08 07:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDrnf-0007jN-6b; Fri, 08 Mar 2013 07:33:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrne-0007jG-DD for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:06 +0000 Received: from [85.158.143.99:41807] by server-1.bemta-4.messagelabs.com id 8D/1A-06203-13499315; Fri, 08 Mar 2013 07:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1362727983!21103081!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26046 invoked from network); 8 Mar 2013 07:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnb-0003As-EU for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrna-0007Pp-Vc for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:03 +0000 Date: Fri, 08 Mar 2013 07:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/libxl: Improve videoram setting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18718c3abd4e287844004b7a988704ecdb71c682 Author: Fabio Fantoni AuthorDate: Fri Mar 1 13:22:21 2013 +0000 Commit: Ian Jackson CommitDate: Mon Mar 4 17:30:51 2013 +0000 tools/libxl: Improve videoram setting - If videoram setting is less than 8 mb shows error and exit. - Added videoram setting for qemu upstream with cirrus (added in qemu 1.3). - Updated xl.cfg man. - Default and minimal videoram changed to 16 mb if stdvga is set and upstream qemu is being used. This is required by qemu 1.4 to avoid a xen memory error (qemu 1.3 doesn't complain about it, probably buggy). Signed-off-by: Fabio Fantoni Acked-by: Stefano Stabellini Committed-by: Ian Campbell Cherry picked from xen-unstable 2e814a017155b885e4d4b5a88dc05e7367a9722a, backport as follows: Signed-off-by: Fabio Fantoni Acked-by: Ian Jackson --- docs/man/xl.cfg.pod.5 | 14 +++++--------- tools/libxl/libxl_create.c | 20 ++++++++++++++++++-- tools/libxl/libxl_dm.c | 6 ++++++ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index a8b635b..4f7b583 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -739,19 +739,15 @@ in the B for configuring virtual frame buffer devices Sets the amount of RAM which the emulated video card will contain, which in turn limits the resolutions and bit depths which will be -available. This option is only available when using the B -option (see below). +available. The default amount of video ram for stdvga is 8MB which is sufficient -for e.g. 1600x1200 at 32bpp. +for e.g. 1600x1200 at 32bpp and videoram option is currently working +only when using the qemu-xen-traditional device-model. When using the emulated Cirrus graphics card (B) the amount of video ram is fixed at 4MB which is sufficient -for 1024x768 at 32 bpp. - -videoram option is currently only available when using the -qemu-xen-traditional device-model. Upstream qemu-xen device-model -currently doesn't support changing the amount of video memory -for the emulated graphics device. +for 1024x768 at 32 bpp and videoram option is currently working +only when using the upstream qemu-xen device-model. =item B diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 89f4e0a..e9a5148 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -232,8 +232,24 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, case LIBXL_DOMAIN_TYPE_HVM: if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 8 * 1024; + + if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD && + b_info->device_model_version == + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 16 * 1024; + else if (b_info->video_memkb < (16 * 1024) ){ + LOG(ERROR, + "videoram must be at least 16 mb with stdvga"); + return ERROR_INVAL; + } + } else if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 8 * 1024; + else if (b_info->video_memkb < (8 * 1024) ){ + LOG(ERROR,"videoram must be at least 8 mb"); + return ERROR_INVAL; + } + if (b_info->u.hvm.timer_mode == LIBXL_TIMER_MODE_DEFAULT) b_info->u.hvm.timer_mode = LIBXL_TIMER_MODE_NO_DELAY_FOR_MISSED_TICKS; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 7662b3d..423e4a4 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -435,6 +435,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, break; case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: flexarray_vappend(dm_args, "-vga", "cirrus", NULL); + if (b_info->video_memkb) { + flexarray_vappend(dm_args, "-global", + libxl__sprintf(gc, "vga.vram_size_mb=%d", + libxl__sizekb_to_mb(b_info->video_memkb)), + NULL); + } break; } -- 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 Mar 08 07:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDrnq-0007k3-9c; Fri, 08 Mar 2013 07:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnp-0007jw-5A for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:17 +0000 Received: from [193.109.254.147:56994] by server-15.bemta-14.messagelabs.com id AF/A4-14305-C3499315; Fri, 08 Mar 2013 07:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1362727994!814370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16923 invoked from network); 8 Mar 2013 07:33:15 -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; 8 Mar 2013 07:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnl-0003Av-Vh for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrnl-0007Qj-HO for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:13 +0000 Date: Fri, 08 Mar 2013 07:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mm: Take the p2m lock even in shadow mode. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c4cd2c6a0e1795c837dd0cfb15db08a5d6694eb Author: Tim Deegan AuthorDate: Thu Mar 7 17:55:16 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:55:16 2013 +0100 x86/mm: Take the p2m lock even in shadow mode. The reworking of p2m lookups to use get_gfn()/put_gfn() left the shadow code not taking the p2m lock, even in cases where the p2m would be updated (i.e. PoD). In many cases, shadow code doesn't need the exclusion that get_gfn()/put_gfn() provides, as it has its own interlocks against p2m updates, but this is taking things too far, and can lead to crashes in the PoD code. Now that most shadow-code p2m lookups are done with explicitly unlocked accessors, or with the get_page_from_gfn() accessor, which is often lock-free, we can just turn this locking on. The remaining locked lookups are in sh_page_fault() (in a path that's almost always already serializing on the paging lock), and in emulate_map_dest() (which can probably be updated to use get_page_from_gfn()). They're not addressed here but may be in a follow-up patch. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla master changeset: a15d87475ed95840dba693ab0a56d0b48a215cbc master date: 2013-02-21 15:16:20 +0000 --- xen/arch/x86/mm/p2m.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 674fa05..e111d64 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -163,8 +163,7 @@ mfn_t __get_gfn_type_access(struct p2m_domain *p2m, unsigned long gfn, return _mfn(gfn); } - /* For now only perform locking on hap domains */ - if ( locked && (hap_enabled(p2m->domain)) ) + if ( locked ) /* Grab the lock here, don't release until put_gfn */ gfn_lock(p2m, gfn, 0); @@ -197,8 +196,7 @@ mfn_t __get_gfn_type_access(struct p2m_domain *p2m, unsigned long gfn, void __put_gfn(struct p2m_domain *p2m, unsigned long gfn) { - if ( !p2m || !paging_mode_translate(p2m->domain) - || !hap_enabled(p2m->domain) ) + if ( !p2m || !paging_mode_translate(p2m->domain) ) /* Nothing to do in this case */ return; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 08 07:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDrnq-0007k3-9c; Fri, 08 Mar 2013 07:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnp-0007jw-5A for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:17 +0000 Received: from [193.109.254.147:56994] by server-15.bemta-14.messagelabs.com id AF/A4-14305-C3499315; Fri, 08 Mar 2013 07:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1362727994!814370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16923 invoked from network); 8 Mar 2013 07:33:15 -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; 8 Mar 2013 07:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnl-0003Av-Vh for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrnl-0007Qj-HO for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:13 +0000 Date: Fri, 08 Mar 2013 07:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mm: Take the p2m lock even in shadow mode. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c4cd2c6a0e1795c837dd0cfb15db08a5d6694eb Author: Tim Deegan AuthorDate: Thu Mar 7 17:55:16 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:55:16 2013 +0100 x86/mm: Take the p2m lock even in shadow mode. The reworking of p2m lookups to use get_gfn()/put_gfn() left the shadow code not taking the p2m lock, even in cases where the p2m would be updated (i.e. PoD). In many cases, shadow code doesn't need the exclusion that get_gfn()/put_gfn() provides, as it has its own interlocks against p2m updates, but this is taking things too far, and can lead to crashes in the PoD code. Now that most shadow-code p2m lookups are done with explicitly unlocked accessors, or with the get_page_from_gfn() accessor, which is often lock-free, we can just turn this locking on. The remaining locked lookups are in sh_page_fault() (in a path that's almost always already serializing on the paging lock), and in emulate_map_dest() (which can probably be updated to use get_page_from_gfn()). They're not addressed here but may be in a follow-up patch. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla master changeset: a15d87475ed95840dba693ab0a56d0b48a215cbc master date: 2013-02-21 15:16:20 +0000 --- xen/arch/x86/mm/p2m.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 674fa05..e111d64 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -163,8 +163,7 @@ mfn_t __get_gfn_type_access(struct p2m_domain *p2m, unsigned long gfn, return _mfn(gfn); } - /* For now only perform locking on hap domains */ - if ( locked && (hap_enabled(p2m->domain)) ) + if ( locked ) /* Grab the lock here, don't release until put_gfn */ gfn_lock(p2m, gfn, 0); @@ -197,8 +196,7 @@ mfn_t __get_gfn_type_access(struct p2m_domain *p2m, unsigned long gfn, void __put_gfn(struct p2m_domain *p2m, unsigned long gfn) { - if ( !p2m || !paging_mode_translate(p2m->domain) - || !hap_enabled(p2m->domain) ) + if ( !p2m || !paging_mode_translate(p2m->domain) ) /* Nothing to do in this case */ return; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 08 07:33:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDro1-0007l0-D7; Fri, 08 Mar 2013 07:33:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDro0-0007ks-MA for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:28 +0000 Received: from [85.158.139.83:18624] by server-16.bemta-5.messagelabs.com id C7/66-02543-74499315; Fri, 08 Mar 2013 07:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1362728004!27245412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16932 invoked from network); 8 Mar 2013 07:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnw-0003B1-Bo for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrnw-0007R7-2G for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:24 +0000 Date: Fri, 08 Mar 2013 07:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/nhvm: properly clean up after failure to set up all vCPU-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 4b0ac057e3bcae70a109da0610e1dd2e270aec8a Author: Jan Beulich AuthorDate: Thu Mar 7 17:57:02 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:57:02 2013 +0100 x86/nhvm: properly clean up after failure to set up all vCPU-s Otherwise we may leak memory when setting up nHVM fails half way. This implies that the individual destroy functions will have to remain capable (in the VMX case they first need to be made so, following 26486:7648ef657fe7 and 26489:83a3fa9c8434) of being called for a vCPU that the corresponding init function was never run on. Once at it, also remove a redundant check from the corresponding parameter validation code. Signed-off-by: Jan Beulich Acked-by: Tim Deegan Tested-by: Olaf Hering master changeset: 17281aea1a9a10f1ee165c6e6a2921a67b7b1df2 master date: 2013-02-22 11:21:38 +0100 --- xen/arch/x86/hvm/hvm.c | 8 +++++--- xen/arch/x86/hvm/nestedhvm.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2d4acb1..3d471a5 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3873,18 +3873,20 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) #else if ( a.value > 1 ) rc = -EINVAL; - if ( !is_hvm_domain(d) ) - rc = -EINVAL; /* Remove the check below once we have * shadow-on-shadow. */ if ( cpu_has_svm && !paging_mode_hap(d) && a.value ) rc = -EINVAL; /* Set up NHVM state for any vcpus that are already up */ - if ( !d->arch.hvm_domain.params[HVM_PARAM_NESTEDHVM] ) + if ( a.value && + !d->arch.hvm_domain.params[HVM_PARAM_NESTEDHVM] ) for_each_vcpu(d, v) if ( rc == 0 ) rc = nestedhvm_vcpu_initialise(v); + if ( !a.value || rc ) + for_each_vcpu(d, v) + nestedhvm_vcpu_destroy(v); #endif break; case HVM_PARAM_BUFIOREQ_EVTCHN: diff --git a/xen/arch/x86/hvm/nestedhvm.c b/xen/arch/x86/hvm/nestedhvm.c index ba0bb8b..5153a4a 100644 --- a/xen/arch/x86/hvm/nestedhvm.c +++ b/xen/arch/x86/hvm/nestedhvm.c @@ -88,7 +88,7 @@ nestedhvm_vcpu_initialise(struct vcpu *v) void nestedhvm_vcpu_destroy(struct vcpu *v) { - if ( nestedhvm_enabled(v->domain) && hvm_funcs.nhvm_vcpu_destroy ) + if ( hvm_funcs.nhvm_vcpu_destroy ) hvm_funcs.nhvm_vcpu_destroy(v); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 08 07:33:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDro1-0007l0-D7; Fri, 08 Mar 2013 07:33:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDro0-0007ks-MA for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:28 +0000 Received: from [85.158.139.83:18624] by server-16.bemta-5.messagelabs.com id C7/66-02543-74499315; Fri, 08 Mar 2013 07:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1362728004!27245412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16932 invoked from network); 8 Mar 2013 07:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrnw-0003B1-Bo for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrnw-0007R7-2G for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:24 +0000 Date: Fri, 08 Mar 2013 07:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/nhvm: properly clean up after failure to set up all vCPU-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 4b0ac057e3bcae70a109da0610e1dd2e270aec8a Author: Jan Beulich AuthorDate: Thu Mar 7 17:57:02 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:57:02 2013 +0100 x86/nhvm: properly clean up after failure to set up all vCPU-s Otherwise we may leak memory when setting up nHVM fails half way. This implies that the individual destroy functions will have to remain capable (in the VMX case they first need to be made so, following 26486:7648ef657fe7 and 26489:83a3fa9c8434) of being called for a vCPU that the corresponding init function was never run on. Once at it, also remove a redundant check from the corresponding parameter validation code. Signed-off-by: Jan Beulich Acked-by: Tim Deegan Tested-by: Olaf Hering master changeset: 17281aea1a9a10f1ee165c6e6a2921a67b7b1df2 master date: 2013-02-22 11:21:38 +0100 --- xen/arch/x86/hvm/hvm.c | 8 +++++--- xen/arch/x86/hvm/nestedhvm.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2d4acb1..3d471a5 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3873,18 +3873,20 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) #else if ( a.value > 1 ) rc = -EINVAL; - if ( !is_hvm_domain(d) ) - rc = -EINVAL; /* Remove the check below once we have * shadow-on-shadow. */ if ( cpu_has_svm && !paging_mode_hap(d) && a.value ) rc = -EINVAL; /* Set up NHVM state for any vcpus that are already up */ - if ( !d->arch.hvm_domain.params[HVM_PARAM_NESTEDHVM] ) + if ( a.value && + !d->arch.hvm_domain.params[HVM_PARAM_NESTEDHVM] ) for_each_vcpu(d, v) if ( rc == 0 ) rc = nestedhvm_vcpu_initialise(v); + if ( !a.value || rc ) + for_each_vcpu(d, v) + nestedhvm_vcpu_destroy(v); #endif break; case HVM_PARAM_BUFIOREQ_EVTCHN: diff --git a/xen/arch/x86/hvm/nestedhvm.c b/xen/arch/x86/hvm/nestedhvm.c index ba0bb8b..5153a4a 100644 --- a/xen/arch/x86/hvm/nestedhvm.c +++ b/xen/arch/x86/hvm/nestedhvm.c @@ -88,7 +88,7 @@ nestedhvm_vcpu_initialise(struct vcpu *v) void nestedhvm_vcpu_destroy(struct vcpu *v) { - if ( nestedhvm_enabled(v->domain) && hvm_funcs.nhvm_vcpu_destroy ) + if ( hvm_funcs.nhvm_vcpu_destroy ) hvm_funcs.nhvm_vcpu_destroy(v); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 08 07:33:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDroA-0007mR-G5; Fri, 08 Mar 2013 07: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 1UDro9-0007mA-CE for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:37 +0000 Received: from [85.158.139.211:21604] by server-13.bemta-5.messagelabs.com id 41/AD-16871-05499315; Fri, 08 Mar 2013 07:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1362728014!18158884!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 789 invoked from network); 8 Mar 2013 07:33:35 -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; 8 Mar 2013 07:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDro6-0003B9-GM for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDro6-0007RX-Ej for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:34 +0000 Date: Fri, 08 Mar 2013 07:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] honor ACPI v4 FADT flags X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ae14344658bb3eaad1618d9ad29a57cedbd74ea Author: Jan Beulich AuthorDate: Thu Mar 7 17:58:19 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:58:19 2013 +0100 honor ACPI v4 FADT flags - force use of physical APIC mode if indicated so (as we don't support xAPIC cluster mode, the respective flag is taken to force physical mode too) - don't use MSI if indicated so (implies no IOMMU) Both can be overridden on the command line, for the MSI case this at once adds a new command line option allowing to turn off PCI MSI (IOMMU and HPET are unaffected by this). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: 992fdf6f46252a459c6b1b8d971b2c71f01460f8 master date: 2013-02-22 11:56:54 +0100 --- docs/misc/xen-command-line.markdown | 7 +++++++ xen/arch/x86/genapic/bigsmp.c | 9 ++++++++- xen/arch/x86/genapic/x2apic.c | 9 ++++++--- xen/arch/x86/msi.c | 16 ++++++++++++++-- xen/drivers/passthrough/amd/iommu_acpi.c | 3 +++ xen/drivers/passthrough/vtd/iommu.c | 6 ++++++ 6 files changed, 44 insertions(+), 6 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index ef411e1..fe6ae84 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -594,6 +594,13 @@ limit is ignored by Xen. Specify if the MMConfig space should be enabled. +### msi +> `= ` + +> Default: `true` + +Force Xen to (not) use PCI-MSI, even if ACPI FADT says otherwise. + ### nmi > `= ignore | dom0 | fatal` diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c index 62d255e..96b23d6 100644 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -40,7 +40,14 @@ static struct dmi_system_id __initdata bigsmp_dmi_table[] = { static __init int probe_bigsmp(void) { - if (!def_to_bigsmp) + /* + * We don't implement cluster mode, so force use of + * physical mode in both cases. + */ + if (acpi_gbl_FADT.flags & + (ACPI_FADT_APIC_CLUSTER | ACPI_FADT_APIC_PHYSICAL)) + def_to_bigsmp = 1; + else if (!def_to_bigsmp) dmi_check_system(bigsmp_dmi_table); return def_to_bigsmp; } diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index bfddc1e..2c54e7e 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -29,9 +29,6 @@ #include #include -static bool_t __initdata x2apic_phys; /* By default we use logical cluster mode. */ -boolean_param("x2apic_phys", x2apic_phys); - static void init_apic_ldr_x2apic_phys(void) { } @@ -121,8 +118,14 @@ static const struct genapic apic_x2apic_cluster = { .send_IPI_self = send_IPI_self_x2apic }; +static s8 __initdata x2apic_phys = -1; /* By default we use logical cluster mode. */ +boolean_param("x2apic_phys", x2apic_phys); + const struct genapic *__init apic_x2apic_probe(void) { + if ( x2apic_phys < 0 ) + x2apic_phys = !!(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL); + return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index f982c45..7730641 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -31,6 +31,9 @@ #include #include +static s8 __read_mostly use_msi = -1; +boolean_param("msi", use_msi); + /* bitmap indicate which fixed map is free */ DEFINE_SPINLOCK(msix_fixmap_lock); DECLARE_BITMAP(msix_fixmap_pages, FIX_MSIX_MAX_PAGES); @@ -958,6 +961,9 @@ int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) { ASSERT(spin_is_locked(&pcidevs_lock)); + if ( !use_msi ) + return -EPERM; + return msi->table_base ? __pci_enable_msix(msi, desc) : __pci_enable_msi(msi, desc); } @@ -1003,7 +1009,10 @@ int pci_restore_msi_state(struct pci_dev *pdev) ASSERT(spin_is_locked(&pcidevs_lock)); - if (!pdev) + if ( !use_msi ) + return -EOPNOTSUPP; + + if ( !pdev ) return -EINVAL; ret = xsm_resource_setup_pci((pdev->seg << 16) | (pdev->bus << 8) | pdev->devfn); @@ -1062,7 +1071,7 @@ unsigned int pci_msix_get_table_len(struct pci_dev *pdev) func = PCI_FUNC(pdev->devfn); pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); - if ( !pos ) + if ( !pos || !use_msi ) return 0; control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); @@ -1135,6 +1144,9 @@ static struct keyhandler dump_msi_keyhandler = { static int __init msi_setup_keyhandler(void) { + if ( use_msi < 0 ) + use_msi = !(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI); + register_keyhandler('M', &dump_msi_keyhandler); return 0; } diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index da7d576..7205a5f 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -1066,5 +1066,8 @@ int __init amd_iommu_get_ivrs_dev_entries(void) int __init amd_iommu_update_ivrs_mapping_acpi(void) { + if ( unlikely(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI) ) + return -EPERM; + return acpi_table_parse(ACPI_SIG_IVRS, parse_ivrs_table); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index e4f464a..b34081a 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2133,6 +2133,12 @@ int __init intel_vtd_setup(void) if ( list_empty(&acpi_drhd_units) ) return -ENODEV; + if ( unlikely(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI) ) + { + ret = -EPERM; + goto error; + } + platform_quirks_init(); /* We enable the following features only if they are supported by all VT-d -- 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 Mar 08 07:33:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:33: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 1UDroA-0007mR-G5; Fri, 08 Mar 2013 07: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 1UDro9-0007mA-CE for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:37 +0000 Received: from [85.158.139.211:21604] by server-13.bemta-5.messagelabs.com id 41/AD-16871-05499315; Fri, 08 Mar 2013 07:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1362728014!18158884!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 789 invoked from network); 8 Mar 2013 07:33:35 -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; 8 Mar 2013 07:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDro6-0003B9-GM for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDro6-0007RX-Ej for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:34 +0000 Date: Fri, 08 Mar 2013 07:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] honor ACPI v4 FADT flags X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ae14344658bb3eaad1618d9ad29a57cedbd74ea Author: Jan Beulich AuthorDate: Thu Mar 7 17:58:19 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:58:19 2013 +0100 honor ACPI v4 FADT flags - force use of physical APIC mode if indicated so (as we don't support xAPIC cluster mode, the respective flag is taken to force physical mode too) - don't use MSI if indicated so (implies no IOMMU) Both can be overridden on the command line, for the MSI case this at once adds a new command line option allowing to turn off PCI MSI (IOMMU and HPET are unaffected by this). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: 992fdf6f46252a459c6b1b8d971b2c71f01460f8 master date: 2013-02-22 11:56:54 +0100 --- docs/misc/xen-command-line.markdown | 7 +++++++ xen/arch/x86/genapic/bigsmp.c | 9 ++++++++- xen/arch/x86/genapic/x2apic.c | 9 ++++++--- xen/arch/x86/msi.c | 16 ++++++++++++++-- xen/drivers/passthrough/amd/iommu_acpi.c | 3 +++ xen/drivers/passthrough/vtd/iommu.c | 6 ++++++ 6 files changed, 44 insertions(+), 6 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index ef411e1..fe6ae84 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -594,6 +594,13 @@ limit is ignored by Xen. Specify if the MMConfig space should be enabled. +### msi +> `= ` + +> Default: `true` + +Force Xen to (not) use PCI-MSI, even if ACPI FADT says otherwise. + ### nmi > `= ignore | dom0 | fatal` diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c index 62d255e..96b23d6 100644 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -40,7 +40,14 @@ static struct dmi_system_id __initdata bigsmp_dmi_table[] = { static __init int probe_bigsmp(void) { - if (!def_to_bigsmp) + /* + * We don't implement cluster mode, so force use of + * physical mode in both cases. + */ + if (acpi_gbl_FADT.flags & + (ACPI_FADT_APIC_CLUSTER | ACPI_FADT_APIC_PHYSICAL)) + def_to_bigsmp = 1; + else if (!def_to_bigsmp) dmi_check_system(bigsmp_dmi_table); return def_to_bigsmp; } diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index bfddc1e..2c54e7e 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -29,9 +29,6 @@ #include #include -static bool_t __initdata x2apic_phys; /* By default we use logical cluster mode. */ -boolean_param("x2apic_phys", x2apic_phys); - static void init_apic_ldr_x2apic_phys(void) { } @@ -121,8 +118,14 @@ static const struct genapic apic_x2apic_cluster = { .send_IPI_self = send_IPI_self_x2apic }; +static s8 __initdata x2apic_phys = -1; /* By default we use logical cluster mode. */ +boolean_param("x2apic_phys", x2apic_phys); + const struct genapic *__init apic_x2apic_probe(void) { + if ( x2apic_phys < 0 ) + x2apic_phys = !!(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL); + return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index f982c45..7730641 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -31,6 +31,9 @@ #include #include +static s8 __read_mostly use_msi = -1; +boolean_param("msi", use_msi); + /* bitmap indicate which fixed map is free */ DEFINE_SPINLOCK(msix_fixmap_lock); DECLARE_BITMAP(msix_fixmap_pages, FIX_MSIX_MAX_PAGES); @@ -958,6 +961,9 @@ int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc) { ASSERT(spin_is_locked(&pcidevs_lock)); + if ( !use_msi ) + return -EPERM; + return msi->table_base ? __pci_enable_msix(msi, desc) : __pci_enable_msi(msi, desc); } @@ -1003,7 +1009,10 @@ int pci_restore_msi_state(struct pci_dev *pdev) ASSERT(spin_is_locked(&pcidevs_lock)); - if (!pdev) + if ( !use_msi ) + return -EOPNOTSUPP; + + if ( !pdev ) return -EINVAL; ret = xsm_resource_setup_pci((pdev->seg << 16) | (pdev->bus << 8) | pdev->devfn); @@ -1062,7 +1071,7 @@ unsigned int pci_msix_get_table_len(struct pci_dev *pdev) func = PCI_FUNC(pdev->devfn); pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSIX); - if ( !pos ) + if ( !pos || !use_msi ) return 0; control = pci_conf_read16(seg, bus, slot, func, msix_control_reg(pos)); @@ -1135,6 +1144,9 @@ static struct keyhandler dump_msi_keyhandler = { static int __init msi_setup_keyhandler(void) { + if ( use_msi < 0 ) + use_msi = !(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI); + register_keyhandler('M', &dump_msi_keyhandler); return 0; } diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index da7d576..7205a5f 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -1066,5 +1066,8 @@ int __init amd_iommu_get_ivrs_dev_entries(void) int __init amd_iommu_update_ivrs_mapping_acpi(void) { + if ( unlikely(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI) ) + return -EPERM; + return acpi_table_parse(ACPI_SIG_IVRS, parse_ivrs_table); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index e4f464a..b34081a 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2133,6 +2133,12 @@ int __init intel_vtd_setup(void) if ( list_empty(&acpi_drhd_units) ) return -ENODEV; + if ( unlikely(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI) ) + { + ret = -EPERM; + goto error; + } + platform_quirks_init(); /* We enable the following features only if they are supported by all VT-d -- 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 Mar 08 07:33:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07: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 1UDroK-0007oP-JK; Fri, 08 Mar 2013 07:33:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroJ-0007nv-B6 for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:47 +0000 Received: from [85.158.139.211:9906] by server-7.bemta-5.messagelabs.com id C0/84-12441-A5499315; Fri, 08 Mar 2013 07:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1362728025!16940021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3298 invoked from network); 8 Mar 2013 07:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroG-0003BF-Nv for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDroG-0007Rv-Ix for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:44 +0000 Date: Fri, 08 Mar 2013 07:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: fix null pointer dereference in intel_get_extended_msrs() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf739695ce8b18718e4bc80946f360488122e349 Author: Xi Wang AuthorDate: Thu Mar 7 17:59:21 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:59:21 2013 +0100 x86: fix null pointer dereference in intel_get_extended_msrs() `memset(&mc_ext, 0, ...)' leads to a buffer overflow and a subsequent null pointer dereference. Replace `&mc_ext' with `mc_ext'. Signed-off-by: Xi Wang master changeset: c40e24a8ef74f9d0ee59dd9b8ca890be08b0b874 master date: 2013-02-25 12:44:25 +0100 --- xen/arch/x86/cpu/mcheck/mce_intel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 2d6c2f5..a5f0130 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -534,7 +534,7 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) } /* this function will called when CAP(9).MCG_EXT_P = 1 */ - memset(&mc_ext, 0, sizeof(struct mcinfo_extended)); + memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(struct mcinfo_extended); -- 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 Mar 08 07:33:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07: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 1UDroK-0007oP-JK; Fri, 08 Mar 2013 07:33:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroJ-0007nv-B6 for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:47 +0000 Received: from [85.158.139.211:9906] by server-7.bemta-5.messagelabs.com id C0/84-12441-A5499315; Fri, 08 Mar 2013 07:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1362728025!16940021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3298 invoked from network); 8 Mar 2013 07:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroG-0003BF-Nv for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDroG-0007Rv-Ix for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:44 +0000 Date: Fri, 08 Mar 2013 07:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: fix null pointer dereference in intel_get_extended_msrs() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf739695ce8b18718e4bc80946f360488122e349 Author: Xi Wang AuthorDate: Thu Mar 7 17:59:21 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 17:59:21 2013 +0100 x86: fix null pointer dereference in intel_get_extended_msrs() `memset(&mc_ext, 0, ...)' leads to a buffer overflow and a subsequent null pointer dereference. Replace `&mc_ext' with `mc_ext'. Signed-off-by: Xi Wang master changeset: c40e24a8ef74f9d0ee59dd9b8ca890be08b0b874 master date: 2013-02-25 12:44:25 +0100 --- xen/arch/x86/cpu/mcheck/mce_intel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 2d6c2f5..a5f0130 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -534,7 +534,7 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) } /* this function will called when CAP(9).MCG_EXT_P = 1 */ - memset(&mc_ext, 0, sizeof(struct mcinfo_extended)); + memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(struct mcinfo_extended); -- 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 Mar 08 07:34:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:34: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 1UDroV-0007qi-Mg; Fri, 08 Mar 2013 07:33:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroT-0007qD-Jl for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:57 +0000 Received: from [85.158.143.99:46462] by server-3.bemta-4.messagelabs.com id 78/43-02186-46499315; Fri, 08 Mar 2013 07:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1362728035!17676722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3938 invoked from network); 8 Mar 2013 07:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroQ-0003BR-Sv for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDroQ-0007SK-R5 for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:54 +0000 Date: Fri, 08 Mar 2013 07:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b01bf1a548b00cb64a9012648ceca017b740c941 Author: Suravee Suthikulpanit AuthorDate: Thu Mar 7 18:00:23 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 18:00:23 2013 +0100 IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround The IOMMU may stop processing page translations due to a perceived lack of credits for writing upstream peripheral page service request (PPR) or event logs. If the L2B miscellaneous clock gating feature is enabled the IOMMU does not properly register credits after the log request has completed, leading to a potential system hang. BIOSes are supposed to disable L2B micellaneous clock gating by setting L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b. This patch corrects that for those which do not enable this workaround. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Jan Beulich master changeset: 0f8adcb2a7183bea5063f6fffba7d7e1aa14fc84 master date: 2013-02-26 10:14:53 +0100 --- xen/drivers/passthrough/amd/iommu_init.c | 38 ++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 0567c7c..a97b68b 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -803,6 +803,42 @@ static int __init set_iommu_interrupt_handler(struct amd_iommu *iommu) return irq; } +/* + * Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations) + * Workaround: + * BIOS should disable L2B micellaneous clock gating by setting + * L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b + */ +static void amd_iommu_erratum_746_workaround(struct amd_iommu *iommu) +{ + u32 value; + u8 bus = PCI_BUS(iommu->bdf); + u8 dev = PCI_SLOT(iommu->bdf); + u8 func = PCI_FUNC(iommu->bdf); + + if ( (boot_cpu_data.x86 != 0x15) || + (boot_cpu_data.x86_model < 0x10) || + (boot_cpu_data.x86_model > 0x1f) ) + return; + + pci_conf_write32(iommu->seg, bus, dev, func, 0xf0, 0x90); + value = pci_conf_read32(iommu->seg, bus, dev, func, 0xf4); + + if ( value & (1 << 2) ) + return; + + /* Select NB indirect register 0x90 and enable writing */ + pci_conf_write32(iommu->seg, bus, dev, func, 0xf0, 0x90 | (1 << 8)); + + pci_conf_write32(iommu->seg, bus, dev, func, 0xf4, value | (1 << 2)); + printk(XENLOG_INFO + "AMD-Vi: Applying erratum 746 workaround for IOMMU at %04x:%02x:%02x.%u\n", + iommu->seg, bus, dev, func); + + /* Clear the enable writing bit */ + pci_conf_write32(iommu->seg, bus, dev, func, 0xf0, 0x90); +} + static void enable_iommu(struct amd_iommu *iommu) { unsigned long flags; @@ -815,6 +851,8 @@ static void enable_iommu(struct amd_iommu *iommu) return; } + amd_iommu_erratum_746_workaround(iommu); + register_iommu_dev_table_in_mmio_space(iommu); register_iommu_cmd_buffer_in_mmio_space(iommu); register_iommu_event_log_in_mmio_space(iommu); -- 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 Mar 08 07:34:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:34: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 1UDroV-0007qi-Mg; Fri, 08 Mar 2013 07:33:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroT-0007qD-Jl for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:57 +0000 Received: from [85.158.143.99:46462] by server-3.bemta-4.messagelabs.com id 78/43-02186-46499315; Fri, 08 Mar 2013 07:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1362728035!17676722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3938 invoked from network); 8 Mar 2013 07:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Mar 2013 07:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroQ-0003BR-Sv for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDroQ-0007SK-R5 for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:33:54 +0000 Date: Fri, 08 Mar 2013 07:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b01bf1a548b00cb64a9012648ceca017b740c941 Author: Suravee Suthikulpanit AuthorDate: Thu Mar 7 18:00:23 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 18:00:23 2013 +0100 IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround The IOMMU may stop processing page translations due to a perceived lack of credits for writing upstream peripheral page service request (PPR) or event logs. If the L2B miscellaneous clock gating feature is enabled the IOMMU does not properly register credits after the log request has completed, leading to a potential system hang. BIOSes are supposed to disable L2B micellaneous clock gating by setting L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b. This patch corrects that for those which do not enable this workaround. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Jan Beulich master changeset: 0f8adcb2a7183bea5063f6fffba7d7e1aa14fc84 master date: 2013-02-26 10:14:53 +0100 --- xen/drivers/passthrough/amd/iommu_init.c | 38 ++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 0567c7c..a97b68b 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -803,6 +803,42 @@ static int __init set_iommu_interrupt_handler(struct amd_iommu *iommu) return irq; } +/* + * Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations) + * Workaround: + * BIOS should disable L2B micellaneous clock gating by setting + * L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b + */ +static void amd_iommu_erratum_746_workaround(struct amd_iommu *iommu) +{ + u32 value; + u8 bus = PCI_BUS(iommu->bdf); + u8 dev = PCI_SLOT(iommu->bdf); + u8 func = PCI_FUNC(iommu->bdf); + + if ( (boot_cpu_data.x86 != 0x15) || + (boot_cpu_data.x86_model < 0x10) || + (boot_cpu_data.x86_model > 0x1f) ) + return; + + pci_conf_write32(iommu->seg, bus, dev, func, 0xf0, 0x90); + value = pci_conf_read32(iommu->seg, bus, dev, func, 0xf4); + + if ( value & (1 << 2) ) + return; + + /* Select NB indirect register 0x90 and enable writing */ + pci_conf_write32(iommu->seg, bus, dev, func, 0xf0, 0x90 | (1 << 8)); + + pci_conf_write32(iommu->seg, bus, dev, func, 0xf4, value | (1 << 2)); + printk(XENLOG_INFO + "AMD-Vi: Applying erratum 746 workaround for IOMMU at %04x:%02x:%02x.%u\n", + iommu->seg, bus, dev, func); + + /* Clear the enable writing bit */ + pci_conf_write32(iommu->seg, bus, dev, func, 0xf0, 0x90); +} + static void enable_iommu(struct amd_iommu *iommu) { unsigned long flags; @@ -815,6 +851,8 @@ static void enable_iommu(struct amd_iommu *iommu) return; } + amd_iommu_erratum_746_workaround(iommu); + register_iommu_dev_table_in_mmio_space(iommu); register_iommu_cmd_buffer_in_mmio_space(iommu); register_iommu_event_log_in_mmio_space(iommu); -- 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 Mar 08 07:34:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:34:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroe-0007sR-Sr; Fri, 08 Mar 2013 07:34:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroe-0007sC-5X for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:34:08 +0000 Received: from [193.109.254.147:63523] by server-10.bemta-14.messagelabs.com id 94/B1-11798-F6499315; Fri, 08 Mar 2013 07:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1362728045!9177936!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32001 invoked from network); 8 Mar 2013 07:34:06 -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; 8 Mar 2013 07:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrob-0003Bx-4Z for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrob-0007Sj-0K for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:34:05 +0000 Date: Fri, 08 Mar 2013 07:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: fix CMCI injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22c2216d90d830893ed22598483142c5d0307691 Author: Jan Beulich AuthorDate: Thu Mar 7 18:01:13 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 18:01:13 2013 +0100 x86: fix CMCI injection This fixes the wrong use of literal vector 0xF7 with an "int" instruction (invalidated by 25113:14609be41f36) and the fact that doing the injection via a software interrupt was never valid anyway (because cmci_interrupt() acks the LAPIC, which does the wrong thing if the interrupt didn't get delivered though it). In order to do latter, the patch introduces send_IPI_self(), at once removing two opend coded uses of "genapic" in the IRQ handling code. Reported-by: Yongjie Ren Signed-off-by: Jan Beulich Tested-by: Yongjie Ren Acked-by: Keir Fraser master changeset: 2f8c55ccefe49bb526df0eaf5fa9b7b788422208 master date: 2013-02-26 10:15:56 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 15 +++++++-------- xen/arch/x86/cpu/mcheck/mce.h | 2 ++ xen/arch/x86/cpu/mcheck/mce_intel.c | 1 - xen/arch/x86/irq.c | 4 ++-- xen/arch/x86/smp.c | 5 +++++ xen/include/asm-x86/smp.h | 3 ++- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index a89df6d..c836320 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -30,6 +30,7 @@ bool_t __read_mostly mce_broadcast = 0; bool_t is_mc_panic; unsigned int __read_mostly nr_mce_banks; unsigned int __read_mostly firstbank; +uint8_t __read_mostly cmci_apic_vector; static void intpose_init(void); static void mcinfo_clear(struct mc_info *); @@ -1277,12 +1278,6 @@ static void x86_mc_mceinject(void *data) __asm__ __volatile__("int $0x12"); } -static void x86_cmci_inject(void *data) -{ - printk("Simulating CMCI on cpu %d\n", smp_processor_id()); - __asm__ __volatile__("int $0xf7"); -} - #if BITS_PER_LONG == 64 #define ID2COOKIE(id) ((mctelem_cookie_t)(id)) @@ -1568,11 +1563,15 @@ long do_mca(XEN_GUEST_HANDLE(xen_mc_t) u_xen_mc) on_selected_cpus(cpumap, x86_mc_mceinject, NULL, 1); break; case XEN_MC_INJECT_TYPE_CMCI: - if ( !cmci_support ) + if ( !cmci_apic_vector ) ret = x86_mcerr( "No CMCI supported in platform\n", -EINVAL); else - on_selected_cpus(cpumap, x86_cmci_inject, NULL, 1); + { + if ( cpumask_test_cpu(smp_processor_id(), cpumap) ) + send_IPI_self(cmci_apic_vector); + send_IPI_mask(cpumap, cmci_apic_vector); + } break; default: ret = x86_mcerr("Wrong mca type\n", -EINVAL); diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 61fa7ee..3c773c7 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -38,6 +38,8 @@ enum mcheck_type { mcheck_intel }; +extern uint8_t cmci_apic_vector; + /* Init functions */ enum mcheck_type amd_k7_mcheck_init(struct cpuinfo_x86 *c); enum mcheck_type amd_k8_mcheck_init(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index a5f0130..02e2db5 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -1164,7 +1164,6 @@ static void intel_init_cmci(struct cpuinfo_x86 *c) { u32 l, apic; int cpu = smp_processor_id(); - static uint8_t cmci_apic_vector; if (!mce_available(c) || !cmci_support) { if (opt_cpu_info) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index affa942..0964c76 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -646,7 +646,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) * to myself. */ if (irr & (1 << (vector % 32))) { - genapic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP_DELAY, irq, vector, smp_processor_id()); goto unlock; @@ -692,7 +692,7 @@ static void send_cleanup_vector(struct irq_desc *desc) cpumask_and(&cleanup_mask, desc->arch.old_cpu_mask, &cpu_online_map); desc->arch.move_cleanup_count = cpumask_weight(&cleanup_mask); - genapic->send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); desc->arch.move_in_progress = 0; } diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 814547b..5ca0330 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -43,6 +43,11 @@ void send_IPI_mask(const cpumask_t *mask, int vector) genapic->send_IPI_mask(mask, vector); } +void send_IPI_self(int vector) +{ + genapic->send_IPI_self(vector); +} + /* * Some notes on x86 processor bugs affecting SMP operation: * diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index 8d5e714..3aa31d3 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -29,7 +29,8 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); void smp_send_nmi_allbutself(void); -void send_IPI_mask(const cpumask_t *mask, int vector); +void send_IPI_mask(const cpumask_t *, int vector); +void send_IPI_self(int vector); extern void (*mtrr_hook) (void); -- 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 Mar 08 07:34:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Mar 2013 07:34:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroe-0007sR-Sr; Fri, 08 Mar 2013 07:34:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDroe-0007sC-5X for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:34:08 +0000 Received: from [193.109.254.147:63523] by server-10.bemta-14.messagelabs.com id 94/B1-11798-F6499315; Fri, 08 Mar 2013 07:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1362728045!9177936!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32001 invoked from network); 8 Mar 2013 07:34:06 -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; 8 Mar 2013 07:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UDrob-0003Bx-4Z for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UDrob-0007Sj-0K for xen-changelog@lists.xensource.com; Fri, 08 Mar 2013 07:34:05 +0000 Date: Fri, 08 Mar 2013 07:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: fix CMCI injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22c2216d90d830893ed22598483142c5d0307691 Author: Jan Beulich AuthorDate: Thu Mar 7 18:01:13 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 7 18:01:13 2013 +0100 x86: fix CMCI injection This fixes the wrong use of literal vector 0xF7 with an "int" instruction (invalidated by 25113:14609be41f36) and the fact that doing the injection via a software interrupt was never valid anyway (because cmci_interrupt() acks the LAPIC, which does the wrong thing if the interrupt didn't get delivered though it). In order to do latter, the patch introduces send_IPI_self(), at once removing two opend coded uses of "genapic" in the IRQ handling code. Reported-by: Yongjie Ren Signed-off-by: Jan Beulich Tested-by: Yongjie Ren Acked-by: Keir Fraser master changeset: 2f8c55ccefe49bb526df0eaf5fa9b7b788422208 master date: 2013-02-26 10:15:56 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 15 +++++++-------- xen/arch/x86/cpu/mcheck/mce.h | 2 ++ xen/arch/x86/cpu/mcheck/mce_intel.c | 1 - xen/arch/x86/irq.c | 4 ++-- xen/arch/x86/smp.c | 5 +++++ xen/include/asm-x86/smp.h | 3 ++- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index a89df6d..c836320 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -30,6 +30,7 @@ bool_t __read_mostly mce_broadcast = 0; bool_t is_mc_panic; unsigned int __read_mostly nr_mce_banks; unsigned int __read_mostly firstbank; +uint8_t __read_mostly cmci_apic_vector; static void intpose_init(void); static void mcinfo_clear(struct mc_info *); @@ -1277,12 +1278,6 @@ static void x86_mc_mceinject(void *data) __asm__ __volatile__("int $0x12"); } -static void x86_cmci_inject(void *data) -{ - printk("Simulating CMCI on cpu %d\n", smp_processor_id()); - __asm__ __volatile__("int $0xf7"); -} - #if BITS_PER_LONG == 64 #define ID2COOKIE(id) ((mctelem_cookie_t)(id)) @@ -1568,11 +1563,15 @@ long do_mca(XEN_GUEST_HANDLE(xen_mc_t) u_xen_mc) on_selected_cpus(cpumap, x86_mc_mceinject, NULL, 1); break; case XEN_MC_INJECT_TYPE_CMCI: - if ( !cmci_support ) + if ( !cmci_apic_vector ) ret = x86_mcerr( "No CMCI supported in platform\n", -EINVAL); else - on_selected_cpus(cpumap, x86_cmci_inject, NULL, 1); + { + if ( cpumask_test_cpu(smp_processor_id(), cpumap) ) + send_IPI_self(cmci_apic_vector); + send_IPI_mask(cpumap, cmci_apic_vector); + } break; default: ret = x86_mcerr("Wrong mca type\n", -EINVAL); diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 61fa7ee..3c773c7 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -38,6 +38,8 @@ enum mcheck_type { mcheck_intel }; +extern uint8_t cmci_apic_vector; + /* Init functions */ enum mcheck_type amd_k7_mcheck_init(struct cpuinfo_x86 *c); enum mcheck_type amd_k8_mcheck_init(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index a5f0130..02e2db5 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -1164,7 +1164,6 @@ static void intel_init_cmci(struct cpuinfo_x86 *c) { u32 l, apic; int cpu = smp_processor_id(); - static uint8_t cmci_apic_vector; if (!mce_available(c) || !cmci_support) { if (opt_cpu_info) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index affa942..0964c76 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -646,7 +646,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) * to myself. */ if (irr & (1 << (vector % 32))) { - genapic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP_DELAY, irq, vector, smp_processor_id()); goto unlock; @@ -692,7 +692,7 @@ static void send_cleanup_vector(struct irq_desc *desc) cpumask_and(&cleanup_mask, desc->arch.old_cpu_mask, &cpu_online_map); desc->arch.move_cleanup_count = cpumask_weight(&cleanup_mask); - genapic->send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); desc->arch.move_in_progress = 0; } diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 814547b..5ca0330 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -43,6 +43,11 @@ void send_IPI_mask(const cpumask_t *mask, int vector) genapic->send_IPI_mask(mask, vector); } +void send_IPI_self(int vector) +{ + genapic->send_IPI_self(vector); +} + /* * Some notes on x86 processor bugs affecting SMP operation: * diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index 8d5e714..3aa31d3 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -29,7 +29,8 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); void smp_send_nmi_allbutself(void); -void send_IPI_mask(const cpumask_t *mask, int vector); +void send_IPI_mask(const cpumask_t *, int vector); +void send_IPI_self(int vector); extern void (*mtrr_hook) (void); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 09 23:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGH-00070S-44; Sat, 09 Mar 2013 23:33:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGF-00070K-73 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:07 +0000 Received: from [85.158.138.51:48131] by server-8.bemta-3.messagelabs.com id 5A/FA-20604-2B6CB315; Sat, 09 Mar 2013 23:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1362871984!22269886!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27892 invoked from network); 9 Mar 2013 23:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 9 Mar 2013 23:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGC-00044C-9Q for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGB-0005Rw-R1 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:03 +0000 Date: Sat, 09 Mar 2013 23:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/setup: don't relocate the VGA hole. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7542d222893203037dc2ba431dfb5f723d791891 Author: Tim Deegan AuthorDate: Fri Mar 8 13:46:22 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:46:22 2013 +0100 x86/setup: don't relocate the VGA hole. Copying the contents of the VGA hole is at best pointless and at worst dangerous. Booting Xen on Xen, it causes a very long delay as each byte is referred to qemu. Since we were already discarding the first 1MB of the relocated area, just avoid copying it in the first place. Reported-by: Jon Ludlam Signed-off-by: Tim Deegan master changeset: 0b76ce20de85ad7c23c47ee3275020859b91d46b master date: 2013-02-14 12:20:58 +0000 --- xen/arch/x86/setup.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 602a922..6ab1afc 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -813,8 +813,8 @@ void __init __start_xen(unsigned long mbi_p) l4_pgentry_t *pl4e; l3_pgentry_t *pl3e; l2_pgentry_t *pl2e; + uint64_t load_start; int i, j, k; - void *dst; /* Select relocation address. */ e = end - reloc_size; @@ -827,11 +827,9 @@ void __init __start_xen(unsigned long mbi_p) * with a barrier(). After this we must *not* modify static/global * data until after we have switched to the relocated pagetables! */ + load_start = (unsigned long)_start - XEN_VIRT_START; barrier(); - dst = move_memory(e, 0, (unsigned long)&_end - XEN_VIRT_START, 1); - - /* Poison low 1MB to detect stray pointers to physical 0-1MB. */ - memset(dst, 0x55, 1U << 20); + move_memory(e + load_start, load_start, _end - _start, 1); /* Walk initial pagetables, relocating page directory entries. */ pl4e = __va(__pa(idle_pg_table)); -- 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 Sat Mar 09 23:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGH-00070S-44; Sat, 09 Mar 2013 23:33:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGF-00070K-73 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:07 +0000 Received: from [85.158.138.51:48131] by server-8.bemta-3.messagelabs.com id 5A/FA-20604-2B6CB315; Sat, 09 Mar 2013 23:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1362871984!22269886!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27892 invoked from network); 9 Mar 2013 23:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 9 Mar 2013 23:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGC-00044C-9Q for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGB-0005Rw-R1 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:03 +0000 Date: Sat, 09 Mar 2013 23:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/setup: don't relocate the VGA hole. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7542d222893203037dc2ba431dfb5f723d791891 Author: Tim Deegan AuthorDate: Fri Mar 8 13:46:22 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:46:22 2013 +0100 x86/setup: don't relocate the VGA hole. Copying the contents of the VGA hole is at best pointless and at worst dangerous. Booting Xen on Xen, it causes a very long delay as each byte is referred to qemu. Since we were already discarding the first 1MB of the relocated area, just avoid copying it in the first place. Reported-by: Jon Ludlam Signed-off-by: Tim Deegan master changeset: 0b76ce20de85ad7c23c47ee3275020859b91d46b master date: 2013-02-14 12:20:58 +0000 --- xen/arch/x86/setup.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 602a922..6ab1afc 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -813,8 +813,8 @@ void __init __start_xen(unsigned long mbi_p) l4_pgentry_t *pl4e; l3_pgentry_t *pl3e; l2_pgentry_t *pl2e; + uint64_t load_start; int i, j, k; - void *dst; /* Select relocation address. */ e = end - reloc_size; @@ -827,11 +827,9 @@ void __init __start_xen(unsigned long mbi_p) * with a barrier(). After this we must *not* modify static/global * data until after we have switched to the relocated pagetables! */ + load_start = (unsigned long)_start - XEN_VIRT_START; barrier(); - dst = move_memory(e, 0, (unsigned long)&_end - XEN_VIRT_START, 1); - - /* Poison low 1MB to detect stray pointers to physical 0-1MB. */ - memset(dst, 0x55, 1U << 20); + move_memory(e + load_start, load_start, _end - _start, 1); /* Walk initial pagetables, relocating page directory entries. */ pl4e = __va(__pa(idle_pg_table)); -- 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 Sat Mar 09 23:33:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33: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 1UETGS-00071B-7h; Sat, 09 Mar 2013 23:33:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGQ-000710-6H for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:18 +0000 Received: from [85.158.139.211:39503] by server-14.bemta-5.messagelabs.com id 20/33-13158-DB6CB315; Sat, 09 Mar 2013 23:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1362871995!14777786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21382 invoked from network); 9 Mar 2013 23:33:16 -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 Mar 2013 23:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGN-00044F-1V for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGM-0005T3-KH for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:14 +0000 Date: Sat, 09 Mar 2013 23:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: fix null pointer dereference in intel_get_extended_msrs() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbbeb7939e141c6cb29fd6f26beca68ffdfe9d46 Author: Xi Wang AuthorDate: Fri Mar 8 13:56:54 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:56:54 2013 +0100 x86: fix null pointer dereference in intel_get_extended_msrs() `memset(&mc_ext, 0, ...)' leads to a buffer overflow and a subsequent null pointer dereference. Replace `&mc_ext' with `mc_ext'. Signed-off-by: Xi Wang master changeset: c40e24a8ef74f9d0ee59dd9b8ca890be08b0b874 master date: 2013-02-25 12:44:25 +0100 --- xen/arch/x86/cpu/mcheck/mce_intel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 603acf7..b321a3f 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -512,7 +512,7 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) } /* this function will called when CAP(9).MCG_EXT_P = 1 */ - memset(&mc_ext, 0, sizeof(struct mcinfo_extended)); + memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(struct mcinfo_extended); -- 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 Sat Mar 09 23:33:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33: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 1UETGS-00071B-7h; Sat, 09 Mar 2013 23:33:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGQ-000710-6H for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:18 +0000 Received: from [85.158.139.211:39503] by server-14.bemta-5.messagelabs.com id 20/33-13158-DB6CB315; Sat, 09 Mar 2013 23:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1362871995!14777786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21382 invoked from network); 9 Mar 2013 23:33:16 -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 Mar 2013 23:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGN-00044F-1V for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGM-0005T3-KH for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:14 +0000 Date: Sat, 09 Mar 2013 23:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: fix null pointer dereference in intel_get_extended_msrs() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbbeb7939e141c6cb29fd6f26beca68ffdfe9d46 Author: Xi Wang AuthorDate: Fri Mar 8 13:56:54 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:56:54 2013 +0100 x86: fix null pointer dereference in intel_get_extended_msrs() `memset(&mc_ext, 0, ...)' leads to a buffer overflow and a subsequent null pointer dereference. Replace `&mc_ext' with `mc_ext'. Signed-off-by: Xi Wang master changeset: c40e24a8ef74f9d0ee59dd9b8ca890be08b0b874 master date: 2013-02-25 12:44:25 +0100 --- xen/arch/x86/cpu/mcheck/mce_intel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 603acf7..b321a3f 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -512,7 +512,7 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) } /* this function will called when CAP(9).MCG_EXT_P = 1 */ - memset(&mc_ext, 0, sizeof(struct mcinfo_extended)); + memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(struct mcinfo_extended); -- 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 Sat Mar 09 23:33:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33: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 1UETGb-000722-Ac; Sat, 09 Mar 2013 23:33:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGa-00071s-8n for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:28 +0000 Received: from [85.158.139.83:16206] by server-7.bemta-5.messagelabs.com id D7/38-12441-7C6CB315; Sat, 09 Mar 2013 23:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1362872005!20805536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13111 invoked from network); 9 Mar 2013 23:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 9 Mar 2013 23:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGX-00044O-H7 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGX-0005a1-8U for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:25 +0000 Date: Sat, 09 Mar 2013 23:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3799c4e2a2d63b3300a9f48ee713df12c2232c2 Author: Suravee Suthikulpanit AuthorDate: Fri Mar 8 13:57:54 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:57:54 2013 +0100 IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround The IOMMU may stop processing page translations due to a perceived lack of credits for writing upstream peripheral page service request (PPR) or event logs. If the L2B miscellaneous clock gating feature is enabled the IOMMU does not properly register credits after the log request has completed, leading to a potential system hang. BIOSes are supposed to disable L2B micellaneous clock gating by setting L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b. This patch corrects that for those which do not enable this workaround. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Jan Beulich master changeset: 0f8adcb2a7183bea5063f6fffba7d7e1aa14fc84 master date: 2013-02-26 10:14:53 +0100 --- xen/drivers/passthrough/amd/iommu_init.c | 38 ++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 282c04c..31acec9 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -636,6 +636,42 @@ static int set_iommu_interrupt_handler(struct amd_iommu *iommu) return irq; } +/* + * Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations) + * Workaround: + * BIOS should disable L2B micellaneous clock gating by setting + * L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b + */ +static void amd_iommu_erratum_746_workaround(struct amd_iommu *iommu) +{ + u32 value; + u8 bus = PCI_BUS(iommu->bdf); + u8 dev = PCI_SLOT(iommu->bdf); + u8 func = PCI_FUNC(iommu->bdf); + + if ( (boot_cpu_data.x86 != 0x15) || + (boot_cpu_data.x86_model < 0x10) || + (boot_cpu_data.x86_model > 0x1f) ) + return; + + pci_conf_write32(bus, dev, func, 0xf0, 0x90); + value = pci_conf_read32(bus, dev, func, 0xf4); + + if ( value & (1 << 2) ) + return; + + /* Select NB indirect register 0x90 and enable writing */ + pci_conf_write32(bus, dev, func, 0xf0, 0x90 | (1 << 8)); + + pci_conf_write32(bus, dev, func, 0xf4, value | (1 << 2)); + printk(XENLOG_INFO + "AMD-Vi: Applying erratum 746 workaround for IOMMU at %02x:%02x.%u\n", + bus, dev, func); + + /* Clear the enable writing bit */ + pci_conf_write32(bus, dev, func, 0xf0, 0x90); +} + static void enable_iommu(struct amd_iommu *iommu) { unsigned long flags; @@ -648,6 +684,8 @@ static void enable_iommu(struct amd_iommu *iommu) return; } + amd_iommu_erratum_746_workaround(iommu); + register_iommu_dev_table_in_mmio_space(iommu); register_iommu_cmd_buffer_in_mmio_space(iommu); register_iommu_event_log_in_mmio_space(iommu); -- 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 Sat Mar 09 23:33:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33: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 1UETGb-000722-Ac; Sat, 09 Mar 2013 23:33:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGa-00071s-8n for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:28 +0000 Received: from [85.158.139.83:16206] by server-7.bemta-5.messagelabs.com id D7/38-12441-7C6CB315; Sat, 09 Mar 2013 23:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1362872005!20805536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13111 invoked from network); 9 Mar 2013 23:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 9 Mar 2013 23:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGX-00044O-H7 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGX-0005a1-8U for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:25 +0000 Date: Sat, 09 Mar 2013 23:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3799c4e2a2d63b3300a9f48ee713df12c2232c2 Author: Suravee Suthikulpanit AuthorDate: Fri Mar 8 13:57:54 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:57:54 2013 +0100 IOMMU, AMD Family15h Model10-1Fh erratum 746 Workaround The IOMMU may stop processing page translations due to a perceived lack of credits for writing upstream peripheral page service request (PPR) or event logs. If the L2B miscellaneous clock gating feature is enabled the IOMMU does not properly register credits after the log request has completed, leading to a potential system hang. BIOSes are supposed to disable L2B micellaneous clock gating by setting L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b. This patch corrects that for those which do not enable this workaround. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Jan Beulich master changeset: 0f8adcb2a7183bea5063f6fffba7d7e1aa14fc84 master date: 2013-02-26 10:14:53 +0100 --- xen/drivers/passthrough/amd/iommu_init.c | 38 ++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 282c04c..31acec9 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -636,6 +636,42 @@ static int set_iommu_interrupt_handler(struct amd_iommu *iommu) return irq; } +/* + * Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations) + * Workaround: + * BIOS should disable L2B micellaneous clock gating by setting + * L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b + */ +static void amd_iommu_erratum_746_workaround(struct amd_iommu *iommu) +{ + u32 value; + u8 bus = PCI_BUS(iommu->bdf); + u8 dev = PCI_SLOT(iommu->bdf); + u8 func = PCI_FUNC(iommu->bdf); + + if ( (boot_cpu_data.x86 != 0x15) || + (boot_cpu_data.x86_model < 0x10) || + (boot_cpu_data.x86_model > 0x1f) ) + return; + + pci_conf_write32(bus, dev, func, 0xf0, 0x90); + value = pci_conf_read32(bus, dev, func, 0xf4); + + if ( value & (1 << 2) ) + return; + + /* Select NB indirect register 0x90 and enable writing */ + pci_conf_write32(bus, dev, func, 0xf0, 0x90 | (1 << 8)); + + pci_conf_write32(bus, dev, func, 0xf4, value | (1 << 2)); + printk(XENLOG_INFO + "AMD-Vi: Applying erratum 746 workaround for IOMMU at %02x:%02x.%u\n", + bus, dev, func); + + /* Clear the enable writing bit */ + pci_conf_write32(bus, dev, func, 0xf0, 0x90); +} + static void enable_iommu(struct amd_iommu *iommu) { unsigned long flags; @@ -648,6 +684,8 @@ static void enable_iommu(struct amd_iommu *iommu) return; } + amd_iommu_erratum_746_workaround(iommu); + register_iommu_dev_table_in_mmio_space(iommu); register_iommu_cmd_buffer_in_mmio_space(iommu); register_iommu_event_log_in_mmio_space(iommu); -- 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 Sat Mar 09 23:33:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGl-00073H-E4; Sat, 09 Mar 2013 23:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGk-000735-Ph for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:38 +0000 Received: from [85.158.139.211:23800] by server-11.bemta-5.messagelabs.com id AB/7E-27486-2D6CB315; Sat, 09 Mar 2013 23:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1362872016!18708373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3200 invoked from network); 9 Mar 2013 23:33:37 -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; 9 Mar 2013 23:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGi-00044X-45 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGh-0005aR-OH for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:35 +0000 Date: Sat, 09 Mar 2013 23:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: fix CMCI injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab01d96364683bb10619b794611b9244ba5ea227 Author: Jan Beulich AuthorDate: Fri Mar 8 13:59:02 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:59:02 2013 +0100 x86: fix CMCI injection This fixes the wrong use of literal vector 0xF7 with an "int" instruction (invalidated by 25113:14609be41f36) and the fact that doing the injection via a software interrupt was never valid anyway (because cmci_interrupt() acks the LAPIC, which does the wrong thing if the interrupt didn't get delivered though it). In order to do latter, the patch introduces send_IPI_self(), at once removing two opend coded uses of "genapic" in the IRQ handling code. Reported-by: Yongjie Ren Signed-off-by: Jan Beulich Tested-by: Yongjie Ren Acked-by: Keir Fraser master changeset: 2f8c55ccefe49bb526df0eaf5fa9b7b788422208 master date: 2013-02-26 10:15:56 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 10 +++------- xen/arch/x86/io_apic.c | 4 ++-- xen/arch/x86/smp.c | 5 +++++ xen/include/asm-x86/smp.h | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 73b8316..8a1c19c 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1253,12 +1253,6 @@ static void x86_mc_mceinject(void *data) __asm__ __volatile__("int $0x12"); } -static void x86_cmci_inject(void *data) -{ - printk("Simulating CMCI on cpu %d\n", smp_processor_id()); - __asm__ __volatile__("int $0xf7"); -} - #if BITS_PER_LONG == 64 #define ID2COOKIE(id) ((mctelem_cookie_t)(id)) @@ -1541,7 +1535,9 @@ long do_mca(XEN_GUEST_HANDLE(xen_mc_t) u_xen_mc) if ( !cmci_support ) return x86_mcerr( "No CMCI supported in platform\n", -EINVAL); - on_selected_cpus(&cpumap, x86_cmci_inject, NULL, 1); + if ( cpu_isset(smp_processor_id(), cpumap) ) + send_IPI_self(CMCI_APIC_VECTOR); + send_IPI_mask(&cpumap, CMCI_APIC_VECTOR); break; default: return x86_mcerr("Wrong mca type\n", -EINVAL); diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 423a55a..fb762b8 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -530,7 +530,7 @@ fastcall void smp_irq_move_cleanup_interrupt(struct cpu_user_regs *regs) * to myself. */ if (irr & (1 << (vector % 32))) { - genapic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); goto unlock; } __get_cpu_var(vector_irq)[vector] = -1; @@ -556,7 +556,7 @@ static void send_cleanup_vector(struct irq_cfg *cfg) cpus_and(cleanup_mask, cfg->old_cpu_mask, cpu_online_map); cfg->move_cleanup_count = cpus_weight(cleanup_mask); - genapic->send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); cfg->move_in_progress = 0; } diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 88cc9a0..8de4ea2 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -43,6 +43,11 @@ void send_IPI_mask(const cpumask_t *mask, int vector) genapic->send_IPI_mask(mask, vector); } +void send_IPI_self(int vector) +{ + genapic->send_IPI_self(vector); +} + /* * Some notes on x86 processor bugs affecting SMP operation: * diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index ba8fa8a..3a7b18b 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -30,7 +30,8 @@ DECLARE_PER_CPU(cpumask_t, cpu_core_map); void smp_send_nmi_allbutself(void); -void send_IPI_mask(const cpumask_t *mask, int vector); +void send_IPI_mask(const cpumask_t *, int vector); +void send_IPI_self(int vector); extern void (*mtrr_hook) (void); -- 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 Sat Mar 09 23:33:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Mar 2013 23:33:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGl-00073H-E4; Sat, 09 Mar 2013 23:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGk-000735-Ph for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:38 +0000 Received: from [85.158.139.211:23800] by server-11.bemta-5.messagelabs.com id AB/7E-27486-2D6CB315; Sat, 09 Mar 2013 23:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1362872016!18708373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3200 invoked from network); 9 Mar 2013 23:33:37 -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; 9 Mar 2013 23:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UETGi-00044X-45 for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UETGh-0005aR-OH for xen-changelog@lists.xensource.com; Sat, 09 Mar 2013 23:33:35 +0000 Date: Sat, 09 Mar 2013 23:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: fix CMCI injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab01d96364683bb10619b794611b9244ba5ea227 Author: Jan Beulich AuthorDate: Fri Mar 8 13:59:02 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 13:59:02 2013 +0100 x86: fix CMCI injection This fixes the wrong use of literal vector 0xF7 with an "int" instruction (invalidated by 25113:14609be41f36) and the fact that doing the injection via a software interrupt was never valid anyway (because cmci_interrupt() acks the LAPIC, which does the wrong thing if the interrupt didn't get delivered though it). In order to do latter, the patch introduces send_IPI_self(), at once removing two opend coded uses of "genapic" in the IRQ handling code. Reported-by: Yongjie Ren Signed-off-by: Jan Beulich Tested-by: Yongjie Ren Acked-by: Keir Fraser master changeset: 2f8c55ccefe49bb526df0eaf5fa9b7b788422208 master date: 2013-02-26 10:15:56 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 10 +++------- xen/arch/x86/io_apic.c | 4 ++-- xen/arch/x86/smp.c | 5 +++++ xen/include/asm-x86/smp.h | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 73b8316..8a1c19c 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1253,12 +1253,6 @@ static void x86_mc_mceinject(void *data) __asm__ __volatile__("int $0x12"); } -static void x86_cmci_inject(void *data) -{ - printk("Simulating CMCI on cpu %d\n", smp_processor_id()); - __asm__ __volatile__("int $0xf7"); -} - #if BITS_PER_LONG == 64 #define ID2COOKIE(id) ((mctelem_cookie_t)(id)) @@ -1541,7 +1535,9 @@ long do_mca(XEN_GUEST_HANDLE(xen_mc_t) u_xen_mc) if ( !cmci_support ) return x86_mcerr( "No CMCI supported in platform\n", -EINVAL); - on_selected_cpus(&cpumap, x86_cmci_inject, NULL, 1); + if ( cpu_isset(smp_processor_id(), cpumap) ) + send_IPI_self(CMCI_APIC_VECTOR); + send_IPI_mask(&cpumap, CMCI_APIC_VECTOR); break; default: return x86_mcerr("Wrong mca type\n", -EINVAL); diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 423a55a..fb762b8 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -530,7 +530,7 @@ fastcall void smp_irq_move_cleanup_interrupt(struct cpu_user_regs *regs) * to myself. */ if (irr & (1 << (vector % 32))) { - genapic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); goto unlock; } __get_cpu_var(vector_irq)[vector] = -1; @@ -556,7 +556,7 @@ static void send_cleanup_vector(struct irq_cfg *cfg) cpus_and(cleanup_mask, cfg->old_cpu_mask, cpu_online_map); cfg->move_cleanup_count = cpus_weight(cleanup_mask); - genapic->send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); + send_IPI_mask(&cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); cfg->move_in_progress = 0; } diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 88cc9a0..8de4ea2 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -43,6 +43,11 @@ void send_IPI_mask(const cpumask_t *mask, int vector) genapic->send_IPI_mask(mask, vector); } +void send_IPI_self(int vector) +{ + genapic->send_IPI_self(vector); +} + /* * Some notes on x86 processor bugs affecting SMP operation: * diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index ba8fa8a..3a7b18b 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -30,7 +30,8 @@ DECLARE_PER_CPU(cpumask_t, cpu_core_map); void smp_send_nmi_allbutself(void); -void send_IPI_mask(const cpumask_t *mask, int vector); +void send_IPI_mask(const cpumask_t *, int vector); +void send_IPI_self(int vector); extern void (*mtrr_hook) (void); -- 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 Sun Mar 10 04:33:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Mar 2013 04: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 1UEXwe-0005SJ-0Y; Sun, 10 Mar 2013 04:33:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwc-0005SD-Qf for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:11 +0000 Received: from [85.158.137.99:42197] by server-3.bemta-3.messagelabs.com id 6E/0A-26934-10D0C315; Sun, 10 Mar 2013 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1362889984!17497821!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2612 invoked from network); 10 Mar 2013 04:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 10 Mar 2013 04:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwV-0005yM-HX for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UEXwV-0004J0-2B for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:03 +0000 Date: Sun, 10 Mar 2013 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/setup: don't relocate the VGA hole. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be095761e374777f1c3bf356508faf0d922d4f1a Author: Tim Deegan AuthorDate: Fri Mar 8 10:56:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 10:56:24 2013 +0100 x86/setup: don't relocate the VGA hole. Copying the contents of the VGA hole is at best pointless and at worst dangerous. Booting Xen on Xen, it causes a very long delay as each byte is referred to qemu. Since we were already discarding the first 1MB of the relocated area, just avoid copying it in the first place. Reported-by: Jon Ludlam Signed-off-by: Tim Deegan master changeset: 0b76ce20de85ad7c23c47ee3275020859b91d46b master date: 2013-02-14 12:20:58 +0000 --- xen/arch/x86/setup.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 57f8bc1..2ef600b 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -837,8 +837,8 @@ void __init __start_xen(unsigned long mbi_p) l4_pgentry_t *pl4e; l3_pgentry_t *pl3e; l2_pgentry_t *pl2e; + uint64_t load_start; int i, j, k; - void *dst; /* Select relocation address. */ e = end - reloc_size; @@ -851,11 +851,9 @@ void __init __start_xen(unsigned long mbi_p) * with a barrier(). After this we must *not* modify static/global * data until after we have switched to the relocated pagetables! */ + load_start = (unsigned long)_start - XEN_VIRT_START; barrier(); - dst = move_memory(e, 0, (unsigned long)&_end - XEN_VIRT_START, 1); - - /* Poison low 1MB to detect stray pointers to physical 0-1MB. */ - memset(dst, 0x55, 1U << 20); + move_memory(e + load_start, load_start, _end - _start, 1); /* Walk initial pagetables, relocating page directory entries. */ pl4e = __va(__pa(idle_pg_table)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 10 04:33:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Mar 2013 04: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 1UEXwe-0005SJ-0Y; Sun, 10 Mar 2013 04:33:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwc-0005SD-Qf for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:11 +0000 Received: from [85.158.137.99:42197] by server-3.bemta-3.messagelabs.com id 6E/0A-26934-10D0C315; Sun, 10 Mar 2013 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1362889984!17497821!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2612 invoked from network); 10 Mar 2013 04:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 10 Mar 2013 04:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwV-0005yM-HX for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UEXwV-0004J0-2B for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:03 +0000 Date: Sun, 10 Mar 2013 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/setup: don't relocate the VGA hole. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be095761e374777f1c3bf356508faf0d922d4f1a Author: Tim Deegan AuthorDate: Fri Mar 8 10:56:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 10:56:24 2013 +0100 x86/setup: don't relocate the VGA hole. Copying the contents of the VGA hole is at best pointless and at worst dangerous. Booting Xen on Xen, it causes a very long delay as each byte is referred to qemu. Since we were already discarding the first 1MB of the relocated area, just avoid copying it in the first place. Reported-by: Jon Ludlam Signed-off-by: Tim Deegan master changeset: 0b76ce20de85ad7c23c47ee3275020859b91d46b master date: 2013-02-14 12:20:58 +0000 --- xen/arch/x86/setup.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 57f8bc1..2ef600b 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -837,8 +837,8 @@ void __init __start_xen(unsigned long mbi_p) l4_pgentry_t *pl4e; l3_pgentry_t *pl3e; l2_pgentry_t *pl2e; + uint64_t load_start; int i, j, k; - void *dst; /* Select relocation address. */ e = end - reloc_size; @@ -851,11 +851,9 @@ void __init __start_xen(unsigned long mbi_p) * with a barrier(). After this we must *not* modify static/global * data until after we have switched to the relocated pagetables! */ + load_start = (unsigned long)_start - XEN_VIRT_START; barrier(); - dst = move_memory(e, 0, (unsigned long)&_end - XEN_VIRT_START, 1); - - /* Poison low 1MB to detect stray pointers to physical 0-1MB. */ - memset(dst, 0x55, 1U << 20); + move_memory(e + load_start, load_start, _end - _start, 1); /* Walk initial pagetables, relocating page directory entries. */ pl4e = __va(__pa(idle_pg_table)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 10 04:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Mar 2013 04:33: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 1UEXwk-0005SY-3Q; Sun, 10 Mar 2013 04:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwi-0005ST-HE for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:16 +0000 Received: from [193.109.254.147:48438] by server-1.bemta-14.messagelabs.com id BD/A4-28280-B0D0C315; Sun, 10 Mar 2013 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1362889994!9383782!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23214 invoked from network); 10 Mar 2013 04:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Mar 2013 04:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwf-0005yP-SF for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UEXwf-0004JO-Lf for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:13 +0000 Date: Sun, 10 Mar 2013 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_UPSTREAM_REVISION 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 5980a95ed75bceb9ec01c69607fd6ba6d484a604 Author: Ian Jackson AuthorDate: Fri Mar 8 15:27:07 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 8 15:27:07 2013 +0000 QEMU_UPSTREAM_REVISION update --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index dd07341..68c4aca 100644 --- a/Config.mk +++ b/Config.mk @@ -203,7 +203,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.2-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= eccc68722696864fc4823f048c7be58d11281b97 +QEMU_UPSTREAM_REVISION ?= 351f94ff4bf3a7795ca5b282305aa610e598eec0 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Mar 10 04:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Mar 2013 04:33: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 1UEXwk-0005SY-3Q; Sun, 10 Mar 2013 04:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwi-0005ST-HE for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:16 +0000 Received: from [193.109.254.147:48438] by server-1.bemta-14.messagelabs.com id BD/A4-28280-B0D0C315; Sun, 10 Mar 2013 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1362889994!9383782!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23214 invoked from network); 10 Mar 2013 04:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Mar 2013 04:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UEXwf-0005yP-SF for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UEXwf-0004JO-Lf for xen-changelog@lists.xensource.com; Sun, 10 Mar 2013 04:33:13 +0000 Date: Sun, 10 Mar 2013 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_UPSTREAM_REVISION 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 5980a95ed75bceb9ec01c69607fd6ba6d484a604 Author: Ian Jackson AuthorDate: Fri Mar 8 15:27:07 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 8 15:27:07 2013 +0000 QEMU_UPSTREAM_REVISION update --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index dd07341..68c4aca 100644 --- a/Config.mk +++ b/Config.mk @@ -203,7 +203,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.2-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= eccc68722696864fc4823f048c7be58d11281b97 +QEMU_UPSTREAM_REVISION ?= 351f94ff4bf3a7795ca5b282305aa610e598eec0 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 -- 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 Mar 12 11:22:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:22: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 1UFNHV-0006cp-R1; Tue, 12 Mar 2013 11:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHU-0006ch-Ct for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:08 +0000 Received: from [85.158.143.99:30029] by server-2.bemta-4.messagelabs.com id E1/85-12656-FDF0F315; Tue, 12 Mar 2013 11:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1363087325!22841046!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31953 invoked from network); 12 Mar 2013 11:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHQ-0007uF-4i for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHP-0005w9-Hq for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:03 +0000 Date: Tue, 12 Mar 2013 11:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit1: track residual from divisions done during accounting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cf0c29d1a99f17fe9e501e4e09d9d1e3eced6f98 Author: Jan Beulich AuthorDate: Thu Feb 28 11:06:42 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:06:42 2013 +0100 credit1: track residual from divisions done during accounting This should help with under-accounting of vCPU-s running for extremly short periods of time, but becoming runnable again at a high frequency. Signed-off-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index df2d076..7fbc005 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -136,6 +137,7 @@ struct csched_vcpu { struct csched_dom *sdom; struct vcpu *vcpu; atomic_t credit; + unsigned int residual; s_time_t start_time; /* When we were scheduled (used for credit) */ uint16_t flags; int16_t pri; @@ -242,6 +244,7 @@ __runq_remove(struct csched_vcpu *svc) static void burn_credits(struct csched_vcpu *svc, s_time_t now) { s_time_t delta; + uint64_t val; unsigned int credits; /* Assert svc is current */ @@ -250,7 +253,10 @@ static void burn_credits(struct csched_vcpu *svc, s_time_t now) if ( (delta = now - svc->start_time) <= 0 ) return; - credits = (delta*CSCHED_CREDITS_PER_MSEC + MILLISECS(1)/2) / MILLISECS(1); + val = delta * CSCHED_CREDITS_PER_MSEC + svc->residual; + svc->residual = do_div(val, MILLISECS(1)); + credits = val; + ASSERT(credits == val); /* make sure we haven't truncated val */ atomic_sub(credits, &svc->credit); svc->start_time += (credits * MILLISECS(1)) / CSCHED_CREDITS_PER_MSEC; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:22:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:22: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 1UFNHV-0006cp-R1; Tue, 12 Mar 2013 11:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHU-0006ch-Ct for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:08 +0000 Received: from [85.158.143.99:30029] by server-2.bemta-4.messagelabs.com id E1/85-12656-FDF0F315; Tue, 12 Mar 2013 11:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1363087325!22841046!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31953 invoked from network); 12 Mar 2013 11:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHQ-0007uF-4i for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHP-0005w9-Hq for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:03 +0000 Date: Tue, 12 Mar 2013 11:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit1: track residual from divisions done during accounting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cf0c29d1a99f17fe9e501e4e09d9d1e3eced6f98 Author: Jan Beulich AuthorDate: Thu Feb 28 11:06:42 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:06:42 2013 +0100 credit1: track residual from divisions done during accounting This should help with under-accounting of vCPU-s running for extremly short periods of time, but becoming runnable again at a high frequency. Signed-off-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index df2d076..7fbc005 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -136,6 +137,7 @@ struct csched_vcpu { struct csched_dom *sdom; struct vcpu *vcpu; atomic_t credit; + unsigned int residual; s_time_t start_time; /* When we were scheduled (used for credit) */ uint16_t flags; int16_t pri; @@ -242,6 +244,7 @@ __runq_remove(struct csched_vcpu *svc) static void burn_credits(struct csched_vcpu *svc, s_time_t now) { s_time_t delta; + uint64_t val; unsigned int credits; /* Assert svc is current */ @@ -250,7 +253,10 @@ static void burn_credits(struct csched_vcpu *svc, s_time_t now) if ( (delta = now - svc->start_time) <= 0 ) return; - credits = (delta*CSCHED_CREDITS_PER_MSEC + MILLISECS(1)/2) / MILLISECS(1); + val = delta * CSCHED_CREDITS_PER_MSEC + svc->residual; + svc->residual = do_div(val, MILLISECS(1)); + credits = val; + ASSERT(credits == val); /* make sure we haven't truncated val */ atomic_sub(credits, &svc->credit); svc->start_time += (credits * MILLISECS(1)) / CSCHED_CREDITS_PER_MSEC; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:22:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNHl-0006eh-UE; Tue, 12 Mar 2013 11:22:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHk-0006eR-IO for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:24 +0000 Received: from [85.158.143.99:31281] by server-2.bemta-4.messagelabs.com id B2/C5-12656-FEF0F315; Tue, 12 Mar 2013 11:22:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087336!27741941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17344 invoked from network); 12 Mar 2013 11:22:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHc-0007uI-7n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHb-0005wb-VJ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:16 +0000 Date: Tue, 12 Mar 2013 11:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: introduce create_perdomain_mapping() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 703ac3abcfc5f649c038070867ee12c67f730548 Author: Jan Beulich AuthorDate: Thu Feb 28 11:08:13 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:08:13 2013 +0100 x86: introduce create_perdomain_mapping() ... as well as free_perdomain_mappings(), and use them to carry out the existing per-domain mapping setup/teardown. This at once makes the setup of the first sub-range PV domain specific (with idle domains also excluded), as the GDT/LDT mapping area is needed only for those. Also fix an improperly scaled BUILD_BUG_ON() expression in mapcache_domain_init(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 92 +++++++-------------- xen/arch/x86/domain_page.c | 129 ++++++----------------------- xen/arch/x86/mm.c | 188 ++++++++++++++++++++++++++++++++++++++++-- xen/include/asm-x86/config.h | 10 +-- xen/include/asm-x86/domain.h | 16 +--- xen/include/asm-x86/mm.h | 8 ++ 6 files changed, 251 insertions(+), 192 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index c1f96ff..3cdee86 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -372,37 +372,16 @@ int switch_compat(struct domain *d) int vcpu_initialise(struct vcpu *v) { struct domain *d = v->domain; - unsigned int idx; int rc; v->arch.flags = TF_kernel_mode; - idx = perdomain_pt_idx(v); - if ( !d->arch.perdomain_pts[idx] ) - { - void *pt; - l2_pgentry_t *l2tab; - - pt = alloc_xenheap_pages(0, MEMF_node(vcpu_to_node(v))); - if ( !pt ) - return -ENOMEM; - clear_page(pt); - d->arch.perdomain_pts[idx] = pt; - - l2tab = __map_domain_page(d->arch.perdomain_l2_pg[0]); - l2tab[l2_table_offset(PERDOMAIN_VIRT_START) + idx] - = l2e_from_paddr(__pa(pt), __PAGE_HYPERVISOR); - unmap_domain_page(l2tab); - } - rc = mapcache_vcpu_init(v); if ( rc ) return rc; paging_vcpu_init(v); - v->arch.perdomain_ptes = perdomain_ptes(d, v); - if ( (rc = vcpu_init_fpu(v)) != 0 ) return rc; @@ -420,6 +399,12 @@ int vcpu_initialise(struct vcpu *v) if ( !is_idle_domain(d) ) { + rc = create_perdomain_mapping(d, GDT_VIRT_START(v), + 1 << GDT_LDT_VCPU_SHIFT, + d->arch.pv_domain.gdt_ldt_l1tab, NULL); + if ( rc ) + goto done; + BUILD_BUG_ON(NR_VECTORS * sizeof(*v->arch.pv_vcpu.trap_ctxt) > PAGE_SIZE); v->arch.pv_vcpu.trap_ctxt = xzalloc_array(struct trap_info, @@ -478,8 +463,6 @@ void vcpu_destroy(struct vcpu *v) int arch_domain_create(struct domain *d, unsigned int domcr_flags) { - struct page_info *pg; - l3_pgentry_t *l3tab; int i, paging_initialised = 0; int rc = -ENOMEM; @@ -510,29 +493,24 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) d->domain_id); } - BUILD_BUG_ON(PDPT_L2_ENTRIES * sizeof(*d->arch.perdomain_pts) - != PAGE_SIZE); - d->arch.perdomain_pts = - alloc_xenheap_pages(0, MEMF_node(domain_to_node(d))); - if ( !d->arch.perdomain_pts ) - goto fail; - clear_page(d->arch.perdomain_pts); - - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); - if ( pg == NULL ) - goto fail; - d->arch.perdomain_l2_pg[0] = pg; - clear_domain_page(page_to_mfn(pg)); + if ( is_hvm_domain(d) ) + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + else if ( is_idle_domain(d) ) + rc = 0; + else + { + d->arch.pv_domain.gdt_ldt_l1tab = + alloc_xenheap_pages(0, MEMF_node(domain_to_node(d))); + if ( !d->arch.pv_domain.gdt_ldt_l1tab ) + goto fail; + clear_page(d->arch.pv_domain.gdt_ldt_l1tab); - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); - if ( pg == NULL ) + rc = create_perdomain_mapping(d, GDT_LDT_VIRT_START, + GDT_LDT_MBYTES << (20 - PAGE_SHIFT), + NULL, NULL); + } + if ( rc ) goto fail; - d->arch.perdomain_l3_pg = pg; - l3tab = __map_domain_page(pg); - clear_page(l3tab); - l3tab[l3_table_offset(PERDOMAIN_VIRT_START)] = - l3e_from_page(d->arch.perdomain_l2_pg[0], __PAGE_HYPERVISOR); - unmap_domain_page(l3tab); mapcache_domain_init(d); @@ -608,19 +586,14 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( paging_initialised ) paging_final_teardown(d); mapcache_domain_exit(d); - for ( i = 0; i < PERDOMAIN_SLOTS; ++i) - if ( d->arch.perdomain_l2_pg[i] ) - free_domheap_page(d->arch.perdomain_l2_pg[i]); - if ( d->arch.perdomain_l3_pg ) - free_domheap_page(d->arch.perdomain_l3_pg); - free_xenheap_page(d->arch.perdomain_pts); + free_perdomain_mappings(d); + if ( !is_hvm_domain(d) ) + free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); return rc; } void arch_domain_destroy(struct domain *d) { - unsigned int i; - if ( is_hvm_domain(d) ) hvm_domain_destroy(d); else @@ -634,13 +607,9 @@ void arch_domain_destroy(struct domain *d) mapcache_domain_exit(d); - for ( i = 0; i < PDPT_L2_ENTRIES; ++i ) - free_xenheap_page(d->arch.perdomain_pts[i]); - free_xenheap_page(d->arch.perdomain_pts); - for ( i = 0; i < PERDOMAIN_SLOTS; ++i) - if ( d->arch.perdomain_l2_pg[i] ) - free_domheap_page(d->arch.perdomain_l2_pg[i]); - free_domheap_page(d->arch.perdomain_l3_pg); + free_perdomain_mappings(d); + if ( !is_hvm_domain(d) ) + free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); free_xenheap_page(d->shared_info); cleanup_domain_irq_mapping(d); @@ -1515,10 +1484,11 @@ static void __context_switch(void) if ( need_full_gdt(n) ) { unsigned long mfn = virt_to_mfn(gdt); + l1_pgentry_t *pl1e = gdt_ldt_ptes(n->domain, n); unsigned int i; + for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) - l1e_write(n->arch.perdomain_ptes + - FIRST_RESERVED_GDT_PAGE + i, + l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR)); } diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index acc9486..989ec29 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -243,10 +243,7 @@ void copy_domain_page(unsigned long dmfn, unsigned long smfn) int mapcache_domain_init(struct domain *d) { struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; - l3_pgentry_t *l3tab; - l2_pgentry_t *l2tab; - unsigned int i, bitmap_pages, memf = MEMF_node(domain_to_node(d)); - unsigned long *end; + unsigned int bitmap_pages; if ( is_hvm_domain(d) || is_idle_domain(d) ) return 0; @@ -256,48 +253,23 @@ int mapcache_domain_init(struct domain *d) return 0; #endif - dcache->l1tab = xzalloc_array(l1_pgentry_t *, MAPCACHE_L2_ENTRIES + 1); - d->arch.perdomain_l2_pg[MAPCACHE_SLOT] = alloc_domheap_page(NULL, memf); - if ( !dcache->l1tab || !d->arch.perdomain_l2_pg[MAPCACHE_SLOT] ) + dcache->l1tab = xzalloc_array(l1_pgentry_t *, MAPCACHE_L2_ENTRIES); + if ( !dcache->l1tab ) return -ENOMEM; - clear_domain_page(page_to_mfn(d->arch.perdomain_l2_pg[MAPCACHE_SLOT])); - l3tab = __map_domain_page(d->arch.perdomain_l3_pg); - l3tab[l3_table_offset(MAPCACHE_VIRT_START)] = - l3e_from_page(d->arch.perdomain_l2_pg[MAPCACHE_SLOT], - __PAGE_HYPERVISOR); - unmap_domain_page(l3tab); - - l2tab = __map_domain_page(d->arch.perdomain_l2_pg[MAPCACHE_SLOT]); - - BUILD_BUG_ON(MAPCACHE_VIRT_END + 3 + - 2 * PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long)) > + BUILD_BUG_ON(MAPCACHE_VIRT_END + PAGE_SIZE * (3 + + 2 * PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long))) > MAPCACHE_VIRT_START + (PERDOMAIN_SLOT_MBYTES << 20)); bitmap_pages = PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long)); dcache->inuse = (void *)MAPCACHE_VIRT_END + PAGE_SIZE; dcache->garbage = dcache->inuse + (bitmap_pages + 1) * PAGE_SIZE / sizeof(long); - end = dcache->garbage + bitmap_pages * PAGE_SIZE / sizeof(long); - - for ( i = l2_table_offset((unsigned long)dcache->inuse); - i <= l2_table_offset((unsigned long)(end - 1)); ++i ) - { - ASSERT(i <= MAPCACHE_L2_ENTRIES); - dcache->l1tab[i] = alloc_xenheap_pages(0, memf); - if ( !dcache->l1tab[i] ) - { - unmap_domain_page(l2tab); - return -ENOMEM; - } - clear_page(dcache->l1tab[i]); - l2tab[i] = l2e_from_paddr(__pa(dcache->l1tab[i]), __PAGE_HYPERVISOR); - } - - unmap_domain_page(l2tab); spin_lock_init(&dcache->lock); - return 0; + return create_perdomain_mapping(d, (unsigned long)dcache->inuse, + 2 * bitmap_pages + 1, + NIL(l1_pgentry_t *), NULL); } void mapcache_domain_exit(struct domain *d) @@ -307,94 +279,41 @@ void mapcache_domain_exit(struct domain *d) if ( is_hvm_domain(d) ) return; - if ( dcache->l1tab ) - { - unsigned long i; - - for ( i = (unsigned long)dcache->inuse; ; i += PAGE_SIZE ) - { - l1_pgentry_t *pl1e; - - if ( l2_table_offset(i) > MAPCACHE_L2_ENTRIES || - !dcache->l1tab[l2_table_offset(i)] ) - break; - - pl1e = &dcache->l1tab[l2_table_offset(i)][l1_table_offset(i)]; - if ( l1e_get_flags(*pl1e) ) - free_domheap_page(l1e_get_page(*pl1e)); - } - - for ( i = 0; i < MAPCACHE_L2_ENTRIES + 1; ++i ) - free_xenheap_page(dcache->l1tab[i]); - - xfree(dcache->l1tab); - } + xfree(dcache->l1tab); } int mapcache_vcpu_init(struct vcpu *v) { struct domain *d = v->domain; struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; - l2_pgentry_t *l2tab; unsigned long i; - unsigned int memf = MEMF_node(vcpu_to_node(v)); + unsigned int ents = d->max_vcpus * MAPCACHE_VCPU_ENTRIES; + unsigned int nr = PFN_UP(BITS_TO_LONGS(ents) * sizeof(long)); if ( is_hvm_vcpu(v) || !dcache->l1tab ) return 0; - l2tab = __map_domain_page(d->arch.perdomain_l2_pg[MAPCACHE_SLOT]); - - while ( dcache->entries < d->max_vcpus * MAPCACHE_VCPU_ENTRIES ) + if ( ents > dcache->entries ) { - unsigned int ents = dcache->entries + MAPCACHE_VCPU_ENTRIES; - l1_pgentry_t *pl1e; - /* Populate page tables. */ - if ( !dcache->l1tab[i = mapcache_l2_entry(ents - 1)] ) - { - dcache->l1tab[i] = alloc_xenheap_pages(0, memf); - if ( !dcache->l1tab[i] ) - { - unmap_domain_page(l2tab); - return -ENOMEM; - } - clear_page(dcache->l1tab[i]); - l2tab[i] = l2e_from_paddr(__pa(dcache->l1tab[i]), - __PAGE_HYPERVISOR); - } + int rc = create_perdomain_mapping(d, MAPCACHE_VIRT_START, + d->max_vcpus * MAPCACHE_VCPU_ENTRIES, + dcache->l1tab, NULL); /* Populate bit maps. */ - i = (unsigned long)(dcache->inuse + BITS_TO_LONGS(ents)); - pl1e = &dcache->l1tab[l2_table_offset(i)][l1_table_offset(i)]; - if ( !l1e_get_flags(*pl1e) ) - { - struct page_info *pg = alloc_domheap_page(NULL, memf); - - if ( pg ) - { - clear_domain_page(page_to_mfn(pg)); - *pl1e = l1e_from_page(pg, __PAGE_HYPERVISOR); - pg = alloc_domheap_page(NULL, memf); - } - if ( !pg ) - { - unmap_domain_page(l2tab); - return -ENOMEM; - } - - i = (unsigned long)(dcache->garbage + BITS_TO_LONGS(ents)); - pl1e = &dcache->l1tab[l2_table_offset(i)][l1_table_offset(i)]; - ASSERT(!l1e_get_flags(*pl1e)); - - clear_domain_page(page_to_mfn(pg)); - *pl1e = l1e_from_page(pg, __PAGE_HYPERVISOR); - } + if ( !rc ) + rc = create_perdomain_mapping(d, (unsigned long)dcache->inuse, + nr, NULL, NIL(struct page_info *)); + if ( !rc ) + rc = create_perdomain_mapping(d, (unsigned long)dcache->garbage, + nr, NULL, NIL(struct page_info *)); + + if ( rc ) + return rc; dcache->entries = ents; } - unmap_domain_page(l2tab); - /* Mark all maphash entries as not in use. */ BUILD_BUG_ON(MAPHASHENT_NOTINUSE < MAPCACHE_ENTRIES); for ( i = 0; i < MAPHASH_ENTRIES; i++ ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index add93ac..335a85c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -511,6 +511,7 @@ void update_cr3(struct vcpu *v) static void invalidate_shadow_ldt(struct vcpu *v, int flush) { + l1_pgentry_t *pl1e; int i; unsigned long pfn; struct page_info *page; @@ -523,12 +524,13 @@ static void invalidate_shadow_ldt(struct vcpu *v, int flush) goto out; v->arch.pv_vcpu.shadow_ldt_mapcnt = 0; + pl1e = gdt_ldt_ptes(v->domain, v); for ( i = 16; i < 32; i++ ) { - pfn = l1e_get_pfn(v->arch.perdomain_ptes[i]); + pfn = l1e_get_pfn(pl1e[i]); if ( pfn == 0 ) continue; - l1e_write(&v->arch.perdomain_ptes[i], l1e_empty()); + l1e_write(&pl1e[i], l1e_empty()); page = mfn_to_page(pfn); ASSERT_PAGE_IS_TYPE(page, PGT_seg_desc_page); ASSERT_PAGE_IS_DOMAIN(page, v->domain); @@ -596,7 +598,7 @@ int map_ldt_shadow_page(unsigned int off) nl1e = l1e_from_pfn(page_to_mfn(page), l1e_get_flags(l1e) | _PAGE_RW); spin_lock(&v->arch.pv_vcpu.shadow_ldt_lock); - l1e_write(&v->arch.perdomain_ptes[off + 16], nl1e); + l1e_write(&gdt_ldt_ptes(d, v)[off + 16], nl1e); v->arch.pv_vcpu.shadow_ldt_mapcnt++; spin_unlock(&v->arch.pv_vcpu.shadow_ldt_lock); @@ -4073,15 +4075,17 @@ long do_update_va_mapping_otherdomain(unsigned long va, u64 val64, void destroy_gdt(struct vcpu *v) { + l1_pgentry_t *pl1e; int i; unsigned long pfn; v->arch.pv_vcpu.gdt_ents = 0; + pl1e = gdt_ldt_ptes(v->domain, v); for ( i = 0; i < FIRST_RESERVED_GDT_PAGE; i++ ) { - if ( (pfn = l1e_get_pfn(v->arch.perdomain_ptes[i])) != 0 ) + if ( (pfn = l1e_get_pfn(pl1e[i])) != 0 ) put_page_and_type(mfn_to_page(pfn)); - l1e_write(&v->arch.perdomain_ptes[i], l1e_empty()); + l1e_write(&pl1e[i], l1e_empty()); v->arch.pv_vcpu.gdt_frames[i] = 0; } } @@ -4092,6 +4096,7 @@ long set_gdt(struct vcpu *v, unsigned int entries) { struct domain *d = v->domain; + l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; unsigned long mfn, *pfns; @@ -4124,11 +4129,11 @@ long set_gdt(struct vcpu *v, /* Install the new GDT. */ v->arch.pv_vcpu.gdt_ents = entries; + pl1e = gdt_ldt_ptes(d, v); for ( i = 0; i < nr_pages; i++ ) { v->arch.pv_vcpu.gdt_frames[i] = frames[i]; - l1e_write(&v->arch.perdomain_ptes[i], - l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); + l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); } xfree(pfns); @@ -5528,6 +5533,175 @@ void __iomem *ioremap(paddr_t pa, size_t len) return (void __force __iomem *)va; } +int create_perdomain_mapping(struct domain *d, unsigned long va, + unsigned int nr, l1_pgentry_t **pl1tab, + struct page_info **ppg) +{ + struct page_info *pg; + l3_pgentry_t *l3tab; + l2_pgentry_t *l2tab; + l1_pgentry_t *l1tab; + unsigned int memf = MEMF_node(domain_to_node(d)); + int rc = 0; + + ASSERT(va >= PERDOMAIN_VIRT_START && + va < PERDOMAIN_VIRT_SLOT(PERDOMAIN_SLOTS)); + + if ( !d->arch.perdomain_l3_pg ) + { + pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + if ( !pg ) + return -ENOMEM; + l3tab = __map_domain_page(pg); + clear_page(l3tab); + d->arch.perdomain_l3_pg = pg; + if ( !nr ) + { + unmap_domain_page(l3tab); + return 0; + } + } + else if ( !nr ) + return 0; + else + l3tab = __map_domain_page(d->arch.perdomain_l3_pg); + + ASSERT(!l3_table_offset(va ^ (va + nr * PAGE_SIZE - 1))); + + if ( !(l3e_get_flags(l3tab[l3_table_offset(va)]) & _PAGE_PRESENT) ) + { + pg = alloc_domheap_page(NULL, memf); + if ( !pg ) + { + unmap_domain_page(l3tab); + return -ENOMEM; + } + l2tab = __map_domain_page(pg); + clear_page(l2tab); + l3tab[l3_table_offset(va)] = l3e_from_page(pg, __PAGE_HYPERVISOR); + } + else + l2tab = map_domain_page(l3e_get_pfn(l3tab[l3_table_offset(va)])); + + unmap_domain_page(l3tab); + + if ( !pl1tab && !ppg ) + { + unmap_domain_page(l2tab); + return 0; + } + + for ( l1tab = NULL; !rc && nr--; ) + { + l2_pgentry_t *pl2e = l2tab + l2_table_offset(va); + + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + if ( pl1tab && !IS_NIL(pl1tab) ) + { + l1tab = alloc_xenheap_pages(0, memf); + if ( !l1tab ) + { + rc = -ENOMEM; + break; + } + ASSERT(!pl1tab[l2_table_offset(va)]); + pl1tab[l2_table_offset(va)] = l1tab; + pg = virt_to_page(l1tab); + } + else + { + pg = alloc_domheap_page(NULL, memf); + if ( !pg ) + { + rc = -ENOMEM; + break; + } + l1tab = __map_domain_page(pg); + } + clear_page(l1tab); + *pl2e = l2e_from_page(pg, __PAGE_HYPERVISOR); + } + else if ( !l1tab ) + l1tab = map_domain_page(l2e_get_pfn(*pl2e)); + + if ( ppg && + !(l1e_get_flags(l1tab[l1_table_offset(va)]) & _PAGE_PRESENT) ) + { + pg = alloc_domheap_page(NULL, memf); + if ( pg ) + { + clear_domain_page(page_to_mfn(pg)); + if ( !IS_NIL(ppg) ) + *ppg++ = pg; + l1tab[l1_table_offset(va)] = + l1e_from_page(pg, __PAGE_HYPERVISOR | _PAGE_AVAIL0); + l2e_add_flags(*pl2e, _PAGE_AVAIL0); + } + else + rc = -ENOMEM; + } + + va += PAGE_SIZE; + if ( rc || !nr || !l1_table_offset(va) ) + { + /* Note that this is a no-op for the alloc_xenheap_page() case. */ + unmap_domain_page(l1tab); + l1tab = NULL; + } + } + + ASSERT(!l1tab); + unmap_domain_page(l2tab); + + return rc; +} + +void free_perdomain_mappings(struct domain *d) +{ + l3_pgentry_t *l3tab = __map_domain_page(d->arch.perdomain_l3_pg); + unsigned int i; + + for ( i = 0; i < PERDOMAIN_SLOTS; ++i) + if ( l3e_get_flags(l3tab[i]) & _PAGE_PRESENT ) + { + struct page_info *l2pg = l3e_get_page(l3tab[i]); + l2_pgentry_t *l2tab = __map_domain_page(l2pg); + unsigned int j; + + for ( j = 0; j < L2_PAGETABLE_ENTRIES; ++j ) + if ( l2e_get_flags(l2tab[j]) & _PAGE_PRESENT ) + { + struct page_info *l1pg = l2e_get_page(l2tab[j]); + + if ( l2e_get_flags(l2tab[j]) & _PAGE_AVAIL0 ) + { + l1_pgentry_t *l1tab = __map_domain_page(l1pg); + unsigned int k; + + for ( k = 0; k < L1_PAGETABLE_ENTRIES; ++k ) + if ( (l1e_get_flags(l1tab[k]) & + (_PAGE_PRESENT | _PAGE_AVAIL0)) == + (_PAGE_PRESENT | _PAGE_AVAIL0) ) + free_domheap_page(l1e_get_page(l1tab[k])); + + unmap_domain_page(l1tab); + } + + if ( is_xen_heap_page(l1pg) ) + free_xenheap_page(page_to_virt(l1pg)); + else + free_domheap_page(l1pg); + } + + unmap_domain_page(l2tab); + free_domheap_page(l2pg); + } + + unmap_domain_page(l3tab); + free_domheap_page(d->arch.perdomain_l3_pg); +} + #ifdef MEMORY_GUARD void memguard_init(void) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 70f70b3..dc928ed 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -304,19 +304,13 @@ extern unsigned long xen_phys_start; #define LDT_VIRT_START(v) \ (GDT_VIRT_START(v) + (64*1024)) -/* map_domain_page() map cache. The last per-domain-mapping sub-area. */ +/* map_domain_page() map cache. The second per-domain-mapping sub-area. */ #define MAPCACHE_VCPU_ENTRIES (CONFIG_PAGING_LEVELS * CONFIG_PAGING_LEVELS) #define MAPCACHE_ENTRIES (MAX_VIRT_CPUS * MAPCACHE_VCPU_ENTRIES) -#define MAPCACHE_SLOT (PERDOMAIN_SLOTS - 1) -#define MAPCACHE_VIRT_START PERDOMAIN_VIRT_SLOT(MAPCACHE_SLOT) +#define MAPCACHE_VIRT_START PERDOMAIN_VIRT_SLOT(1) #define MAPCACHE_VIRT_END (MAPCACHE_VIRT_START + \ MAPCACHE_ENTRIES * PAGE_SIZE) -#define PDPT_L1_ENTRIES \ - ((PERDOMAIN_VIRT_SLOT(PERDOMAIN_SLOTS - 1) - PERDOMAIN_VIRT_START) >> PAGE_SHIFT) -#define PDPT_L2_ENTRIES \ - ((PDPT_L1_ENTRIES + (1 << PAGETABLE_ORDER) - 1) >> PAGETABLE_ORDER) - #define ELFSIZE 64 #define ARCH_CRASH_SAVE_VMCOREINFO diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 91d7d4f..30efe33 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -223,6 +223,8 @@ struct time_scale { struct pv_domain { + l1_pgentry_t **gdt_ldt_l1tab; + /* Shared page for notifying that explicit PIRQ EOI is required. */ unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; @@ -241,8 +243,6 @@ struct pv_domain struct arch_domain { - void **perdomain_pts; - struct page_info *perdomain_l2_pg[PERDOMAIN_SLOTS]; struct page_info *perdomain_l3_pg; unsigned int hv_compat_vstart; @@ -318,10 +318,10 @@ struct arch_domain #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) #define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) -#define perdomain_pt_idx(v) \ +#define gdt_ldt_pt_idx(v) \ ((v)->vcpu_id >> (PAGETABLE_ORDER - GDT_LDT_VCPU_SHIFT)) -#define perdomain_ptes(d, v) \ - ((l1_pgentry_t *)(d)->arch.perdomain_pts[perdomain_pt_idx(v)] + \ +#define gdt_ldt_ptes(d, v) \ + ((d)->arch.pv_domain.gdt_ldt_l1tab[gdt_ldt_pt_idx(v)] + \ (((v)->vcpu_id << GDT_LDT_VCPU_SHIFT) & (L1_PAGETABLE_ENTRIES - 1))) struct pv_vcpu @@ -406,12 +406,6 @@ struct arch_vcpu struct hvm_vcpu hvm_vcpu; }; - /* - * Every domain has a L1 pagetable of its own. Per-domain mappings - * are put in this table (eg. the current GDT is mapped here). - */ - l1_pgentry_t *perdomain_ptes; - pagetable_t guest_table_user; /* (MFN) x86/64 user-space pagetable */ pagetable_t guest_table; /* (MFN) guest notion of cr3 */ /* guest_table holds a ref to the page, and also a type-count unless diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 4f89dae..3c65a7c 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -573,6 +573,14 @@ int donate_page( int map_ldt_shadow_page(unsigned int); +#define NIL(type) ((type *)NULL - 1) +#define IS_NIL(ptr) (!((ptr) + 1)) + +int create_perdomain_mapping(struct domain *, unsigned long va, + unsigned int nr, l1_pgentry_t **, + struct page_info **); +void free_perdomain_mappings(struct domain *); + extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm); void domain_set_alloc_bitsize(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:22:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNHl-0006eh-UE; Tue, 12 Mar 2013 11:22:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHk-0006eR-IO for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:24 +0000 Received: from [85.158.143.99:31281] by server-2.bemta-4.messagelabs.com id B2/C5-12656-FEF0F315; Tue, 12 Mar 2013 11:22:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087336!27741941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17344 invoked from network); 12 Mar 2013 11:22:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHc-0007uI-7n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHb-0005wb-VJ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:16 +0000 Date: Tue, 12 Mar 2013 11:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: introduce create_perdomain_mapping() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 703ac3abcfc5f649c038070867ee12c67f730548 Author: Jan Beulich AuthorDate: Thu Feb 28 11:08:13 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:08:13 2013 +0100 x86: introduce create_perdomain_mapping() ... as well as free_perdomain_mappings(), and use them to carry out the existing per-domain mapping setup/teardown. This at once makes the setup of the first sub-range PV domain specific (with idle domains also excluded), as the GDT/LDT mapping area is needed only for those. Also fix an improperly scaled BUILD_BUG_ON() expression in mapcache_domain_init(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 92 +++++++-------------- xen/arch/x86/domain_page.c | 129 ++++++----------------------- xen/arch/x86/mm.c | 188 ++++++++++++++++++++++++++++++++++++++++-- xen/include/asm-x86/config.h | 10 +-- xen/include/asm-x86/domain.h | 16 +--- xen/include/asm-x86/mm.h | 8 ++ 6 files changed, 251 insertions(+), 192 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index c1f96ff..3cdee86 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -372,37 +372,16 @@ int switch_compat(struct domain *d) int vcpu_initialise(struct vcpu *v) { struct domain *d = v->domain; - unsigned int idx; int rc; v->arch.flags = TF_kernel_mode; - idx = perdomain_pt_idx(v); - if ( !d->arch.perdomain_pts[idx] ) - { - void *pt; - l2_pgentry_t *l2tab; - - pt = alloc_xenheap_pages(0, MEMF_node(vcpu_to_node(v))); - if ( !pt ) - return -ENOMEM; - clear_page(pt); - d->arch.perdomain_pts[idx] = pt; - - l2tab = __map_domain_page(d->arch.perdomain_l2_pg[0]); - l2tab[l2_table_offset(PERDOMAIN_VIRT_START) + idx] - = l2e_from_paddr(__pa(pt), __PAGE_HYPERVISOR); - unmap_domain_page(l2tab); - } - rc = mapcache_vcpu_init(v); if ( rc ) return rc; paging_vcpu_init(v); - v->arch.perdomain_ptes = perdomain_ptes(d, v); - if ( (rc = vcpu_init_fpu(v)) != 0 ) return rc; @@ -420,6 +399,12 @@ int vcpu_initialise(struct vcpu *v) if ( !is_idle_domain(d) ) { + rc = create_perdomain_mapping(d, GDT_VIRT_START(v), + 1 << GDT_LDT_VCPU_SHIFT, + d->arch.pv_domain.gdt_ldt_l1tab, NULL); + if ( rc ) + goto done; + BUILD_BUG_ON(NR_VECTORS * sizeof(*v->arch.pv_vcpu.trap_ctxt) > PAGE_SIZE); v->arch.pv_vcpu.trap_ctxt = xzalloc_array(struct trap_info, @@ -478,8 +463,6 @@ void vcpu_destroy(struct vcpu *v) int arch_domain_create(struct domain *d, unsigned int domcr_flags) { - struct page_info *pg; - l3_pgentry_t *l3tab; int i, paging_initialised = 0; int rc = -ENOMEM; @@ -510,29 +493,24 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) d->domain_id); } - BUILD_BUG_ON(PDPT_L2_ENTRIES * sizeof(*d->arch.perdomain_pts) - != PAGE_SIZE); - d->arch.perdomain_pts = - alloc_xenheap_pages(0, MEMF_node(domain_to_node(d))); - if ( !d->arch.perdomain_pts ) - goto fail; - clear_page(d->arch.perdomain_pts); - - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); - if ( pg == NULL ) - goto fail; - d->arch.perdomain_l2_pg[0] = pg; - clear_domain_page(page_to_mfn(pg)); + if ( is_hvm_domain(d) ) + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + else if ( is_idle_domain(d) ) + rc = 0; + else + { + d->arch.pv_domain.gdt_ldt_l1tab = + alloc_xenheap_pages(0, MEMF_node(domain_to_node(d))); + if ( !d->arch.pv_domain.gdt_ldt_l1tab ) + goto fail; + clear_page(d->arch.pv_domain.gdt_ldt_l1tab); - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); - if ( pg == NULL ) + rc = create_perdomain_mapping(d, GDT_LDT_VIRT_START, + GDT_LDT_MBYTES << (20 - PAGE_SHIFT), + NULL, NULL); + } + if ( rc ) goto fail; - d->arch.perdomain_l3_pg = pg; - l3tab = __map_domain_page(pg); - clear_page(l3tab); - l3tab[l3_table_offset(PERDOMAIN_VIRT_START)] = - l3e_from_page(d->arch.perdomain_l2_pg[0], __PAGE_HYPERVISOR); - unmap_domain_page(l3tab); mapcache_domain_init(d); @@ -608,19 +586,14 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( paging_initialised ) paging_final_teardown(d); mapcache_domain_exit(d); - for ( i = 0; i < PERDOMAIN_SLOTS; ++i) - if ( d->arch.perdomain_l2_pg[i] ) - free_domheap_page(d->arch.perdomain_l2_pg[i]); - if ( d->arch.perdomain_l3_pg ) - free_domheap_page(d->arch.perdomain_l3_pg); - free_xenheap_page(d->arch.perdomain_pts); + free_perdomain_mappings(d); + if ( !is_hvm_domain(d) ) + free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); return rc; } void arch_domain_destroy(struct domain *d) { - unsigned int i; - if ( is_hvm_domain(d) ) hvm_domain_destroy(d); else @@ -634,13 +607,9 @@ void arch_domain_destroy(struct domain *d) mapcache_domain_exit(d); - for ( i = 0; i < PDPT_L2_ENTRIES; ++i ) - free_xenheap_page(d->arch.perdomain_pts[i]); - free_xenheap_page(d->arch.perdomain_pts); - for ( i = 0; i < PERDOMAIN_SLOTS; ++i) - if ( d->arch.perdomain_l2_pg[i] ) - free_domheap_page(d->arch.perdomain_l2_pg[i]); - free_domheap_page(d->arch.perdomain_l3_pg); + free_perdomain_mappings(d); + if ( !is_hvm_domain(d) ) + free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); free_xenheap_page(d->shared_info); cleanup_domain_irq_mapping(d); @@ -1515,10 +1484,11 @@ static void __context_switch(void) if ( need_full_gdt(n) ) { unsigned long mfn = virt_to_mfn(gdt); + l1_pgentry_t *pl1e = gdt_ldt_ptes(n->domain, n); unsigned int i; + for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) - l1e_write(n->arch.perdomain_ptes + - FIRST_RESERVED_GDT_PAGE + i, + l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR)); } diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index acc9486..989ec29 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -243,10 +243,7 @@ void copy_domain_page(unsigned long dmfn, unsigned long smfn) int mapcache_domain_init(struct domain *d) { struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; - l3_pgentry_t *l3tab; - l2_pgentry_t *l2tab; - unsigned int i, bitmap_pages, memf = MEMF_node(domain_to_node(d)); - unsigned long *end; + unsigned int bitmap_pages; if ( is_hvm_domain(d) || is_idle_domain(d) ) return 0; @@ -256,48 +253,23 @@ int mapcache_domain_init(struct domain *d) return 0; #endif - dcache->l1tab = xzalloc_array(l1_pgentry_t *, MAPCACHE_L2_ENTRIES + 1); - d->arch.perdomain_l2_pg[MAPCACHE_SLOT] = alloc_domheap_page(NULL, memf); - if ( !dcache->l1tab || !d->arch.perdomain_l2_pg[MAPCACHE_SLOT] ) + dcache->l1tab = xzalloc_array(l1_pgentry_t *, MAPCACHE_L2_ENTRIES); + if ( !dcache->l1tab ) return -ENOMEM; - clear_domain_page(page_to_mfn(d->arch.perdomain_l2_pg[MAPCACHE_SLOT])); - l3tab = __map_domain_page(d->arch.perdomain_l3_pg); - l3tab[l3_table_offset(MAPCACHE_VIRT_START)] = - l3e_from_page(d->arch.perdomain_l2_pg[MAPCACHE_SLOT], - __PAGE_HYPERVISOR); - unmap_domain_page(l3tab); - - l2tab = __map_domain_page(d->arch.perdomain_l2_pg[MAPCACHE_SLOT]); - - BUILD_BUG_ON(MAPCACHE_VIRT_END + 3 + - 2 * PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long)) > + BUILD_BUG_ON(MAPCACHE_VIRT_END + PAGE_SIZE * (3 + + 2 * PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long))) > MAPCACHE_VIRT_START + (PERDOMAIN_SLOT_MBYTES << 20)); bitmap_pages = PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long)); dcache->inuse = (void *)MAPCACHE_VIRT_END + PAGE_SIZE; dcache->garbage = dcache->inuse + (bitmap_pages + 1) * PAGE_SIZE / sizeof(long); - end = dcache->garbage + bitmap_pages * PAGE_SIZE / sizeof(long); - - for ( i = l2_table_offset((unsigned long)dcache->inuse); - i <= l2_table_offset((unsigned long)(end - 1)); ++i ) - { - ASSERT(i <= MAPCACHE_L2_ENTRIES); - dcache->l1tab[i] = alloc_xenheap_pages(0, memf); - if ( !dcache->l1tab[i] ) - { - unmap_domain_page(l2tab); - return -ENOMEM; - } - clear_page(dcache->l1tab[i]); - l2tab[i] = l2e_from_paddr(__pa(dcache->l1tab[i]), __PAGE_HYPERVISOR); - } - - unmap_domain_page(l2tab); spin_lock_init(&dcache->lock); - return 0; + return create_perdomain_mapping(d, (unsigned long)dcache->inuse, + 2 * bitmap_pages + 1, + NIL(l1_pgentry_t *), NULL); } void mapcache_domain_exit(struct domain *d) @@ -307,94 +279,41 @@ void mapcache_domain_exit(struct domain *d) if ( is_hvm_domain(d) ) return; - if ( dcache->l1tab ) - { - unsigned long i; - - for ( i = (unsigned long)dcache->inuse; ; i += PAGE_SIZE ) - { - l1_pgentry_t *pl1e; - - if ( l2_table_offset(i) > MAPCACHE_L2_ENTRIES || - !dcache->l1tab[l2_table_offset(i)] ) - break; - - pl1e = &dcache->l1tab[l2_table_offset(i)][l1_table_offset(i)]; - if ( l1e_get_flags(*pl1e) ) - free_domheap_page(l1e_get_page(*pl1e)); - } - - for ( i = 0; i < MAPCACHE_L2_ENTRIES + 1; ++i ) - free_xenheap_page(dcache->l1tab[i]); - - xfree(dcache->l1tab); - } + xfree(dcache->l1tab); } int mapcache_vcpu_init(struct vcpu *v) { struct domain *d = v->domain; struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; - l2_pgentry_t *l2tab; unsigned long i; - unsigned int memf = MEMF_node(vcpu_to_node(v)); + unsigned int ents = d->max_vcpus * MAPCACHE_VCPU_ENTRIES; + unsigned int nr = PFN_UP(BITS_TO_LONGS(ents) * sizeof(long)); if ( is_hvm_vcpu(v) || !dcache->l1tab ) return 0; - l2tab = __map_domain_page(d->arch.perdomain_l2_pg[MAPCACHE_SLOT]); - - while ( dcache->entries < d->max_vcpus * MAPCACHE_VCPU_ENTRIES ) + if ( ents > dcache->entries ) { - unsigned int ents = dcache->entries + MAPCACHE_VCPU_ENTRIES; - l1_pgentry_t *pl1e; - /* Populate page tables. */ - if ( !dcache->l1tab[i = mapcache_l2_entry(ents - 1)] ) - { - dcache->l1tab[i] = alloc_xenheap_pages(0, memf); - if ( !dcache->l1tab[i] ) - { - unmap_domain_page(l2tab); - return -ENOMEM; - } - clear_page(dcache->l1tab[i]); - l2tab[i] = l2e_from_paddr(__pa(dcache->l1tab[i]), - __PAGE_HYPERVISOR); - } + int rc = create_perdomain_mapping(d, MAPCACHE_VIRT_START, + d->max_vcpus * MAPCACHE_VCPU_ENTRIES, + dcache->l1tab, NULL); /* Populate bit maps. */ - i = (unsigned long)(dcache->inuse + BITS_TO_LONGS(ents)); - pl1e = &dcache->l1tab[l2_table_offset(i)][l1_table_offset(i)]; - if ( !l1e_get_flags(*pl1e) ) - { - struct page_info *pg = alloc_domheap_page(NULL, memf); - - if ( pg ) - { - clear_domain_page(page_to_mfn(pg)); - *pl1e = l1e_from_page(pg, __PAGE_HYPERVISOR); - pg = alloc_domheap_page(NULL, memf); - } - if ( !pg ) - { - unmap_domain_page(l2tab); - return -ENOMEM; - } - - i = (unsigned long)(dcache->garbage + BITS_TO_LONGS(ents)); - pl1e = &dcache->l1tab[l2_table_offset(i)][l1_table_offset(i)]; - ASSERT(!l1e_get_flags(*pl1e)); - - clear_domain_page(page_to_mfn(pg)); - *pl1e = l1e_from_page(pg, __PAGE_HYPERVISOR); - } + if ( !rc ) + rc = create_perdomain_mapping(d, (unsigned long)dcache->inuse, + nr, NULL, NIL(struct page_info *)); + if ( !rc ) + rc = create_perdomain_mapping(d, (unsigned long)dcache->garbage, + nr, NULL, NIL(struct page_info *)); + + if ( rc ) + return rc; dcache->entries = ents; } - unmap_domain_page(l2tab); - /* Mark all maphash entries as not in use. */ BUILD_BUG_ON(MAPHASHENT_NOTINUSE < MAPCACHE_ENTRIES); for ( i = 0; i < MAPHASH_ENTRIES; i++ ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index add93ac..335a85c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -511,6 +511,7 @@ void update_cr3(struct vcpu *v) static void invalidate_shadow_ldt(struct vcpu *v, int flush) { + l1_pgentry_t *pl1e; int i; unsigned long pfn; struct page_info *page; @@ -523,12 +524,13 @@ static void invalidate_shadow_ldt(struct vcpu *v, int flush) goto out; v->arch.pv_vcpu.shadow_ldt_mapcnt = 0; + pl1e = gdt_ldt_ptes(v->domain, v); for ( i = 16; i < 32; i++ ) { - pfn = l1e_get_pfn(v->arch.perdomain_ptes[i]); + pfn = l1e_get_pfn(pl1e[i]); if ( pfn == 0 ) continue; - l1e_write(&v->arch.perdomain_ptes[i], l1e_empty()); + l1e_write(&pl1e[i], l1e_empty()); page = mfn_to_page(pfn); ASSERT_PAGE_IS_TYPE(page, PGT_seg_desc_page); ASSERT_PAGE_IS_DOMAIN(page, v->domain); @@ -596,7 +598,7 @@ int map_ldt_shadow_page(unsigned int off) nl1e = l1e_from_pfn(page_to_mfn(page), l1e_get_flags(l1e) | _PAGE_RW); spin_lock(&v->arch.pv_vcpu.shadow_ldt_lock); - l1e_write(&v->arch.perdomain_ptes[off + 16], nl1e); + l1e_write(&gdt_ldt_ptes(d, v)[off + 16], nl1e); v->arch.pv_vcpu.shadow_ldt_mapcnt++; spin_unlock(&v->arch.pv_vcpu.shadow_ldt_lock); @@ -4073,15 +4075,17 @@ long do_update_va_mapping_otherdomain(unsigned long va, u64 val64, void destroy_gdt(struct vcpu *v) { + l1_pgentry_t *pl1e; int i; unsigned long pfn; v->arch.pv_vcpu.gdt_ents = 0; + pl1e = gdt_ldt_ptes(v->domain, v); for ( i = 0; i < FIRST_RESERVED_GDT_PAGE; i++ ) { - if ( (pfn = l1e_get_pfn(v->arch.perdomain_ptes[i])) != 0 ) + if ( (pfn = l1e_get_pfn(pl1e[i])) != 0 ) put_page_and_type(mfn_to_page(pfn)); - l1e_write(&v->arch.perdomain_ptes[i], l1e_empty()); + l1e_write(&pl1e[i], l1e_empty()); v->arch.pv_vcpu.gdt_frames[i] = 0; } } @@ -4092,6 +4096,7 @@ long set_gdt(struct vcpu *v, unsigned int entries) { struct domain *d = v->domain; + l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; unsigned long mfn, *pfns; @@ -4124,11 +4129,11 @@ long set_gdt(struct vcpu *v, /* Install the new GDT. */ v->arch.pv_vcpu.gdt_ents = entries; + pl1e = gdt_ldt_ptes(d, v); for ( i = 0; i < nr_pages; i++ ) { v->arch.pv_vcpu.gdt_frames[i] = frames[i]; - l1e_write(&v->arch.perdomain_ptes[i], - l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); + l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); } xfree(pfns); @@ -5528,6 +5533,175 @@ void __iomem *ioremap(paddr_t pa, size_t len) return (void __force __iomem *)va; } +int create_perdomain_mapping(struct domain *d, unsigned long va, + unsigned int nr, l1_pgentry_t **pl1tab, + struct page_info **ppg) +{ + struct page_info *pg; + l3_pgentry_t *l3tab; + l2_pgentry_t *l2tab; + l1_pgentry_t *l1tab; + unsigned int memf = MEMF_node(domain_to_node(d)); + int rc = 0; + + ASSERT(va >= PERDOMAIN_VIRT_START && + va < PERDOMAIN_VIRT_SLOT(PERDOMAIN_SLOTS)); + + if ( !d->arch.perdomain_l3_pg ) + { + pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + if ( !pg ) + return -ENOMEM; + l3tab = __map_domain_page(pg); + clear_page(l3tab); + d->arch.perdomain_l3_pg = pg; + if ( !nr ) + { + unmap_domain_page(l3tab); + return 0; + } + } + else if ( !nr ) + return 0; + else + l3tab = __map_domain_page(d->arch.perdomain_l3_pg); + + ASSERT(!l3_table_offset(va ^ (va + nr * PAGE_SIZE - 1))); + + if ( !(l3e_get_flags(l3tab[l3_table_offset(va)]) & _PAGE_PRESENT) ) + { + pg = alloc_domheap_page(NULL, memf); + if ( !pg ) + { + unmap_domain_page(l3tab); + return -ENOMEM; + } + l2tab = __map_domain_page(pg); + clear_page(l2tab); + l3tab[l3_table_offset(va)] = l3e_from_page(pg, __PAGE_HYPERVISOR); + } + else + l2tab = map_domain_page(l3e_get_pfn(l3tab[l3_table_offset(va)])); + + unmap_domain_page(l3tab); + + if ( !pl1tab && !ppg ) + { + unmap_domain_page(l2tab); + return 0; + } + + for ( l1tab = NULL; !rc && nr--; ) + { + l2_pgentry_t *pl2e = l2tab + l2_table_offset(va); + + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + if ( pl1tab && !IS_NIL(pl1tab) ) + { + l1tab = alloc_xenheap_pages(0, memf); + if ( !l1tab ) + { + rc = -ENOMEM; + break; + } + ASSERT(!pl1tab[l2_table_offset(va)]); + pl1tab[l2_table_offset(va)] = l1tab; + pg = virt_to_page(l1tab); + } + else + { + pg = alloc_domheap_page(NULL, memf); + if ( !pg ) + { + rc = -ENOMEM; + break; + } + l1tab = __map_domain_page(pg); + } + clear_page(l1tab); + *pl2e = l2e_from_page(pg, __PAGE_HYPERVISOR); + } + else if ( !l1tab ) + l1tab = map_domain_page(l2e_get_pfn(*pl2e)); + + if ( ppg && + !(l1e_get_flags(l1tab[l1_table_offset(va)]) & _PAGE_PRESENT) ) + { + pg = alloc_domheap_page(NULL, memf); + if ( pg ) + { + clear_domain_page(page_to_mfn(pg)); + if ( !IS_NIL(ppg) ) + *ppg++ = pg; + l1tab[l1_table_offset(va)] = + l1e_from_page(pg, __PAGE_HYPERVISOR | _PAGE_AVAIL0); + l2e_add_flags(*pl2e, _PAGE_AVAIL0); + } + else + rc = -ENOMEM; + } + + va += PAGE_SIZE; + if ( rc || !nr || !l1_table_offset(va) ) + { + /* Note that this is a no-op for the alloc_xenheap_page() case. */ + unmap_domain_page(l1tab); + l1tab = NULL; + } + } + + ASSERT(!l1tab); + unmap_domain_page(l2tab); + + return rc; +} + +void free_perdomain_mappings(struct domain *d) +{ + l3_pgentry_t *l3tab = __map_domain_page(d->arch.perdomain_l3_pg); + unsigned int i; + + for ( i = 0; i < PERDOMAIN_SLOTS; ++i) + if ( l3e_get_flags(l3tab[i]) & _PAGE_PRESENT ) + { + struct page_info *l2pg = l3e_get_page(l3tab[i]); + l2_pgentry_t *l2tab = __map_domain_page(l2pg); + unsigned int j; + + for ( j = 0; j < L2_PAGETABLE_ENTRIES; ++j ) + if ( l2e_get_flags(l2tab[j]) & _PAGE_PRESENT ) + { + struct page_info *l1pg = l2e_get_page(l2tab[j]); + + if ( l2e_get_flags(l2tab[j]) & _PAGE_AVAIL0 ) + { + l1_pgentry_t *l1tab = __map_domain_page(l1pg); + unsigned int k; + + for ( k = 0; k < L1_PAGETABLE_ENTRIES; ++k ) + if ( (l1e_get_flags(l1tab[k]) & + (_PAGE_PRESENT | _PAGE_AVAIL0)) == + (_PAGE_PRESENT | _PAGE_AVAIL0) ) + free_domheap_page(l1e_get_page(l1tab[k])); + + unmap_domain_page(l1tab); + } + + if ( is_xen_heap_page(l1pg) ) + free_xenheap_page(page_to_virt(l1pg)); + else + free_domheap_page(l1pg); + } + + unmap_domain_page(l2tab); + free_domheap_page(l2pg); + } + + unmap_domain_page(l3tab); + free_domheap_page(d->arch.perdomain_l3_pg); +} + #ifdef MEMORY_GUARD void memguard_init(void) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 70f70b3..dc928ed 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -304,19 +304,13 @@ extern unsigned long xen_phys_start; #define LDT_VIRT_START(v) \ (GDT_VIRT_START(v) + (64*1024)) -/* map_domain_page() map cache. The last per-domain-mapping sub-area. */ +/* map_domain_page() map cache. The second per-domain-mapping sub-area. */ #define MAPCACHE_VCPU_ENTRIES (CONFIG_PAGING_LEVELS * CONFIG_PAGING_LEVELS) #define MAPCACHE_ENTRIES (MAX_VIRT_CPUS * MAPCACHE_VCPU_ENTRIES) -#define MAPCACHE_SLOT (PERDOMAIN_SLOTS - 1) -#define MAPCACHE_VIRT_START PERDOMAIN_VIRT_SLOT(MAPCACHE_SLOT) +#define MAPCACHE_VIRT_START PERDOMAIN_VIRT_SLOT(1) #define MAPCACHE_VIRT_END (MAPCACHE_VIRT_START + \ MAPCACHE_ENTRIES * PAGE_SIZE) -#define PDPT_L1_ENTRIES \ - ((PERDOMAIN_VIRT_SLOT(PERDOMAIN_SLOTS - 1) - PERDOMAIN_VIRT_START) >> PAGE_SHIFT) -#define PDPT_L2_ENTRIES \ - ((PDPT_L1_ENTRIES + (1 << PAGETABLE_ORDER) - 1) >> PAGETABLE_ORDER) - #define ELFSIZE 64 #define ARCH_CRASH_SAVE_VMCOREINFO diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 91d7d4f..30efe33 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -223,6 +223,8 @@ struct time_scale { struct pv_domain { + l1_pgentry_t **gdt_ldt_l1tab; + /* Shared page for notifying that explicit PIRQ EOI is required. */ unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; @@ -241,8 +243,6 @@ struct pv_domain struct arch_domain { - void **perdomain_pts; - struct page_info *perdomain_l2_pg[PERDOMAIN_SLOTS]; struct page_info *perdomain_l3_pg; unsigned int hv_compat_vstart; @@ -318,10 +318,10 @@ struct arch_domain #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) #define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) -#define perdomain_pt_idx(v) \ +#define gdt_ldt_pt_idx(v) \ ((v)->vcpu_id >> (PAGETABLE_ORDER - GDT_LDT_VCPU_SHIFT)) -#define perdomain_ptes(d, v) \ - ((l1_pgentry_t *)(d)->arch.perdomain_pts[perdomain_pt_idx(v)] + \ +#define gdt_ldt_ptes(d, v) \ + ((d)->arch.pv_domain.gdt_ldt_l1tab[gdt_ldt_pt_idx(v)] + \ (((v)->vcpu_id << GDT_LDT_VCPU_SHIFT) & (L1_PAGETABLE_ENTRIES - 1))) struct pv_vcpu @@ -406,12 +406,6 @@ struct arch_vcpu struct hvm_vcpu hvm_vcpu; }; - /* - * Every domain has a L1 pagetable of its own. Per-domain mappings - * are put in this table (eg. the current GDT is mapped here). - */ - l1_pgentry_t *perdomain_ptes; - pagetable_t guest_table_user; /* (MFN) x86/64 user-space pagetable */ pagetable_t guest_table; /* (MFN) guest notion of cr3 */ /* guest_table holds a ref to the page, and also a type-count unless diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 4f89dae..3c65a7c 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -573,6 +573,14 @@ int donate_page( int map_ldt_shadow_page(unsigned int); +#define NIL(type) ((type *)NULL - 1) +#define IS_NIL(ptr) (!((ptr) + 1)) + +int create_perdomain_mapping(struct domain *, unsigned long va, + unsigned int nr, l1_pgentry_t **, + struct page_info **); +void free_perdomain_mappings(struct domain *); + extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm); void domain_set_alloc_bitsize(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:22:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:22: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 1UFNI2-0006gj-3O; Tue, 12 Mar 2013 11:22:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNI0-0006gW-BM for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:40 +0000 Received: from [85.158.139.83:14955] by server-16.bemta-5.messagelabs.com id D4/16-02543-FFF0F315; Tue, 12 Mar 2013 11:22:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1363087357!27562745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30227 invoked from network); 12 Mar 2013 11:22:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHx-0007uT-8i for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHw-0005xx-UW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:36 +0000 Date: Tue, 12 Mar 2013 11:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: use linear L1 page table for map_domain_page() page table manipulation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 625481082df4d2426a6d5d848edc0828df710022 Author: Jan Beulich AuthorDate: Thu Feb 28 11:10:53 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:10:53 2013 +0100 x86: use linear L1 page table for map_domain_page() page table manipulation This saves allocation of a Xen heap page for tracking the L1 page table pointers. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 3 -- xen/arch/x86/domain_page.c | 45 +++++++++++++---------------------------- xen/include/asm-x86/domain.h | 4 +-- 3 files changed, 15 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 3cdee86..8d30d08 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -585,7 +585,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) free_xenheap_page(d->shared_info); if ( paging_initialised ) paging_final_teardown(d); - mapcache_domain_exit(d); free_perdomain_mappings(d); if ( !is_hvm_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); @@ -605,8 +604,6 @@ void arch_domain_destroy(struct domain *d) paging_final_teardown(d); - mapcache_domain_exit(d); - free_perdomain_mappings(d); if ( !is_hvm_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 989ec29..7421e03 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -53,9 +53,8 @@ void __init mapcache_override_current(struct vcpu *v) #define mapcache_l2_entry(e) ((e) >> PAGETABLE_ORDER) #define MAPCACHE_L2_ENTRIES (mapcache_l2_entry(MAPCACHE_ENTRIES - 1) + 1) -#define DCACHE_L1ENT(dc, idx) \ - ((dc)->l1tab[(idx) >> PAGETABLE_ORDER] \ - [(idx) & ((1 << PAGETABLE_ORDER) - 1)]) +#define MAPCACHE_L1ENT(idx) \ + __linear_l1_table[l1_linear_offset(MAPCACHE_VIRT_START + pfn_to_paddr(idx))] void *map_domain_page(unsigned long mfn) { @@ -77,7 +76,7 @@ void *map_domain_page(unsigned long mfn) dcache = &v->domain->arch.pv_domain.mapcache; vcache = &v->arch.pv_vcpu.mapcache; - if ( !dcache->l1tab ) + if ( !dcache->inuse ) return mfn_to_virt(mfn); perfc_incr(map_domain_page_count); @@ -91,7 +90,7 @@ void *map_domain_page(unsigned long mfn) ASSERT(idx < dcache->entries); hashent->refcnt++; ASSERT(hashent->refcnt); - ASSERT(l1e_get_pfn(DCACHE_L1ENT(dcache, idx)) == mfn); + ASSERT(l1e_get_pfn(MAPCACHE_L1ENT(idx)) == mfn); goto out; } @@ -131,9 +130,8 @@ void *map_domain_page(unsigned long mfn) if ( hashent->idx != MAPHASHENT_NOTINUSE && !hashent->refcnt ) { idx = hashent->idx; - ASSERT(l1e_get_pfn(DCACHE_L1ENT(dcache, idx)) == - hashent->mfn); - l1e_write(&DCACHE_L1ENT(dcache, idx), l1e_empty()); + ASSERT(l1e_get_pfn(MAPCACHE_L1ENT(idx)) == hashent->mfn); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_empty()); hashent->idx = MAPHASHENT_NOTINUSE; hashent->mfn = ~0UL; break; @@ -156,8 +154,7 @@ void *map_domain_page(unsigned long mfn) spin_unlock(&dcache->lock); - l1e_write(&DCACHE_L1ENT(dcache, idx), - l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); out: local_irq_restore(flags); @@ -181,10 +178,10 @@ void unmap_domain_page(const void *ptr) ASSERT(v && !is_hvm_vcpu(v)); dcache = &v->domain->arch.pv_domain.mapcache; - ASSERT(dcache->l1tab); + ASSERT(dcache->inuse); idx = PFN_DOWN(va - MAPCACHE_VIRT_START); - mfn = l1e_get_pfn(DCACHE_L1ENT(dcache, idx)); + mfn = l1e_get_pfn(MAPCACHE_L1ENT(idx)); hashent = &v->arch.pv_vcpu.mapcache.hash[MAPHASH_HASHFN(mfn)]; local_irq_save(flags); @@ -200,9 +197,9 @@ void unmap_domain_page(const void *ptr) if ( hashent->idx != MAPHASHENT_NOTINUSE ) { /* /First/, zap the PTE. */ - ASSERT(l1e_get_pfn(DCACHE_L1ENT(dcache, hashent->idx)) == + ASSERT(l1e_get_pfn(MAPCACHE_L1ENT(hashent->idx)) == hashent->mfn); - l1e_write(&DCACHE_L1ENT(dcache, hashent->idx), l1e_empty()); + l1e_write(&MAPCACHE_L1ENT(hashent->idx), l1e_empty()); /* /Second/, mark as garbage. */ set_bit(hashent->idx, dcache->garbage); } @@ -214,7 +211,7 @@ void unmap_domain_page(const void *ptr) else { /* /First/, zap the PTE. */ - l1e_write(&DCACHE_L1ENT(dcache, idx), l1e_empty()); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_empty()); /* /Second/, mark as garbage. */ set_bit(idx, dcache->garbage); } @@ -253,10 +250,6 @@ int mapcache_domain_init(struct domain *d) return 0; #endif - dcache->l1tab = xzalloc_array(l1_pgentry_t *, MAPCACHE_L2_ENTRIES); - if ( !dcache->l1tab ) - return -ENOMEM; - BUILD_BUG_ON(MAPCACHE_VIRT_END + PAGE_SIZE * (3 + 2 * PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long))) > MAPCACHE_VIRT_START + (PERDOMAIN_SLOT_MBYTES << 20)); @@ -272,16 +265,6 @@ int mapcache_domain_init(struct domain *d) NIL(l1_pgentry_t *), NULL); } -void mapcache_domain_exit(struct domain *d) -{ - struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; - - if ( is_hvm_domain(d) ) - return; - - xfree(dcache->l1tab); -} - int mapcache_vcpu_init(struct vcpu *v) { struct domain *d = v->domain; @@ -290,7 +273,7 @@ int mapcache_vcpu_init(struct vcpu *v) unsigned int ents = d->max_vcpus * MAPCACHE_VCPU_ENTRIES; unsigned int nr = PFN_UP(BITS_TO_LONGS(ents) * sizeof(long)); - if ( is_hvm_vcpu(v) || !dcache->l1tab ) + if ( is_hvm_vcpu(v) || !dcache->inuse ) return 0; if ( ents > dcache->entries ) @@ -298,7 +281,7 @@ int mapcache_vcpu_init(struct vcpu *v) /* Populate page tables. */ int rc = create_perdomain_mapping(d, MAPCACHE_VIRT_START, d->max_vcpus * MAPCACHE_VCPU_ENTRIES, - dcache->l1tab, NULL); + NIL(l1_pgentry_t *), NULL); /* Populate bit maps. */ if ( !rc ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index f91f662..97e09ca 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -53,8 +53,7 @@ struct mapcache_vcpu { }; struct mapcache_domain { - /* The PTEs that provide the mappings, and a cursor into the array. */ - l1_pgentry_t **l1tab; + /* The number of array entries, and a cursor into the array. */ unsigned int entries; unsigned int cursor; @@ -71,7 +70,6 @@ struct mapcache_domain { }; int mapcache_domain_init(struct domain *); -void mapcache_domain_exit(struct domain *); int mapcache_vcpu_init(struct vcpu *); void mapcache_override_current(struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:22:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:22: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 1UFNI2-0006gj-3O; Tue, 12 Mar 2013 11:22:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNI0-0006gW-BM for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:40 +0000 Received: from [85.158.139.83:14955] by server-16.bemta-5.messagelabs.com id D4/16-02543-FFF0F315; Tue, 12 Mar 2013 11:22:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1363087357!27562745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30227 invoked from network); 12 Mar 2013 11:22:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHx-0007uT-8i for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHw-0005xx-UW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:36 +0000 Date: Tue, 12 Mar 2013 11:22:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: use linear L1 page table for map_domain_page() page table manipulation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 625481082df4d2426a6d5d848edc0828df710022 Author: Jan Beulich AuthorDate: Thu Feb 28 11:10:53 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:10:53 2013 +0100 x86: use linear L1 page table for map_domain_page() page table manipulation This saves allocation of a Xen heap page for tracking the L1 page table pointers. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 3 -- xen/arch/x86/domain_page.c | 45 +++++++++++++---------------------------- xen/include/asm-x86/domain.h | 4 +-- 3 files changed, 15 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 3cdee86..8d30d08 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -585,7 +585,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) free_xenheap_page(d->shared_info); if ( paging_initialised ) paging_final_teardown(d); - mapcache_domain_exit(d); free_perdomain_mappings(d); if ( !is_hvm_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); @@ -605,8 +604,6 @@ void arch_domain_destroy(struct domain *d) paging_final_teardown(d); - mapcache_domain_exit(d); - free_perdomain_mappings(d); if ( !is_hvm_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 989ec29..7421e03 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -53,9 +53,8 @@ void __init mapcache_override_current(struct vcpu *v) #define mapcache_l2_entry(e) ((e) >> PAGETABLE_ORDER) #define MAPCACHE_L2_ENTRIES (mapcache_l2_entry(MAPCACHE_ENTRIES - 1) + 1) -#define DCACHE_L1ENT(dc, idx) \ - ((dc)->l1tab[(idx) >> PAGETABLE_ORDER] \ - [(idx) & ((1 << PAGETABLE_ORDER) - 1)]) +#define MAPCACHE_L1ENT(idx) \ + __linear_l1_table[l1_linear_offset(MAPCACHE_VIRT_START + pfn_to_paddr(idx))] void *map_domain_page(unsigned long mfn) { @@ -77,7 +76,7 @@ void *map_domain_page(unsigned long mfn) dcache = &v->domain->arch.pv_domain.mapcache; vcache = &v->arch.pv_vcpu.mapcache; - if ( !dcache->l1tab ) + if ( !dcache->inuse ) return mfn_to_virt(mfn); perfc_incr(map_domain_page_count); @@ -91,7 +90,7 @@ void *map_domain_page(unsigned long mfn) ASSERT(idx < dcache->entries); hashent->refcnt++; ASSERT(hashent->refcnt); - ASSERT(l1e_get_pfn(DCACHE_L1ENT(dcache, idx)) == mfn); + ASSERT(l1e_get_pfn(MAPCACHE_L1ENT(idx)) == mfn); goto out; } @@ -131,9 +130,8 @@ void *map_domain_page(unsigned long mfn) if ( hashent->idx != MAPHASHENT_NOTINUSE && !hashent->refcnt ) { idx = hashent->idx; - ASSERT(l1e_get_pfn(DCACHE_L1ENT(dcache, idx)) == - hashent->mfn); - l1e_write(&DCACHE_L1ENT(dcache, idx), l1e_empty()); + ASSERT(l1e_get_pfn(MAPCACHE_L1ENT(idx)) == hashent->mfn); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_empty()); hashent->idx = MAPHASHENT_NOTINUSE; hashent->mfn = ~0UL; break; @@ -156,8 +154,7 @@ void *map_domain_page(unsigned long mfn) spin_unlock(&dcache->lock); - l1e_write(&DCACHE_L1ENT(dcache, idx), - l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); out: local_irq_restore(flags); @@ -181,10 +178,10 @@ void unmap_domain_page(const void *ptr) ASSERT(v && !is_hvm_vcpu(v)); dcache = &v->domain->arch.pv_domain.mapcache; - ASSERT(dcache->l1tab); + ASSERT(dcache->inuse); idx = PFN_DOWN(va - MAPCACHE_VIRT_START); - mfn = l1e_get_pfn(DCACHE_L1ENT(dcache, idx)); + mfn = l1e_get_pfn(MAPCACHE_L1ENT(idx)); hashent = &v->arch.pv_vcpu.mapcache.hash[MAPHASH_HASHFN(mfn)]; local_irq_save(flags); @@ -200,9 +197,9 @@ void unmap_domain_page(const void *ptr) if ( hashent->idx != MAPHASHENT_NOTINUSE ) { /* /First/, zap the PTE. */ - ASSERT(l1e_get_pfn(DCACHE_L1ENT(dcache, hashent->idx)) == + ASSERT(l1e_get_pfn(MAPCACHE_L1ENT(hashent->idx)) == hashent->mfn); - l1e_write(&DCACHE_L1ENT(dcache, hashent->idx), l1e_empty()); + l1e_write(&MAPCACHE_L1ENT(hashent->idx), l1e_empty()); /* /Second/, mark as garbage. */ set_bit(hashent->idx, dcache->garbage); } @@ -214,7 +211,7 @@ void unmap_domain_page(const void *ptr) else { /* /First/, zap the PTE. */ - l1e_write(&DCACHE_L1ENT(dcache, idx), l1e_empty()); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_empty()); /* /Second/, mark as garbage. */ set_bit(idx, dcache->garbage); } @@ -253,10 +250,6 @@ int mapcache_domain_init(struct domain *d) return 0; #endif - dcache->l1tab = xzalloc_array(l1_pgentry_t *, MAPCACHE_L2_ENTRIES); - if ( !dcache->l1tab ) - return -ENOMEM; - BUILD_BUG_ON(MAPCACHE_VIRT_END + PAGE_SIZE * (3 + 2 * PFN_UP(BITS_TO_LONGS(MAPCACHE_ENTRIES) * sizeof(long))) > MAPCACHE_VIRT_START + (PERDOMAIN_SLOT_MBYTES << 20)); @@ -272,16 +265,6 @@ int mapcache_domain_init(struct domain *d) NIL(l1_pgentry_t *), NULL); } -void mapcache_domain_exit(struct domain *d) -{ - struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; - - if ( is_hvm_domain(d) ) - return; - - xfree(dcache->l1tab); -} - int mapcache_vcpu_init(struct vcpu *v) { struct domain *d = v->domain; @@ -290,7 +273,7 @@ int mapcache_vcpu_init(struct vcpu *v) unsigned int ents = d->max_vcpus * MAPCACHE_VCPU_ENTRIES; unsigned int nr = PFN_UP(BITS_TO_LONGS(ents) * sizeof(long)); - if ( is_hvm_vcpu(v) || !dcache->l1tab ) + if ( is_hvm_vcpu(v) || !dcache->inuse ) return 0; if ( ents > dcache->entries ) @@ -298,7 +281,7 @@ int mapcache_vcpu_init(struct vcpu *v) /* Populate page tables. */ int rc = create_perdomain_mapping(d, MAPCACHE_VIRT_START, d->max_vcpus * MAPCACHE_VCPU_ENTRIES, - dcache->l1tab, NULL); + NIL(l1_pgentry_t *), NULL); /* Populate bit maps. */ if ( !rc ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index f91f662..97e09ca 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -53,8 +53,7 @@ struct mapcache_vcpu { }; struct mapcache_domain { - /* The PTEs that provide the mappings, and a cursor into the array. */ - l1_pgentry_t **l1tab; + /* The number of array entries, and a cursor into the array. */ unsigned int entries; unsigned int cursor; @@ -71,7 +70,6 @@ struct mapcache_domain { }; int mapcache_domain_init(struct domain *); -void mapcache_domain_exit(struct domain *); int mapcache_vcpu_init(struct vcpu *); void mapcache_override_current(struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:22:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:22: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 1UFNIC-0006ij-6i; Tue, 12 Mar 2013 11:22:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIA-0006iJ-6n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:50 +0000 Received: from [85.158.143.99:34976] by server-2.bemta-4.messagelabs.com id BB/26-12656-9001F315; Tue, 12 Mar 2013 11:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1363087367!22836228!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16774 invoked from network); 12 Mar 2013 11:22:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNI7-0007uW-Gw for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNI7-0005yJ-CW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:47 +0000 Date: Tue, 12 Mar 2013 11:22:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: fix invalid unlinking of nested p2m 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 f0fc1e8294a963528556b0862c06bb3fcf7c390a Author: Matthew Daley AuthorDate: Thu Feb 28 18:16:04 2013 +1300 Commit: Tim Deegan CommitDate: Thu Feb 28 10:56:32 2013 +0000 x86/mm: fix invalid unlinking of nested p2m tables Commit 90805dc (c/s 26387:4056e5a3d815) ("EPT: Make ept data stucture or operations neutral") makes nested p2m tables be unlinked from the host p2m table before their destruction (in p2m_teardown_nestedp2m). However, by this time the host p2m table has already been torn down, leading to a possible race condition where another allocation between the two kinds of table being torn down can lead to a linked list assertion with debug=y builds or memory corruption on debug=n ones. Fix by swapping the order the two kinds of table are torn down in. While at it, remove the condition in p2m_final_teardown, as it is already checked identically in p2m_teardown_hostp2m itself. Signed-off-by: Matthew Daley Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b70716d..4837de3 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -488,15 +488,13 @@ void p2m_teardown(struct p2m_domain *p2m) void p2m_final_teardown(struct domain *d) { - /* Iterate over all p2m tables per domain */ - struct p2m_domain *p2m = p2m_get_hostp2m(d); - if ( p2m ) - p2m_teardown_hostp2m(d); - /* We must teardown unconditionally because * we initialise them unconditionally. */ p2m_teardown_nestedp2m(d); + + /* Iterate over all p2m tables per domain */ + p2m_teardown_hostp2m(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 Tue Mar 12 11:22:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:22: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 1UFNIC-0006ij-6i; Tue, 12 Mar 2013 11:22:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIA-0006iJ-6n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:50 +0000 Received: from [85.158.143.99:34976] by server-2.bemta-4.messagelabs.com id BB/26-12656-9001F315; Tue, 12 Mar 2013 11:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1363087367!22836228!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16774 invoked from network); 12 Mar 2013 11:22:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNI7-0007uW-Gw for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNI7-0005yJ-CW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:47 +0000 Date: Tue, 12 Mar 2013 11:22:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: fix invalid unlinking of nested p2m 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 f0fc1e8294a963528556b0862c06bb3fcf7c390a Author: Matthew Daley AuthorDate: Thu Feb 28 18:16:04 2013 +1300 Commit: Tim Deegan CommitDate: Thu Feb 28 10:56:32 2013 +0000 x86/mm: fix invalid unlinking of nested p2m tables Commit 90805dc (c/s 26387:4056e5a3d815) ("EPT: Make ept data stucture or operations neutral") makes nested p2m tables be unlinked from the host p2m table before their destruction (in p2m_teardown_nestedp2m). However, by this time the host p2m table has already been torn down, leading to a possible race condition where another allocation between the two kinds of table being torn down can lead to a linked list assertion with debug=y builds or memory corruption on debug=n ones. Fix by swapping the order the two kinds of table are torn down in. While at it, remove the condition in p2m_final_teardown, as it is already checked identically in p2m_teardown_hostp2m itself. Signed-off-by: Matthew Daley Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b70716d..4837de3 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -488,15 +488,13 @@ void p2m_teardown(struct p2m_domain *p2m) void p2m_final_teardown(struct domain *d) { - /* Iterate over all p2m tables per domain */ - struct p2m_domain *p2m = p2m_get_hostp2m(d); - if ( p2m ) - p2m_teardown_hostp2m(d); - /* We must teardown unconditionally because * we initialise them unconditionally. */ p2m_teardown_nestedp2m(d); + + /* Iterate over all p2m tables per domain */ + p2m_teardown_hostp2m(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 Tue Mar 12 11:23:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNIL-0006kR-9w; Tue, 12 Mar 2013 11: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 1UFNIK-0006kD-OP for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:00 +0000 Received: from [85.158.137.99:47870] by server-9.bemta-3.messagelabs.com id 73/B4-32531-3101F315; Tue, 12 Mar 2013 11:22:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1363087378!14803272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27929 invoked from network); 12 Mar 2013 11:22:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIH-0007ug-Qn for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIH-0005yf-KN for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:57 +0000 Date: Tue, 12 Mar 2013 11:22:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmx: fix handling of NMI VMEXIT. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7dd3b06ff031c9a8c727df16c5def2afb382101c Author: Tim Deegan AuthorDate: Thu Feb 28 12:42:15 2013 +0000 Commit: Tim Deegan CommitDate: Thu Feb 28 14:00:18 2013 +0000 vmx: fix handling of NMI VMEXIT. Call do_nmi() directly and explicitly re-enable NMIs rather than raising an NMI through the APIC. Since NMIs are disabled after the VMEXIT, the raised NMI would be blocked until the next IRET instruction (i.e. the next real interrupt, or after scheduling a PV guest) and in the meantime the guest will spin taking NMI VMEXITS. Also, handle NMIs before re-enabling interrupts, since if we handle an interrupt (and therefore IRET) before calling do_nmi(), we may end up running the NMI handler with NMIs enabled. Signed-off-by: Tim Deegan Acked-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5378928..04dbefb 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2313,6 +2313,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + if ( vector == TRAP_nmi + && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8)) ) + { + do_nmi(regs); + enable_nmis(); + } break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2486,7 +2493,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + /* Already handled above. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNIL-0006kR-9w; Tue, 12 Mar 2013 11: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 1UFNIK-0006kD-OP for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:00 +0000 Received: from [85.158.137.99:47870] by server-9.bemta-3.messagelabs.com id 73/B4-32531-3101F315; Tue, 12 Mar 2013 11:22:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1363087378!14803272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27929 invoked from network); 12 Mar 2013 11:22:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:22:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIH-0007ug-Qn for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIH-0005yf-KN for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:57 +0000 Date: Tue, 12 Mar 2013 11:22:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmx: fix handling of NMI VMEXIT. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7dd3b06ff031c9a8c727df16c5def2afb382101c Author: Tim Deegan AuthorDate: Thu Feb 28 12:42:15 2013 +0000 Commit: Tim Deegan CommitDate: Thu Feb 28 14:00:18 2013 +0000 vmx: fix handling of NMI VMEXIT. Call do_nmi() directly and explicitly re-enable NMIs rather than raising an NMI through the APIC. Since NMIs are disabled after the VMEXIT, the raised NMI would be blocked until the next IRET instruction (i.e. the next real interrupt, or after scheduling a PV guest) and in the meantime the guest will spin taking NMI VMEXITS. Also, handle NMIs before re-enabling interrupts, since if we handle an interrupt (and therefore IRET) before calling do_nmi(), we may end up running the NMI handler with NMIs enabled. Signed-off-by: Tim Deegan Acked-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5378928..04dbefb 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2313,6 +2313,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + if ( vector == TRAP_nmi + && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8)) ) + { + do_nmi(regs); + enable_nmis(); + } break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2486,7 +2493,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + /* Already handled above. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNIV-0006mj-Qw; Tue, 12 Mar 2013 11: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 1UFNIU-0006mI-Lu for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:10 +0000 Received: from [85.158.139.211:17814] by server-10.bemta-5.messagelabs.com id 51/BB-23714-D101F315; Tue, 12 Mar 2013 11:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1363087388!18312629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21718 invoked from network); 12 Mar 2013 11:23:09 -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 Mar 2013 11:23:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIR-0007vL-Vn for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIR-0005z2-UE for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:07 +0000 Date: Tue, 12 Mar 2013 11:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Avoid stale pointer when moving domain to another cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 482300def7d08e773ccd2a0d978bcb9469fdd810 Author: Juergen Gross AuthorDate: Thu Feb 28 14:56:45 2013 +0000 Commit: Keir Fraser CommitDate: Thu Feb 28 14:56:45 2013 +0000 Avoid stale pointer when moving domain to another cpupool When a domain is moved to another cpupool the scheduler private data pointers in vcpu and domain structures must never point to an already freed memory area. While at it, simplify sched_init_vcpu() by using DOM2OP instead VCPU2OP. Signed-off-by: Juergen Gross --- xen/common/schedule.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 9c58b12..1fc9b7d 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -220,7 +220,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) if ( v->sched_priv == NULL ) return 1; - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(DOM2OP(d), insert_vcpu, v); return 0; } @@ -231,6 +231,9 @@ int sched_move_domain(struct domain *d, struct cpupool *c) unsigned int new_p; void **vcpu_priv; void *domdata; + void *vcpudata; + struct scheduler *old_ops; + void *old_domdata; domdata = SCHED_OP(c->sched, alloc_domdata, d); if ( domdata == NULL ) @@ -261,21 +264,22 @@ int sched_move_domain(struct domain *d, struct cpupool *c) domain_pause(d); + old_ops = DOM2OP(d); + old_domdata = d->sched_priv; + for_each_vcpu ( d, v ) { - SCHED_OP(VCPU2OP(v), remove_vcpu, v); - SCHED_OP(VCPU2OP(v), free_vdata, v->sched_priv); - v->sched_priv = NULL; + SCHED_OP(old_ops, remove_vcpu, v); } - SCHED_OP(DOM2OP(d), free_domdata, d->sched_priv); - d->cpupool = c; d->sched_priv = domdata; new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + vcpudata = v->sched_priv; + migrate_timer(&v->periodic_timer, new_p); migrate_timer(&v->singleshot_timer, new_p); migrate_timer(&v->poll_timer, new_p); @@ -288,12 +292,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_cycle(new_p, c->cpu_valid); SCHED_OP(c->sched, insert_vcpu, v); + + SCHED_OP(old_ops, free_vdata, vcpudata); } domain_update_node_affinity(d); domain_unpause(d); + SCHED_OP(old_ops, free_domdata, old_domdata); + xfree(vcpu_priv); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNIV-0006mj-Qw; Tue, 12 Mar 2013 11: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 1UFNIU-0006mI-Lu for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:10 +0000 Received: from [85.158.139.211:17814] by server-10.bemta-5.messagelabs.com id 51/BB-23714-D101F315; Tue, 12 Mar 2013 11:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1363087388!18312629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21718 invoked from network); 12 Mar 2013 11:23:09 -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 Mar 2013 11:23:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIR-0007vL-Vn for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIR-0005z2-UE for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:07 +0000 Date: Tue, 12 Mar 2013 11:23:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Avoid stale pointer when moving domain to another cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 482300def7d08e773ccd2a0d978bcb9469fdd810 Author: Juergen Gross AuthorDate: Thu Feb 28 14:56:45 2013 +0000 Commit: Keir Fraser CommitDate: Thu Feb 28 14:56:45 2013 +0000 Avoid stale pointer when moving domain to another cpupool When a domain is moved to another cpupool the scheduler private data pointers in vcpu and domain structures must never point to an already freed memory area. While at it, simplify sched_init_vcpu() by using DOM2OP instead VCPU2OP. Signed-off-by: Juergen Gross --- xen/common/schedule.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 9c58b12..1fc9b7d 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -220,7 +220,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) if ( v->sched_priv == NULL ) return 1; - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(DOM2OP(d), insert_vcpu, v); return 0; } @@ -231,6 +231,9 @@ int sched_move_domain(struct domain *d, struct cpupool *c) unsigned int new_p; void **vcpu_priv; void *domdata; + void *vcpudata; + struct scheduler *old_ops; + void *old_domdata; domdata = SCHED_OP(c->sched, alloc_domdata, d); if ( domdata == NULL ) @@ -261,21 +264,22 @@ int sched_move_domain(struct domain *d, struct cpupool *c) domain_pause(d); + old_ops = DOM2OP(d); + old_domdata = d->sched_priv; + for_each_vcpu ( d, v ) { - SCHED_OP(VCPU2OP(v), remove_vcpu, v); - SCHED_OP(VCPU2OP(v), free_vdata, v->sched_priv); - v->sched_priv = NULL; + SCHED_OP(old_ops, remove_vcpu, v); } - SCHED_OP(DOM2OP(d), free_domdata, d->sched_priv); - d->cpupool = c; d->sched_priv = domdata; new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + vcpudata = v->sched_priv; + migrate_timer(&v->periodic_timer, new_p); migrate_timer(&v->singleshot_timer, new_p); migrate_timer(&v->poll_timer, new_p); @@ -288,12 +292,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_cycle(new_p, c->cpu_valid); SCHED_OP(c->sched, insert_vcpu, v); + + SCHED_OP(old_ops, free_vdata, vcpudata); } domain_update_node_affinity(d); domain_unpause(d); + SCHED_OP(old_ops, free_domdata, old_domdata); + xfree(vcpu_priv); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNIr-0006s1-UJ; Tue, 12 Mar 2013 11:23:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIq-0006rd-HI for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:32 +0000 Received: from [85.158.143.99:40490] by server-1.bemta-4.messagelabs.com id E2/39-06203-3301F315; Tue, 12 Mar 2013 11:23:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1363087408!28075493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11439 invoked from network); 12 Mar 2013 11:23:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:23:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIm-0007vV-Ig for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIm-0005zm-9r for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:28 +0000 Date: Tue, 12 Mar 2013 11:23:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xentoollog: update tty detection in stdiostream_progress X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f80ac9c0e8fe117b3e9cf71f799b482c6ca312f Author: Olaf Hering AuthorDate: Wed Feb 27 14:16:36 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 16:13:46 2013 +0000 tools/xentoollog: update tty detection in stdiostream_progress As suggested by IanJ: Check isatty only once to preserve the errno of ->progress users, and to reduce the noice in strace output. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xtl_logger_stdio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c index 25b2464..2e73c86 100644 --- a/tools/libxc/xtl_logger_stdio.c +++ b/tools/libxc/xtl_logger_stdio.c @@ -35,6 +35,7 @@ struct xentoollog_logger_stdiostream { xentoollog_level min_level; unsigned flags; int progress_erase_len, progress_last_percent; + int tty; }; static void progress_erase(xentoollog_logger_stdiostream *lg) { @@ -118,7 +119,7 @@ static void stdiostream_progress(struct xentoollog_logger *logger_in, lg->progress_last_percent = percent; - if (isatty(fileno(lg->f)) <= 0) { + if (!lg->tty) { stdiostream_message(logger_in, this_level, context, "%s: %lu/%lu %3d%%", doing_what, done, total, percent); @@ -166,6 +167,7 @@ xentoollog_logger_stdiostream *xtl_createlogger_stdiostream newlogger.f = f; newlogger.min_level = min_level; newlogger.flags = flags; + newlogger.tty = isatty(fileno(newlogger.f)) > 0; if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNIr-0006s1-UJ; Tue, 12 Mar 2013 11:23:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIq-0006rd-HI for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:32 +0000 Received: from [85.158.143.99:40490] by server-1.bemta-4.messagelabs.com id E2/39-06203-3301F315; Tue, 12 Mar 2013 11:23:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1363087408!28075493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11439 invoked from network); 12 Mar 2013 11:23:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:23:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIm-0007vV-Ig for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIm-0005zm-9r for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:28 +0000 Date: Tue, 12 Mar 2013 11:23:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xentoollog: update tty detection in stdiostream_progress X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f80ac9c0e8fe117b3e9cf71f799b482c6ca312f Author: Olaf Hering AuthorDate: Wed Feb 27 14:16:36 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 16:13:46 2013 +0000 tools/xentoollog: update tty detection in stdiostream_progress As suggested by IanJ: Check isatty only once to preserve the errno of ->progress users, and to reduce the noice in strace output. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- tools/libxc/xtl_logger_stdio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c index 25b2464..2e73c86 100644 --- a/tools/libxc/xtl_logger_stdio.c +++ b/tools/libxc/xtl_logger_stdio.c @@ -35,6 +35,7 @@ struct xentoollog_logger_stdiostream { xentoollog_level min_level; unsigned flags; int progress_erase_len, progress_last_percent; + int tty; }; static void progress_erase(xentoollog_logger_stdiostream *lg) { @@ -118,7 +119,7 @@ static void stdiostream_progress(struct xentoollog_logger *logger_in, lg->progress_last_percent = percent; - if (isatty(fileno(lg->f)) <= 0) { + if (!lg->tty) { stdiostream_message(logger_in, this_level, context, "%s: %lu/%lu %3d%%", doing_what, done, total, percent); @@ -166,6 +167,7 @@ xentoollog_logger_stdiostream *xtl_createlogger_stdiostream newlogger.f = f; newlogger.min_level = min_level; newlogger.flags = flags; + newlogger.tty = isatty(fileno(newlogger.f)) > 0; if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNJ1-0006u0-5K; Tue, 12 Mar 2013 11: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 1UFNIz-0006tW-Ru for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:41 +0000 Received: from [85.158.139.211:32842] by server-9.bemta-5.messagelabs.com id B6/40-08547-D301F315; Tue, 12 Mar 2013 11:23:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1363087419!19199872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28819 invoked from network); 12 Mar 2013 11:23:40 -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; 12 Mar 2013 11:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIc-0007vQ-6O for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIc-0005zQ-2A for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:18 +0000 Date: Tue, 12 Mar 2013 11:23:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: rename deb target as debball X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 345cf1f8c7a0d563c735d63c72048e2747393a46 Author: Ian Campbell AuthorDate: Wed Feb 27 11:16:47 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 16:11:52 2013 +0000 build: rename deb target as debball "debball" by analogy with "tarball". Attempt to clarify the purpose of this target in the comment. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Ian Jackson --- Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2d3ed82..32efb70 100644 --- a/Makefile +++ b/Makefile @@ -137,9 +137,11 @@ world: $(MAKE) kdelete $(MAKE) dist -# Package a build in a .deb file -.PHONY: deb -deb: dist +# Package a build in a debball file, that is inside a .deb format +# container to allow for easy and clean removal. This is not intended +# to be a full featured policy compliant .deb package. +.PHONY: debball +debball: dist fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion | grep -v :) # clean doesn't do a kclean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNJ1-0006u0-5K; Tue, 12 Mar 2013 11: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 1UFNIz-0006tW-Ru for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:41 +0000 Received: from [85.158.139.211:32842] by server-9.bemta-5.messagelabs.com id B6/40-08547-D301F315; Tue, 12 Mar 2013 11:23:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1363087419!19199872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28819 invoked from network); 12 Mar 2013 11:23:40 -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; 12 Mar 2013 11:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIc-0007vQ-6O for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIc-0005zQ-2A for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:18 +0000 Date: Tue, 12 Mar 2013 11:23:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: rename deb target as debball X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 345cf1f8c7a0d563c735d63c72048e2747393a46 Author: Ian Campbell AuthorDate: Wed Feb 27 11:16:47 2013 +0000 Commit: Ian Jackson CommitDate: Thu Feb 28 16:11:52 2013 +0000 build: rename deb target as debball "debball" by analogy with "tarball". Attempt to clarify the purpose of this target in the comment. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Ian Jackson --- Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2d3ed82..32efb70 100644 --- a/Makefile +++ b/Makefile @@ -137,9 +137,11 @@ world: $(MAKE) kdelete $(MAKE) dist -# Package a build in a .deb file -.PHONY: deb -deb: dist +# Package a build in a debball file, that is inside a .deb format +# container to allow for easy and clean removal. This is not intended +# to be a full featured policy compliant .deb package. +.PHONY: debball +debball: dist fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion | grep -v :) # clean doesn't do a kclean -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNJ1-0006tv-2X; Tue, 12 Mar 2013 11:23:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIz-0006tS-BC for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:41 +0000 Received: from [85.158.137.99:5616] by server-13.bemta-3.messagelabs.com id 77/45-25744-C301F315; Tue, 12 Mar 2013 11:23:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1363087418!14797801!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24088 invoked from network); 12 Mar 2013 11:23:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIw-0007vY-OQ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIw-00060w-LM for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:38 +0000 Date: Tue, 12 Mar 2013 11:23:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix compat memory exchange op splitting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53decd322157e922cac2988e07da6d39538c8033 Author: Jan Beulich AuthorDate: Fri Mar 1 16:59:49 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 1 16:59:49 2013 +0100 fix compat memory exchange op splitting A shift with a negative count was erroneously used here, yielding undefined behavior. Reported-by: Xi Wang Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/compat/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index e0fc205..caa24cc 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -172,7 +172,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( order_delta >= 0 ) nat.xchg->out.nr_extents = end_extent >> order_delta; else - nat.xchg->out.nr_extents = end_extent << order_delta; + nat.xchg->out.nr_extents = end_extent << -order_delta; ++split; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:23:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:23: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 1UFNJ1-0006tv-2X; Tue, 12 Mar 2013 11:23:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIz-0006tS-BC for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:41 +0000 Received: from [85.158.137.99:5616] by server-13.bemta-3.messagelabs.com id 77/45-25744-C301F315; Tue, 12 Mar 2013 11:23:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1363087418!14797801!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24088 invoked from network); 12 Mar 2013 11:23:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNIw-0007vY-OQ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNIw-00060w-LM for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:38 +0000 Date: Tue, 12 Mar 2013 11:23:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix compat memory exchange op splitting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53decd322157e922cac2988e07da6d39538c8033 Author: Jan Beulich AuthorDate: Fri Mar 1 16:59:49 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 1 16:59:49 2013 +0100 fix compat memory exchange op splitting A shift with a negative count was erroneously used here, yielding undefined behavior. Reported-by: Xi Wang Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/compat/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index e0fc205..caa24cc 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -172,7 +172,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) if ( order_delta >= 0 ) nat.xchg->out.nr_extents = end_extent >> order_delta; else - nat.xchg->out.nr_extents = end_extent << order_delta; + nat.xchg->out.nr_extents = end_extent << -order_delta; ++split; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJL-0006zf-Aq; Tue, 12 Mar 2013 11:24:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJK-0006z9-1t for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:02 +0000 Received: from [85.158.138.51:19646] by server-10.bemta-3.messagelabs.com id D7/69-19664-1501F315; Tue, 12 Mar 2013 11:24:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1363087439!31431198!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19761 invoked from network); 12 Mar 2013 11:24:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJH-0007vt-8V for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJH-00061f-44 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:59 +0000 Date: Tue, 12 Mar 2013 11:23:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] SEDF: avoid gathering vCPU-s on pCPU0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6a6fd63652814e5c36a0016c082032f798ced1f Author: Jan Beulich AuthorDate: Mon Mar 4 10:17:52 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:17:52 2013 +0100 SEDF: avoid gathering vCPU-s on pCPU0 The introduction of vcpu_force_reschedule() in 14320:215b799fa181 was incompatible with the SEDF scheduler: Any vCPU using VCPUOP_stop_periodic_timer (e.g. any vCPU of half way modern PV Linux guests) ends up on pCPU0 after that call. Obviously, running all PV guests' (and namely Dom0's) vCPU-s on pCPU0 causes problems for those guests rather sooner than later. So the main thing that was clearly wrong (and bogus from the beginning) was the use of cpumask_first() in sedf_pick_cpu(). It is being replaced by a construct that prefers to put back the vCPU on the pCPU that it got launched on. However, there's one more glitch: When reducing the affinity of a vCPU temporarily, and then widening it again to a set that includes the pCPU that the vCPU was last running on, the generic scheduler code would not force a migration of that vCPU, and hence it would forever stay on the pCPU it last ran on. Since that can again create a load imbalance, the SEDF scheduler wants a migration to happen regardless of it being apparently unnecessary. Of course, an alternative to checking for SEDF explicitly in vcpu_set_affinity() would be to introduce a flags field in struct scheduler, and have SEDF set a "always-migrate-on-affinity-change" flag. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/sched_sedf.c | 3 ++- xen/common/schedule.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 27fac36..d1812b6 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -397,7 +397,8 @@ static int sedf_pick_cpu(const struct scheduler *ops, struct vcpu *v) online = cpupool_scheduler_cpumask(v->domain->cpupool); cpumask_and(&online_affinity, v->cpu_affinity, online); - return cpumask_first(&online_affinity); + return cpumask_cycle(v->vcpu_id % cpumask_weight(&online_affinity) - 1, + &online_affinity); } /* diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1fc9b7d..de11110 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -613,7 +613,8 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); - if ( !cpumask_test_cpu(v->processor, v->cpu_affinity) ) + if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || + !cpumask_test_cpu(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJL-0006zf-Aq; Tue, 12 Mar 2013 11:24:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJK-0006z9-1t for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:02 +0000 Received: from [85.158.138.51:19646] by server-10.bemta-3.messagelabs.com id D7/69-19664-1501F315; Tue, 12 Mar 2013 11:24:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1363087439!31431198!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19761 invoked from network); 12 Mar 2013 11:24:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJH-0007vt-8V for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJH-00061f-44 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:59 +0000 Date: Tue, 12 Mar 2013 11:23:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] SEDF: avoid gathering vCPU-s on pCPU0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6a6fd63652814e5c36a0016c082032f798ced1f Author: Jan Beulich AuthorDate: Mon Mar 4 10:17:52 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:17:52 2013 +0100 SEDF: avoid gathering vCPU-s on pCPU0 The introduction of vcpu_force_reschedule() in 14320:215b799fa181 was incompatible with the SEDF scheduler: Any vCPU using VCPUOP_stop_periodic_timer (e.g. any vCPU of half way modern PV Linux guests) ends up on pCPU0 after that call. Obviously, running all PV guests' (and namely Dom0's) vCPU-s on pCPU0 causes problems for those guests rather sooner than later. So the main thing that was clearly wrong (and bogus from the beginning) was the use of cpumask_first() in sedf_pick_cpu(). It is being replaced by a construct that prefers to put back the vCPU on the pCPU that it got launched on. However, there's one more glitch: When reducing the affinity of a vCPU temporarily, and then widening it again to a set that includes the pCPU that the vCPU was last running on, the generic scheduler code would not force a migration of that vCPU, and hence it would forever stay on the pCPU it last ran on. Since that can again create a load imbalance, the SEDF scheduler wants a migration to happen regardless of it being apparently unnecessary. Of course, an alternative to checking for SEDF explicitly in vcpu_set_affinity() would be to introduce a flags field in struct scheduler, and have SEDF set a "always-migrate-on-affinity-change" flag. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/sched_sedf.c | 3 ++- xen/common/schedule.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 27fac36..d1812b6 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -397,7 +397,8 @@ static int sedf_pick_cpu(const struct scheduler *ops, struct vcpu *v) online = cpupool_scheduler_cpumask(v->domain->cpupool); cpumask_and(&online_affinity, v->cpu_affinity, online); - return cpumask_first(&online_affinity); + return cpumask_cycle(v->vcpu_id % cpumask_weight(&online_affinity) - 1, + &online_affinity); } /* diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1fc9b7d..de11110 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -613,7 +613,8 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); - if ( !cpumask_test_cpu(v->processor, v->cpu_affinity) ) + if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || + !cpumask_test_cpu(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJQ-00071C-Dh; Tue, 12 Mar 2013 11:24:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJO-00070Y-Fu for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:06 +0000 Received: from [193.109.254.147:52795] by server-12.bemta-14.messagelabs.com id 79/28-05449-5501F315; Tue, 12 Mar 2013 11:24:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1363087347!8560192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5668 invoked from network); 12 Mar 2013 11:22: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; 12 Mar 2013 11:22:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHm-0007uO-RY for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHm-0005wy-C9 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:26 +0000 Date: Tue, 12 Mar 2013 11:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: rework hypercall argument translation area setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8db1e759556d3a3832f92e91d6c848c5ce2d3fa1 Author: Jan Beulich AuthorDate: Thu Feb 28 11:09:39 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:09:39 2013 +0100 x86: rework hypercall argument translation area setup ... using the new per-domain mapping management functions, adding destroy_perdomain_mapping() to the previously introduced pair. Rather than using an order-1 Xen heap allocation, use (currently 2) individual domain heap pages to populate space in the per-domain mapping area. Also fix a benign off-by-one mistake in is_compat_arg_xlat_range(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/mm.c | 53 ++++++++++++++++++++++++++++++++++ xen/arch/x86/usercopy.c | 2 +- xen/arch/x86/x86_64/mm.c | 20 +++--------- xen/include/asm-x86/config.h | 9 +++++- xen/include/asm-x86/domain.h | 3 -- xen/include/asm-x86/mm.h | 2 + xen/include/asm-x86/x86_64/uaccess.h | 5 +-- 7 files changed, 71 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 335a85c..7d5c25b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5657,6 +5657,59 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, return rc; } +void destroy_perdomain_mapping(struct domain *d, unsigned long va, + unsigned int nr) +{ + const l3_pgentry_t *l3tab, *pl3e; + + ASSERT(va >= PERDOMAIN_VIRT_START && + va < PERDOMAIN_VIRT_SLOT(PERDOMAIN_SLOTS)); + ASSERT(!l3_table_offset(va ^ (va + nr * PAGE_SIZE - 1))); + + if ( !d->arch.perdomain_l3_pg ) + return; + + l3tab = __map_domain_page(d->arch.perdomain_l3_pg); + pl3e = l3tab + l3_table_offset(va); + + if ( l3e_get_flags(*pl3e) & _PAGE_PRESENT ) + { + const l2_pgentry_t *l2tab = map_domain_page(l3e_get_pfn(*pl3e)); + const l2_pgentry_t *pl2e = l2tab + l2_table_offset(va); + unsigned int i = l1_table_offset(va); + + while ( nr ) + { + if ( l2e_get_flags(*pl2e) & _PAGE_PRESENT ) + { + l1_pgentry_t *l1tab = map_domain_page(l2e_get_pfn(*pl2e)); + + for ( ; nr && i < L1_PAGETABLE_ENTRIES; --nr, ++i ) + { + if ( (l1e_get_flags(l1tab[i]) & + (_PAGE_PRESENT | _PAGE_AVAIL0)) == + (_PAGE_PRESENT | _PAGE_AVAIL0) ) + free_domheap_page(l1e_get_page(l1tab[i])); + l1tab[i] = l1e_empty(); + } + + unmap_domain_page(l1tab); + } + else if ( nr + i < L1_PAGETABLE_ENTRIES ) + break; + else + nr -= L1_PAGETABLE_ENTRIES - i; + + ++pl2e; + i = 0; + } + + unmap_domain_page(l2tab); + } + + unmap_domain_page(l3tab); +} + void free_perdomain_mappings(struct domain *d) { l3_pgentry_t *l3tab = __map_domain_page(d->arch.perdomain_l3_pg); diff --git a/xen/arch/x86/usercopy.c b/xen/arch/x86/usercopy.c index 8bd9469..b79202b 100644 --- a/xen/arch/x86/usercopy.c +++ b/xen/arch/x86/usercopy.c @@ -6,8 +6,8 @@ * Copyright 2002 Andi Kleen */ -#include #include +#include #include unsigned long __copy_to_user_ll(void __user *to, const void *from, unsigned n) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 8a5e1cc..8cd0d30 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -832,27 +832,17 @@ void __init zap_low_mappings(void) __PAGE_HYPERVISOR); } -void *compat_arg_xlat_virt_base(void) -{ - return current->arch.compat_arg_xlat; -} - int setup_compat_arg_xlat(struct vcpu *v) { - unsigned int order = get_order_from_bytes(COMPAT_ARG_XLAT_SIZE); - - v->arch.compat_arg_xlat = alloc_xenheap_pages(order, - MEMF_node(vcpu_to_node(v))); - - return v->arch.compat_arg_xlat ? 0 : -ENOMEM; + return create_perdomain_mapping(v->domain, ARG_XLAT_START(v), + PFN_UP(COMPAT_ARG_XLAT_SIZE), + NULL, NIL(struct page_info *)); } void free_compat_arg_xlat(struct vcpu *v) { - unsigned int order = get_order_from_bytes(COMPAT_ARG_XLAT_SIZE); - - free_xenheap_pages(v->arch.compat_arg_xlat, order); - v->arch.compat_arg_xlat = NULL; + destroy_perdomain_mapping(v->domain, ARG_XLAT_START(v), + PFN_UP(COMPAT_ARG_XLAT_SIZE)); } void cleanup_frame_table(struct mem_hotadd_info *info) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index dc928ed..0a5f031 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -212,7 +212,7 @@ extern unsigned char boot_edid_info[128]; /* Slot 260: per-domain mappings (including map cache). */ #define PERDOMAIN_VIRT_START (PML4_ADDR(260)) #define PERDOMAIN_SLOT_MBYTES (PML4_ENTRY_BYTES >> (20 + PAGETABLE_ORDER)) -#define PERDOMAIN_SLOTS 2 +#define PERDOMAIN_SLOTS 3 #define PERDOMAIN_VIRT_SLOT(s) (PERDOMAIN_VIRT_START + (s) * \ (PERDOMAIN_SLOT_MBYTES << 20)) /* Slot 261: machine-to-phys conversion table (256GB). */ @@ -311,6 +311,13 @@ extern unsigned long xen_phys_start; #define MAPCACHE_VIRT_END (MAPCACHE_VIRT_START + \ MAPCACHE_ENTRIES * PAGE_SIZE) +/* Argument translation area. The third per-domain-mapping sub-area. */ +#define ARG_XLAT_VIRT_START PERDOMAIN_VIRT_SLOT(2) +/* Allow for at least one guard page (COMPAT_ARG_XLAT_SIZE being 2 pages): */ +#define ARG_XLAT_VA_SHIFT (2 + PAGE_SHIFT) +#define ARG_XLAT_START(v) \ + (ARG_XLAT_VIRT_START + ((v)->vcpu_id << ARG_XLAT_VA_SHIFT)) + #define ELFSIZE 64 #define ARCH_CRASH_SAVE_VMCOREINFO diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 30efe33..f91f662 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -442,9 +442,6 @@ struct arch_vcpu /* A secondary copy of the vcpu time info. */ XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; - - void *compat_arg_xlat; - } __cacheline_aligned; /* Shorthands to improve code legibility. */ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 3c65a7c..fd9d654 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -579,6 +579,8 @@ int map_ldt_shadow_page(unsigned int); int create_perdomain_mapping(struct domain *, unsigned long va, unsigned int nr, l1_pgentry_t **, struct page_info **); +void destroy_perdomain_mapping(struct domain *, unsigned long va, + unsigned int nr); void free_perdomain_mappings(struct domain *); extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm); diff --git a/xen/include/asm-x86/x86_64/uaccess.h b/xen/include/asm-x86/x86_64/uaccess.h index b82ad9d..953abe7 100644 --- a/xen/include/asm-x86/x86_64/uaccess.h +++ b/xen/include/asm-x86/x86_64/uaccess.h @@ -1,16 +1,15 @@ #ifndef __X86_64_UACCESS_H #define __X86_64_UACCESS_H -#define COMPAT_ARG_XLAT_VIRT_BASE compat_arg_xlat_virt_base() +#define COMPAT_ARG_XLAT_VIRT_BASE ((void *)ARG_XLAT_START(current)) #define COMPAT_ARG_XLAT_SIZE (2*PAGE_SIZE) struct vcpu; -void *compat_arg_xlat_virt_base(void); int setup_compat_arg_xlat(struct vcpu *v); void free_compat_arg_xlat(struct vcpu *v); #define is_compat_arg_xlat_range(addr, size) ({ \ unsigned long __off; \ __off = (unsigned long)(addr) - (unsigned long)COMPAT_ARG_XLAT_VIRT_BASE; \ - (__off <= COMPAT_ARG_XLAT_SIZE) && \ + (__off < COMPAT_ARG_XLAT_SIZE) && \ ((__off + (unsigned long)(size)) <= COMPAT_ARG_XLAT_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 Tue Mar 12 11:24:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJQ-00071C-Dh; Tue, 12 Mar 2013 11:24:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJO-00070Y-Fu for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:06 +0000 Received: from [193.109.254.147:52795] by server-12.bemta-14.messagelabs.com id 79/28-05449-5501F315; Tue, 12 Mar 2013 11:24:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1363087347!8560192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5668 invoked from network); 12 Mar 2013 11:22: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; 12 Mar 2013 11:22:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNHm-0007uO-RY for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNHm-0005wy-C9 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:22:26 +0000 Date: Tue, 12 Mar 2013 11:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: rework hypercall argument translation area setup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8db1e759556d3a3832f92e91d6c848c5ce2d3fa1 Author: Jan Beulich AuthorDate: Thu Feb 28 11:09:39 2013 +0100 Commit: Jan Beulich CommitDate: Thu Feb 28 11:09:39 2013 +0100 x86: rework hypercall argument translation area setup ... using the new per-domain mapping management functions, adding destroy_perdomain_mapping() to the previously introduced pair. Rather than using an order-1 Xen heap allocation, use (currently 2) individual domain heap pages to populate space in the per-domain mapping area. Also fix a benign off-by-one mistake in is_compat_arg_xlat_range(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/mm.c | 53 ++++++++++++++++++++++++++++++++++ xen/arch/x86/usercopy.c | 2 +- xen/arch/x86/x86_64/mm.c | 20 +++--------- xen/include/asm-x86/config.h | 9 +++++- xen/include/asm-x86/domain.h | 3 -- xen/include/asm-x86/mm.h | 2 + xen/include/asm-x86/x86_64/uaccess.h | 5 +-- 7 files changed, 71 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 335a85c..7d5c25b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5657,6 +5657,59 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, return rc; } +void destroy_perdomain_mapping(struct domain *d, unsigned long va, + unsigned int nr) +{ + const l3_pgentry_t *l3tab, *pl3e; + + ASSERT(va >= PERDOMAIN_VIRT_START && + va < PERDOMAIN_VIRT_SLOT(PERDOMAIN_SLOTS)); + ASSERT(!l3_table_offset(va ^ (va + nr * PAGE_SIZE - 1))); + + if ( !d->arch.perdomain_l3_pg ) + return; + + l3tab = __map_domain_page(d->arch.perdomain_l3_pg); + pl3e = l3tab + l3_table_offset(va); + + if ( l3e_get_flags(*pl3e) & _PAGE_PRESENT ) + { + const l2_pgentry_t *l2tab = map_domain_page(l3e_get_pfn(*pl3e)); + const l2_pgentry_t *pl2e = l2tab + l2_table_offset(va); + unsigned int i = l1_table_offset(va); + + while ( nr ) + { + if ( l2e_get_flags(*pl2e) & _PAGE_PRESENT ) + { + l1_pgentry_t *l1tab = map_domain_page(l2e_get_pfn(*pl2e)); + + for ( ; nr && i < L1_PAGETABLE_ENTRIES; --nr, ++i ) + { + if ( (l1e_get_flags(l1tab[i]) & + (_PAGE_PRESENT | _PAGE_AVAIL0)) == + (_PAGE_PRESENT | _PAGE_AVAIL0) ) + free_domheap_page(l1e_get_page(l1tab[i])); + l1tab[i] = l1e_empty(); + } + + unmap_domain_page(l1tab); + } + else if ( nr + i < L1_PAGETABLE_ENTRIES ) + break; + else + nr -= L1_PAGETABLE_ENTRIES - i; + + ++pl2e; + i = 0; + } + + unmap_domain_page(l2tab); + } + + unmap_domain_page(l3tab); +} + void free_perdomain_mappings(struct domain *d) { l3_pgentry_t *l3tab = __map_domain_page(d->arch.perdomain_l3_pg); diff --git a/xen/arch/x86/usercopy.c b/xen/arch/x86/usercopy.c index 8bd9469..b79202b 100644 --- a/xen/arch/x86/usercopy.c +++ b/xen/arch/x86/usercopy.c @@ -6,8 +6,8 @@ * Copyright 2002 Andi Kleen */ -#include #include +#include #include unsigned long __copy_to_user_ll(void __user *to, const void *from, unsigned n) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 8a5e1cc..8cd0d30 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -832,27 +832,17 @@ void __init zap_low_mappings(void) __PAGE_HYPERVISOR); } -void *compat_arg_xlat_virt_base(void) -{ - return current->arch.compat_arg_xlat; -} - int setup_compat_arg_xlat(struct vcpu *v) { - unsigned int order = get_order_from_bytes(COMPAT_ARG_XLAT_SIZE); - - v->arch.compat_arg_xlat = alloc_xenheap_pages(order, - MEMF_node(vcpu_to_node(v))); - - return v->arch.compat_arg_xlat ? 0 : -ENOMEM; + return create_perdomain_mapping(v->domain, ARG_XLAT_START(v), + PFN_UP(COMPAT_ARG_XLAT_SIZE), + NULL, NIL(struct page_info *)); } void free_compat_arg_xlat(struct vcpu *v) { - unsigned int order = get_order_from_bytes(COMPAT_ARG_XLAT_SIZE); - - free_xenheap_pages(v->arch.compat_arg_xlat, order); - v->arch.compat_arg_xlat = NULL; + destroy_perdomain_mapping(v->domain, ARG_XLAT_START(v), + PFN_UP(COMPAT_ARG_XLAT_SIZE)); } void cleanup_frame_table(struct mem_hotadd_info *info) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index dc928ed..0a5f031 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -212,7 +212,7 @@ extern unsigned char boot_edid_info[128]; /* Slot 260: per-domain mappings (including map cache). */ #define PERDOMAIN_VIRT_START (PML4_ADDR(260)) #define PERDOMAIN_SLOT_MBYTES (PML4_ENTRY_BYTES >> (20 + PAGETABLE_ORDER)) -#define PERDOMAIN_SLOTS 2 +#define PERDOMAIN_SLOTS 3 #define PERDOMAIN_VIRT_SLOT(s) (PERDOMAIN_VIRT_START + (s) * \ (PERDOMAIN_SLOT_MBYTES << 20)) /* Slot 261: machine-to-phys conversion table (256GB). */ @@ -311,6 +311,13 @@ extern unsigned long xen_phys_start; #define MAPCACHE_VIRT_END (MAPCACHE_VIRT_START + \ MAPCACHE_ENTRIES * PAGE_SIZE) +/* Argument translation area. The third per-domain-mapping sub-area. */ +#define ARG_XLAT_VIRT_START PERDOMAIN_VIRT_SLOT(2) +/* Allow for at least one guard page (COMPAT_ARG_XLAT_SIZE being 2 pages): */ +#define ARG_XLAT_VA_SHIFT (2 + PAGE_SHIFT) +#define ARG_XLAT_START(v) \ + (ARG_XLAT_VIRT_START + ((v)->vcpu_id << ARG_XLAT_VA_SHIFT)) + #define ELFSIZE 64 #define ARCH_CRASH_SAVE_VMCOREINFO diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 30efe33..f91f662 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -442,9 +442,6 @@ struct arch_vcpu /* A secondary copy of the vcpu time info. */ XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; - - void *compat_arg_xlat; - } __cacheline_aligned; /* Shorthands to improve code legibility. */ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 3c65a7c..fd9d654 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -579,6 +579,8 @@ int map_ldt_shadow_page(unsigned int); int create_perdomain_mapping(struct domain *, unsigned long va, unsigned int nr, l1_pgentry_t **, struct page_info **); +void destroy_perdomain_mapping(struct domain *, unsigned long va, + unsigned int nr); void free_perdomain_mappings(struct domain *); extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm); diff --git a/xen/include/asm-x86/x86_64/uaccess.h b/xen/include/asm-x86/x86_64/uaccess.h index b82ad9d..953abe7 100644 --- a/xen/include/asm-x86/x86_64/uaccess.h +++ b/xen/include/asm-x86/x86_64/uaccess.h @@ -1,16 +1,15 @@ #ifndef __X86_64_UACCESS_H #define __X86_64_UACCESS_H -#define COMPAT_ARG_XLAT_VIRT_BASE compat_arg_xlat_virt_base() +#define COMPAT_ARG_XLAT_VIRT_BASE ((void *)ARG_XLAT_START(current)) #define COMPAT_ARG_XLAT_SIZE (2*PAGE_SIZE) struct vcpu; -void *compat_arg_xlat_virt_base(void); int setup_compat_arg_xlat(struct vcpu *v); void free_compat_arg_xlat(struct vcpu *v); #define is_compat_arg_xlat_range(addr, size) ({ \ unsigned long __off; \ __off = (unsigned long)(addr) - (unsigned long)COMPAT_ARG_XLAT_VIRT_BASE; \ - (__off <= COMPAT_ARG_XLAT_SIZE) && \ + (__off < COMPAT_ARG_XLAT_SIZE) && \ ((__off + (unsigned long)(size)) <= COMPAT_ARG_XLAT_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 Tue Mar 12 11:24:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJa-00073Y-Gh; Tue, 12 Mar 2013 11:24:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJY-000734-Tx for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:17 +0000 Received: from [85.158.139.83:44897] by server-7.bemta-5.messagelabs.com id ED/9A-12441-0601F315; Tue, 12 Mar 2013 11:24:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1363087449!24166919!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30702 invoked from network); 12 Mar 2013 11:24:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJR-0007wr-Dm for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJR-000624-BH for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:09 +0000 Date: Tue, 12 Mar 2013 11:24:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: defer processing events on the NMI exit 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 d463b005bbd6475ed930a302821efe239e1b2cf9 Author: Jan Beulich AuthorDate: Mon Mar 4 10:19:34 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:19:34 2013 +0100 x86: defer processing events on the NMI exit path Otherwise, we may end up in the scheduler, keeping NMIs masked for a possibly unbounded period of time (until whenever the next IRET gets executed). Enforce timely event processing by sending a self IPI. Of course it's open for discussion whether to always use the straight exit path from handle_ist_exception. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 7051f90..7769019 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -171,7 +171,7 @@ compat_bad_hypercall: jmp compat_test_all_events /* %rbx: struct vcpu, interrupts disabled */ -compat_restore_all_guest: +ENTRY(compat_restore_all_guest) ASSERT_INTERRUPTS_DISABLED RESTORE_ALL adj=8 compat=1 .Lft0: iretq diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 408c348..82d9881 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -11,6 +11,7 @@ #include #include #include +#include ALIGN /* %rbx: struct vcpu */ @@ -615,6 +616,9 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushq $0 + movl $TRAP_nmi,4(%rsp) handle_ist_exception: SAVE_ALL testb $3,UREGS_cs(%rsp) @@ -629,12 +633,25 @@ handle_ist_exception: movzbl UREGS_entry_vector(%rsp),%eax leaq exception_table(%rip),%rdx callq *(%rdx,%rax,8) - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) + jne ret_from_intr -ENTRY(nmi) - pushq $0 - movl $TRAP_nmi,4(%rsp) - jmp handle_ist_exception + /* We want to get straight to the IRET on the NMI exit path. */ + testb $3,UREGS_cs(%rsp) + jz restore_all_xen + GET_CURRENT(%rbx) + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%rbx),%eax + shll $IRQSTAT_shift,%eax + leaq irq_stat(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + je 1f + movl $EVENT_CHECK_VECTOR,%edi + call send_IPI_self +1: movq VCPU_domain(%rbx),%rax + cmpb $0,DOMAIN_is_32bit_pv(%rax) + je restore_all_guest + jmp compat_restore_all_guest ENTRY(nmi_crash) pushq $0 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJa-00073Y-Gh; Tue, 12 Mar 2013 11:24:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJY-000734-Tx for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:17 +0000 Received: from [85.158.139.83:44897] by server-7.bemta-5.messagelabs.com id ED/9A-12441-0601F315; Tue, 12 Mar 2013 11:24:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1363087449!24166919!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30702 invoked from network); 12 Mar 2013 11:24:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJR-0007wr-Dm for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJR-000624-BH for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:09 +0000 Date: Tue, 12 Mar 2013 11:24:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: defer processing events on the NMI exit 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 d463b005bbd6475ed930a302821efe239e1b2cf9 Author: Jan Beulich AuthorDate: Mon Mar 4 10:19:34 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:19:34 2013 +0100 x86: defer processing events on the NMI exit path Otherwise, we may end up in the scheduler, keeping NMIs masked for a possibly unbounded period of time (until whenever the next IRET gets executed). Enforce timely event processing by sending a self IPI. Of course it's open for discussion whether to always use the straight exit path from handle_ist_exception. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 7051f90..7769019 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -171,7 +171,7 @@ compat_bad_hypercall: jmp compat_test_all_events /* %rbx: struct vcpu, interrupts disabled */ -compat_restore_all_guest: +ENTRY(compat_restore_all_guest) ASSERT_INTERRUPTS_DISABLED RESTORE_ALL adj=8 compat=1 .Lft0: iretq diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 408c348..82d9881 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -11,6 +11,7 @@ #include #include #include +#include ALIGN /* %rbx: struct vcpu */ @@ -615,6 +616,9 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushq $0 + movl $TRAP_nmi,4(%rsp) handle_ist_exception: SAVE_ALL testb $3,UREGS_cs(%rsp) @@ -629,12 +633,25 @@ handle_ist_exception: movzbl UREGS_entry_vector(%rsp),%eax leaq exception_table(%rip),%rdx callq *(%rdx,%rax,8) - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) + jne ret_from_intr -ENTRY(nmi) - pushq $0 - movl $TRAP_nmi,4(%rsp) - jmp handle_ist_exception + /* We want to get straight to the IRET on the NMI exit path. */ + testb $3,UREGS_cs(%rsp) + jz restore_all_xen + GET_CURRENT(%rbx) + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%rbx),%eax + shll $IRQSTAT_shift,%eax + leaq irq_stat(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + je 1f + movl $EVENT_CHECK_VECTOR,%edi + call send_IPI_self +1: movq VCPU_domain(%rbx),%rax + cmpb $0,DOMAIN_is_32bit_pv(%rax) + je restore_all_guest + jmp compat_restore_all_guest ENTRY(nmi_crash) pushq $0 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJf-000756-JZ; Tue, 12 Mar 2013 11:24:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJe-00074a-8I for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:22 +0000 Received: from [85.158.138.51:23689] by server-12.bemta-3.messagelabs.com id 1C/6B-01357-5601F315; Tue, 12 Mar 2013 11:24:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1363087459!28251352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15939 invoked from network); 12 Mar 2013 11:24:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJb-0007x0-Ic for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJb-00062Q-H1 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:19 +0000 Date: Tue, 12 Mar 2013 11:24:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't rely on __softirq_pending to be the first field in irq_cpustat_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 da46114c1beccf3c5745ce4dbebe6d44bfbd8132 Author: Jan Beulich AuthorDate: Mon Mar 4 10:20:57 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:20:57 2013 +0100 x86: don't rely on __softirq_pending to be the first field in irq_cpustat_t This is even more so as the field doesn't have a comment to that effect in the structure definition. Once modifying the respective assembly code, also convert the IRQSTAT_shift users to do a 32-bit shift only (as we won't support 48M CPUs any time soon) and use "cmpl" instead of "testl" when checking the field (both reducing code size). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/svm/entry.S | 8 ++++---- xen/arch/x86/hvm/vmx/entry.S | 4 ++-- xen/arch/x86/x86_64/asm-offsets.c | 1 + xen/arch/x86/x86_64/compat/entry.S | 8 ++++---- xen/arch/x86/x86_64/entry.S | 6 +++--- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index ada71d2..1969629 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -41,10 +41,10 @@ ENTRY(svm_asm_do_resume) CLGI mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%rax - lea irq_stat(%rip),%rdx - testl $~0,(%rdx,%rax,1) - jnz .Lsvm_process_softirqs + shl $IRQSTAT_shift,%eax + lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx + cmpl $0,(%rdx,%rax,1) + jne .Lsvm_process_softirqs testb $0, VCPU_nsvm_hap_enabled(%rbx) UNLIKELY_START(nz, nsvm_hap) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index f0024d3..496a62c 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -97,8 +97,8 @@ vmx_asm_do_vmentry: cli mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%rax - lea irq_stat(%rip),%rdx + shl $IRQSTAT_shift,%eax + lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx cmpl $0,(%rdx,%rax,1) jnz .Lvmx_process_softirqs diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 6dc832c..b0098b3 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -156,6 +156,7 @@ void __dummy__(void) #endif DEFINE(IRQSTAT_shift, LOG_2(sizeof(irq_cpustat_t))); + OFFSET(IRQSTAT_softirq_pending, irq_cpustat_t, __softirq_pending); BLANK(); OFFSET(CPUINFO86_ext_features, struct cpuinfo_x86, x86_capability[1]); diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 7769019..c0afe2c 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -96,10 +96,10 @@ ENTRY(compat_test_all_events) cli # tests must not race interrupts /*compat_test_softirqs:*/ movl VCPU_processor(%rbx),%eax - shlq $IRQSTAT_shift,%rax - leaq irq_stat(%rip),%rcx - testl $~0,(%rcx,%rax,1) - jnz compat_process_softirqs + shll $IRQSTAT_shift,%eax + leaq irq_stat+IRQSTAT_softirq_pending(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + jne compat_process_softirqs testb $1,VCPU_mce_pending(%rbx) jnz compat_process_mce .Lcompat_test_guest_nmi: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 82d9881..03e352b 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -195,8 +195,8 @@ test_all_events: cli # tests must not race interrupts /*test_softirqs:*/ movl VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%rax - leaq irq_stat(%rip),%rcx + shll $IRQSTAT_shift,%eax + leaq irq_stat+IRQSTAT_softirq_pending(%rip),%rcx cmpl $0,(%rcx,%rax,1) jne process_softirqs testb $1,VCPU_mce_pending(%rbx) @@ -643,7 +643,7 @@ handle_ist_exception: /* Send an IPI to ourselves to cover for the lack of event checking. */ movl VCPU_processor(%rbx),%eax shll $IRQSTAT_shift,%eax - leaq irq_stat(%rip),%rcx + leaq irq_stat+IRQSTAT_softirq_pending(%rip),%rcx cmpl $0,(%rcx,%rax,1) je 1f movl $EVENT_CHECK_VECTOR,%edi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJf-000756-JZ; Tue, 12 Mar 2013 11:24:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJe-00074a-8I for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:22 +0000 Received: from [85.158.138.51:23689] by server-12.bemta-3.messagelabs.com id 1C/6B-01357-5601F315; Tue, 12 Mar 2013 11:24:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1363087459!28251352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15939 invoked from network); 12 Mar 2013 11:24:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJb-0007x0-Ic for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJb-00062Q-H1 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:19 +0000 Date: Tue, 12 Mar 2013 11:24:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't rely on __softirq_pending to be the first field in irq_cpustat_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 da46114c1beccf3c5745ce4dbebe6d44bfbd8132 Author: Jan Beulich AuthorDate: Mon Mar 4 10:20:57 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:20:57 2013 +0100 x86: don't rely on __softirq_pending to be the first field in irq_cpustat_t This is even more so as the field doesn't have a comment to that effect in the structure definition. Once modifying the respective assembly code, also convert the IRQSTAT_shift users to do a 32-bit shift only (as we won't support 48M CPUs any time soon) and use "cmpl" instead of "testl" when checking the field (both reducing code size). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/svm/entry.S | 8 ++++---- xen/arch/x86/hvm/vmx/entry.S | 4 ++-- xen/arch/x86/x86_64/asm-offsets.c | 1 + xen/arch/x86/x86_64/compat/entry.S | 8 ++++---- xen/arch/x86/x86_64/entry.S | 6 +++--- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index ada71d2..1969629 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -41,10 +41,10 @@ ENTRY(svm_asm_do_resume) CLGI mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%rax - lea irq_stat(%rip),%rdx - testl $~0,(%rdx,%rax,1) - jnz .Lsvm_process_softirqs + shl $IRQSTAT_shift,%eax + lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx + cmpl $0,(%rdx,%rax,1) + jne .Lsvm_process_softirqs testb $0, VCPU_nsvm_hap_enabled(%rbx) UNLIKELY_START(nz, nsvm_hap) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index f0024d3..496a62c 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -97,8 +97,8 @@ vmx_asm_do_vmentry: cli mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%rax - lea irq_stat(%rip),%rdx + shl $IRQSTAT_shift,%eax + lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx cmpl $0,(%rdx,%rax,1) jnz .Lvmx_process_softirqs diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 6dc832c..b0098b3 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -156,6 +156,7 @@ void __dummy__(void) #endif DEFINE(IRQSTAT_shift, LOG_2(sizeof(irq_cpustat_t))); + OFFSET(IRQSTAT_softirq_pending, irq_cpustat_t, __softirq_pending); BLANK(); OFFSET(CPUINFO86_ext_features, struct cpuinfo_x86, x86_capability[1]); diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 7769019..c0afe2c 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -96,10 +96,10 @@ ENTRY(compat_test_all_events) cli # tests must not race interrupts /*compat_test_softirqs:*/ movl VCPU_processor(%rbx),%eax - shlq $IRQSTAT_shift,%rax - leaq irq_stat(%rip),%rcx - testl $~0,(%rcx,%rax,1) - jnz compat_process_softirqs + shll $IRQSTAT_shift,%eax + leaq irq_stat+IRQSTAT_softirq_pending(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + jne compat_process_softirqs testb $1,VCPU_mce_pending(%rbx) jnz compat_process_mce .Lcompat_test_guest_nmi: diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 82d9881..03e352b 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -195,8 +195,8 @@ test_all_events: cli # tests must not race interrupts /*test_softirqs:*/ movl VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%rax - leaq irq_stat(%rip),%rcx + shll $IRQSTAT_shift,%eax + leaq irq_stat+IRQSTAT_softirq_pending(%rip),%rcx cmpl $0,(%rcx,%rax,1) jne process_softirqs testb $1,VCPU_mce_pending(%rbx) @@ -643,7 +643,7 @@ handle_ist_exception: /* Send an IPI to ourselves to cover for the lack of event checking. */ movl VCPU_processor(%rbx),%eax shll $IRQSTAT_shift,%eax - leaq irq_stat(%rip),%rcx + leaq irq_stat+IRQSTAT_softirq_pending(%rip),%rcx cmpl $0,(%rcx,%rax,1) je 1f movl $EVENT_CHECK_VECTOR,%edi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJq-00077r-Mf; Tue, 12 Mar 2013 11:24:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJo-00077K-Ol for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:32 +0000 Received: from [85.158.139.83:42237] by server-3.bemta-5.messagelabs.com id 16/28-17256-F601F315; Tue, 12 Mar 2013 11:24:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1363087469!23961798!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14582 invoked from network); 12 Mar 2013 11:24:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJl-0007xB-Nx for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJl-00063I-LK for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:29 +0000 Date: Tue, 12 Mar 2013 11:24:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: reduce irq_cpustat_t's __softirq_pending to 32 bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50c2f44e138ec1677059429be65f82b650ed6b88 Author: Jan Beulich AuthorDate: Mon Mar 4 10:22:10 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:22:10 2013 +0100 x86: reduce irq_cpustat_t's __softirq_pending to 32 bits Assembly code was already only accessing the low 32 bits of it, and we're far away from using all 32 bits of it. Noticed-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/asm-x86/hardirq.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/hardirq.h b/xen/include/asm-x86/hardirq.h index 5b9d18b..e573007 100644 --- a/xen/include/asm-x86/hardirq.h +++ b/xen/include/asm-x86/hardirq.h @@ -5,7 +5,7 @@ #include typedef struct { - unsigned long __softirq_pending; + unsigned int __softirq_pending; unsigned int __local_irq_count; unsigned int __nmi_count; bool_t __mwait_wakeup; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNJq-00077r-Mf; Tue, 12 Mar 2013 11:24:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJo-00077K-Ol for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:32 +0000 Received: from [85.158.139.83:42237] by server-3.bemta-5.messagelabs.com id 16/28-17256-F601F315; Tue, 12 Mar 2013 11:24:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1363087469!23961798!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14582 invoked from network); 12 Mar 2013 11:24:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJl-0007xB-Nx for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJl-00063I-LK for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:29 +0000 Date: Tue, 12 Mar 2013 11:24:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: reduce irq_cpustat_t's __softirq_pending to 32 bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50c2f44e138ec1677059429be65f82b650ed6b88 Author: Jan Beulich AuthorDate: Mon Mar 4 10:22:10 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:22:10 2013 +0100 x86: reduce irq_cpustat_t's __softirq_pending to 32 bits Assembly code was already only accessing the low 32 bits of it, and we're far away from using all 32 bits of it. Noticed-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/asm-x86/hardirq.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/hardirq.h b/xen/include/asm-x86/hardirq.h index 5b9d18b..e573007 100644 --- a/xen/include/asm-x86/hardirq.h +++ b/xen/include/asm-x86/hardirq.h @@ -5,7 +5,7 @@ #include typedef struct { - unsigned long __softirq_pending; + unsigned int __softirq_pending; unsigned int __local_irq_count; unsigned int __nmi_count; bool_t __mwait_wakeup; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNJz-0007Ae-Rq; Tue, 12 Mar 2013 11:24:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJy-0007AB-FQ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:42 +0000 Received: from [85.158.139.83:55719] by server-13.bemta-5.messagelabs.com id 66/75-16871-9701F315; Tue, 12 Mar 2013 11:24:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1363087480!21225317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 496 invoked from network); 12 Mar 2013 11:24:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJv-0007xK-UJ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJv-00063i-TI for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:39 +0000 Date: Tue, 12 Mar 2013 11:24:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make x86_mcinfo_reserve() clear its result 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 81881483859fabf918afe6da8e1a679a37479537 Author: Jan Beulich AuthorDate: Mon Mar 4 10:25:24 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:25:24 2013 +0100 x86: make x86_mcinfo_reserve() clear its result buffer ... instead of all but one of its callers. Also adjust the corresponding sizeof() expressions to specify the pointed-to type of the result variable rather than the literal type (so that a type change of the variable will imply the size to get adjusted too). Suggested-by: Ian Campbell Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/amd_f10.c | 3 +-- xen/arch/x86/cpu/mcheck/mcaction.c | 4 +--- xen/arch/x86/cpu/mcheck/mce.c | 8 +++----- xen/arch/x86/cpu/mcheck/mce_intel.c | 3 +-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/amd_f10.c b/xen/arch/x86/cpu/mcheck/amd_f10.c index 487fbce..61319dc 100644 --- a/xen/arch/x86/cpu/mcheck/amd_f10.c +++ b/xen/arch/x86/cpu/mcheck/amd_f10.c @@ -62,14 +62,13 @@ amd_f10_handler(struct mc_info *mi, uint16_t bank, uint64_t status) if (!(status & MCi_STATUS_MISCV)) return NULL; - mc_ext = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_extended)); + mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext)); if (!mc_ext) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return NULL; } - memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(*mc_ext); mc_ext->mc_msrs = 3; diff --git a/xen/arch/x86/cpu/mcheck/mcaction.c b/xen/arch/x86/cpu/mcheck/mcaction.c index 27e3796..5627192 100644 --- a/xen/arch/x86/cpu/mcheck/mcaction.c +++ b/xen/arch/x86/cpu/mcheck/mcaction.c @@ -13,14 +13,12 @@ mci_action_add_pageoffline(int bank, struct mc_info *mi, if (!mi) return NULL; - rec = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_recovery)); + rec = x86_mcinfo_reserve(mi, sizeof(*rec)); if (!rec) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return NULL; } - memset(rec, 0, sizeof(struct mcinfo_recovery)); - rec->common.type = MC_TYPE_RECOVERY; rec->common.size = sizeof(*rec); rec->mc_bank = bank; diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 4e28424..ced1a89 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -200,14 +200,13 @@ static void mca_init_bank(enum mca_source who, if (!mi) return; - mib = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_bank)); + mib = x86_mcinfo_reserve(mi, sizeof(*mib)); if (!mib) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return; } - memset(mib, 0, sizeof (struct mcinfo_bank)); mib->mc_status = mca_rdmsr(MSR_IA32_MCx_STATUS(bank)); mib->common.type = MC_TYPE_BANK; @@ -247,7 +246,6 @@ static int mca_init_global(uint32_t flags, struct mcinfo_global *mig) struct domain *d; /* Set global information */ - memset(mig, 0, sizeof (struct mcinfo_global)); mig->common.type = MC_TYPE_GLOBAL; mig->common.size = sizeof (struct mcinfo_global); status = mca_rdmsr(MSR_IA32_MCG_STATUS); @@ -349,7 +347,7 @@ mcheck_mca_logout(enum mca_source who, struct mca_banks *bankmask, if ( (mctc = mctelem_reserve(which)) != NULL ) { mci = mctelem_dataptr(mctc); mcinfo_clear(mci); - mig = x86_mcinfo_reserve(mci, sizeof(struct mcinfo_global)); + mig = x86_mcinfo_reserve(mci, sizeof(*mig)); /* mc_info should at least hold up the global information */ ASSERT(mig); mca_init_global(mc_flags, mig); @@ -820,7 +818,7 @@ void *x86_mcinfo_reserve(struct mc_info *mi, int size) /* there's enough space. add entry. */ x86_mcinfo_nentries(mi)++; - return mic_index; + return memset(mic_index, 0, size); } void *x86_mcinfo_add(struct mc_info *mi, void *mcinfo) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 0040110..b32fdb2 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -192,7 +192,7 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) !(mig->mc_gstatus & MCG_STATUS_EIPV)) return NULL; - mc_ext = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_extended)); + mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext)); if (!mc_ext) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; @@ -200,7 +200,6 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) } /* this function will called when CAP(9).MCG_EXT_P = 1 */ - memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(struct mcinfo_extended); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNJz-0007Ae-Rq; Tue, 12 Mar 2013 11:24:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJy-0007AB-FQ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:42 +0000 Received: from [85.158.139.83:55719] by server-13.bemta-5.messagelabs.com id 66/75-16871-9701F315; Tue, 12 Mar 2013 11:24:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1363087480!21225317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 496 invoked from network); 12 Mar 2013 11:24:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:24:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJv-0007xK-UJ for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJv-00063i-TI for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:39 +0000 Date: Tue, 12 Mar 2013 11:24:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make x86_mcinfo_reserve() clear its result 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 81881483859fabf918afe6da8e1a679a37479537 Author: Jan Beulich AuthorDate: Mon Mar 4 10:25:24 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:25:24 2013 +0100 x86: make x86_mcinfo_reserve() clear its result buffer ... instead of all but one of its callers. Also adjust the corresponding sizeof() expressions to specify the pointed-to type of the result variable rather than the literal type (so that a type change of the variable will imply the size to get adjusted too). Suggested-by: Ian Campbell Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/amd_f10.c | 3 +-- xen/arch/x86/cpu/mcheck/mcaction.c | 4 +--- xen/arch/x86/cpu/mcheck/mce.c | 8 +++----- xen/arch/x86/cpu/mcheck/mce_intel.c | 3 +-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/amd_f10.c b/xen/arch/x86/cpu/mcheck/amd_f10.c index 487fbce..61319dc 100644 --- a/xen/arch/x86/cpu/mcheck/amd_f10.c +++ b/xen/arch/x86/cpu/mcheck/amd_f10.c @@ -62,14 +62,13 @@ amd_f10_handler(struct mc_info *mi, uint16_t bank, uint64_t status) if (!(status & MCi_STATUS_MISCV)) return NULL; - mc_ext = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_extended)); + mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext)); if (!mc_ext) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return NULL; } - memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(*mc_ext); mc_ext->mc_msrs = 3; diff --git a/xen/arch/x86/cpu/mcheck/mcaction.c b/xen/arch/x86/cpu/mcheck/mcaction.c index 27e3796..5627192 100644 --- a/xen/arch/x86/cpu/mcheck/mcaction.c +++ b/xen/arch/x86/cpu/mcheck/mcaction.c @@ -13,14 +13,12 @@ mci_action_add_pageoffline(int bank, struct mc_info *mi, if (!mi) return NULL; - rec = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_recovery)); + rec = x86_mcinfo_reserve(mi, sizeof(*rec)); if (!rec) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return NULL; } - memset(rec, 0, sizeof(struct mcinfo_recovery)); - rec->common.type = MC_TYPE_RECOVERY; rec->common.size = sizeof(*rec); rec->mc_bank = bank; diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 4e28424..ced1a89 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -200,14 +200,13 @@ static void mca_init_bank(enum mca_source who, if (!mi) return; - mib = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_bank)); + mib = x86_mcinfo_reserve(mi, sizeof(*mib)); if (!mib) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return; } - memset(mib, 0, sizeof (struct mcinfo_bank)); mib->mc_status = mca_rdmsr(MSR_IA32_MCx_STATUS(bank)); mib->common.type = MC_TYPE_BANK; @@ -247,7 +246,6 @@ static int mca_init_global(uint32_t flags, struct mcinfo_global *mig) struct domain *d; /* Set global information */ - memset(mig, 0, sizeof (struct mcinfo_global)); mig->common.type = MC_TYPE_GLOBAL; mig->common.size = sizeof (struct mcinfo_global); status = mca_rdmsr(MSR_IA32_MCG_STATUS); @@ -349,7 +347,7 @@ mcheck_mca_logout(enum mca_source who, struct mca_banks *bankmask, if ( (mctc = mctelem_reserve(which)) != NULL ) { mci = mctelem_dataptr(mctc); mcinfo_clear(mci); - mig = x86_mcinfo_reserve(mci, sizeof(struct mcinfo_global)); + mig = x86_mcinfo_reserve(mci, sizeof(*mig)); /* mc_info should at least hold up the global information */ ASSERT(mig); mca_init_global(mc_flags, mig); @@ -820,7 +818,7 @@ void *x86_mcinfo_reserve(struct mc_info *mi, int size) /* there's enough space. add entry. */ x86_mcinfo_nentries(mi)++; - return mic_index; + return memset(mic_index, 0, size); } void *x86_mcinfo_add(struct mc_info *mi, void *mcinfo) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 0040110..b32fdb2 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -192,7 +192,7 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) !(mig->mc_gstatus & MCG_STATUS_EIPV)) return NULL; - mc_ext = x86_mcinfo_reserve(mi, sizeof(struct mcinfo_extended)); + mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext)); if (!mc_ext) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; @@ -200,7 +200,6 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) } /* this function will called when CAP(9).MCG_EXT_P = 1 */ - memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; mc_ext->common.size = sizeof(struct mcinfo_extended); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNK9-0007DC-Um; Tue, 12 Mar 2013 11:24:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNK8-0007Cx-Pi for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:52 +0000 Received: from [85.158.139.211:51609] by server-7.bemta-5.messagelabs.com id 92/CB-12441-4801F315; Tue, 12 Mar 2013 11:24:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1363087490!19083669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26575 invoked from network); 12 Mar 2013 11:24:51 -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 Mar 2013 11:24:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNK6-0007xT-1n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNK6-000644-0q for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:50 +0000 Date: Tue, 12 Mar 2013 11:24:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit1: Use atomic bit operations for the flags structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be6507509454adf3bb5a50b9406c88504e996d5a Author: George Dunlap AuthorDate: Mon Mar 4 13:37:39 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:37:39 2013 +0100 credit1: Use atomic bit operations for the flags structure The flags structure is not protected by locks (or more precisely, it is protected using an inconsistent set of locks); we therefore need to make sure that all accesses are atomic-safe. This is particulary important in the case of the PARKED flag, which if clobbered while changing the YIELD bit will leave a vcpu wedged in an offline state. Using the atomic bitops also requires us to change the size of the "flags" element. Spotted-by: Igor Pavlikevich Signed-off-by: George Dunlap --- xen/common/sched_credit.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7fbc005..9e9ef33 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -47,8 +47,8 @@ /* * Flags */ -#define CSCHED_FLAG_VCPU_PARKED 0x0001 /* VCPU over capped credits */ -#define CSCHED_FLAG_VCPU_YIELD 0x0002 /* VCPU yielding */ +#define CSCHED_FLAG_VCPU_PARKED 0x0 /* VCPU over capped credits */ +#define CSCHED_FLAG_VCPU_YIELD 0x1 /* VCPU yielding */ /* @@ -139,7 +139,7 @@ struct csched_vcpu { atomic_t credit; unsigned int residual; s_time_t start_time; /* When we were scheduled (used for credit) */ - uint16_t flags; + unsigned flags; int16_t pri; #ifdef CSCHED_STATS struct { @@ -222,7 +222,7 @@ __runq_insert(unsigned int cpu, struct csched_vcpu *svc) /* If the vcpu yielded, try to put it behind one lower-priority * runnable vcpu if we can. The next runq_sort will bring it forward * within 30ms if the queue too long. */ - if ( svc->flags & CSCHED_FLAG_VCPU_YIELD + if ( test_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags) && __runq_elem(iter)->pri > CSCHED_PRI_IDLE ) { iter=iter->next; @@ -817,7 +817,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) * those. */ if ( svc->pri == CSCHED_PRI_TS_UNDER && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { svc->pri = CSCHED_PRI_TS_BOOST; } @@ -830,10 +830,10 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) static void csched_vcpu_yield(const struct scheduler *ops, struct vcpu *vc) { - struct csched_vcpu * const sv = CSCHED_VCPU(vc); + struct csched_vcpu * const svc = CSCHED_VCPU(vc); /* Let the scheduler know that this vcpu is trying to yield */ - sv->flags |= CSCHED_FLAG_VCPU_YIELD; + set_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags); } static int @@ -1157,11 +1157,10 @@ csched_acct(void* dummy) /* Park running VCPUs of capped-out domains */ if ( sdom->cap != 0U && credit < -credit_cap && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_and_set_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { SCHED_STAT_CRANK(vcpu_park); vcpu_pause_nosync(svc->vcpu); - svc->flags |= CSCHED_FLAG_VCPU_PARKED; } /* Lower bound on credits */ @@ -1177,7 +1176,7 @@ csched_acct(void* dummy) svc->pri = CSCHED_PRI_TS_UNDER; /* Unpark any capped domains whose credits go positive */ - if ( svc->flags & CSCHED_FLAG_VCPU_PARKED) + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { /* * It's important to unset the flag AFTER the unpause() @@ -1186,7 +1185,6 @@ csched_acct(void* dummy) */ SCHED_STAT_CRANK(vcpu_unpark); vcpu_unpause(svc->vcpu); - svc->flags &= ~CSCHED_FLAG_VCPU_PARKED; } /* Upper bound on credits means VCPU stops earning */ @@ -1448,8 +1446,7 @@ csched_schedule( /* * Clear YIELD flag before scheduling out */ - if ( scurr->flags & CSCHED_FLAG_VCPU_YIELD ) - scurr->flags &= ~(CSCHED_FLAG_VCPU_YIELD); + clear_bit(CSCHED_FLAG_VCPU_YIELD, &scurr->flags); /* * SMP Load balance: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:24:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:24: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 1UFNK9-0007DC-Um; Tue, 12 Mar 2013 11:24:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNK8-0007Cx-Pi for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:52 +0000 Received: from [85.158.139.211:51609] by server-7.bemta-5.messagelabs.com id 92/CB-12441-4801F315; Tue, 12 Mar 2013 11:24:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1363087490!19083669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26575 invoked from network); 12 Mar 2013 11:24:51 -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 Mar 2013 11:24:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNK6-0007xT-1n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNK6-000644-0q for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:24:50 +0000 Date: Tue, 12 Mar 2013 11:24:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit1: Use atomic bit operations for the flags structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be6507509454adf3bb5a50b9406c88504e996d5a Author: George Dunlap AuthorDate: Mon Mar 4 13:37:39 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:37:39 2013 +0100 credit1: Use atomic bit operations for the flags structure The flags structure is not protected by locks (or more precisely, it is protected using an inconsistent set of locks); we therefore need to make sure that all accesses are atomic-safe. This is particulary important in the case of the PARKED flag, which if clobbered while changing the YIELD bit will leave a vcpu wedged in an offline state. Using the atomic bitops also requires us to change the size of the "flags" element. Spotted-by: Igor Pavlikevich Signed-off-by: George Dunlap --- xen/common/sched_credit.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7fbc005..9e9ef33 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -47,8 +47,8 @@ /* * Flags */ -#define CSCHED_FLAG_VCPU_PARKED 0x0001 /* VCPU over capped credits */ -#define CSCHED_FLAG_VCPU_YIELD 0x0002 /* VCPU yielding */ +#define CSCHED_FLAG_VCPU_PARKED 0x0 /* VCPU over capped credits */ +#define CSCHED_FLAG_VCPU_YIELD 0x1 /* VCPU yielding */ /* @@ -139,7 +139,7 @@ struct csched_vcpu { atomic_t credit; unsigned int residual; s_time_t start_time; /* When we were scheduled (used for credit) */ - uint16_t flags; + unsigned flags; int16_t pri; #ifdef CSCHED_STATS struct { @@ -222,7 +222,7 @@ __runq_insert(unsigned int cpu, struct csched_vcpu *svc) /* If the vcpu yielded, try to put it behind one lower-priority * runnable vcpu if we can. The next runq_sort will bring it forward * within 30ms if the queue too long. */ - if ( svc->flags & CSCHED_FLAG_VCPU_YIELD + if ( test_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags) && __runq_elem(iter)->pri > CSCHED_PRI_IDLE ) { iter=iter->next; @@ -817,7 +817,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) * those. */ if ( svc->pri == CSCHED_PRI_TS_UNDER && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { svc->pri = CSCHED_PRI_TS_BOOST; } @@ -830,10 +830,10 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) static void csched_vcpu_yield(const struct scheduler *ops, struct vcpu *vc) { - struct csched_vcpu * const sv = CSCHED_VCPU(vc); + struct csched_vcpu * const svc = CSCHED_VCPU(vc); /* Let the scheduler know that this vcpu is trying to yield */ - sv->flags |= CSCHED_FLAG_VCPU_YIELD; + set_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags); } static int @@ -1157,11 +1157,10 @@ csched_acct(void* dummy) /* Park running VCPUs of capped-out domains */ if ( sdom->cap != 0U && credit < -credit_cap && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_and_set_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { SCHED_STAT_CRANK(vcpu_park); vcpu_pause_nosync(svc->vcpu); - svc->flags |= CSCHED_FLAG_VCPU_PARKED; } /* Lower bound on credits */ @@ -1177,7 +1176,7 @@ csched_acct(void* dummy) svc->pri = CSCHED_PRI_TS_UNDER; /* Unpark any capped domains whose credits go positive */ - if ( svc->flags & CSCHED_FLAG_VCPU_PARKED) + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { /* * It's important to unset the flag AFTER the unpause() @@ -1186,7 +1185,6 @@ csched_acct(void* dummy) */ SCHED_STAT_CRANK(vcpu_unpark); vcpu_unpause(svc->vcpu); - svc->flags &= ~CSCHED_FLAG_VCPU_PARKED; } /* Upper bound on credits means VCPU stops earning */ @@ -1448,8 +1446,7 @@ csched_schedule( /* * Clear YIELD flag before scheduling out */ - if ( scurr->flags & CSCHED_FLAG_VCPU_YIELD ) - scurr->flags &= ~(CSCHED_FLAG_VCPU_YIELD); + clear_bit(CSCHED_FLAG_VCPU_YIELD, &scurr->flags); /* * SMP Load balance: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:25:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKK-0007Fq-4I; Tue, 12 Mar 2013 11:25:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKJ-0007FR-3G for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:03 +0000 Received: from [85.158.139.211:52575] by server-10.bemta-5.messagelabs.com id 65/E0-23714-E801F315; Tue, 12 Mar 2013 11:25:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1363087500!19083709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27411 invoked from network); 12 Mar 2013 11:25:01 -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 Mar 2013 11:25:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKG-0007xf-8M for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKG-00064R-77 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:00 +0000 Date: Tue, 12 Mar 2013 11:25:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Avoid extra c2t calcuation in csched_runtime X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b3072a050a67405022f9e7911c37ccff9c0cdb5 Author: George Dunlap AuthorDate: Mon Mar 4 13:38:45 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:38:45 2013 +0100 credit2: Avoid extra c2t calcuation in csched_runtime csched_runtime() needs to call the ct2() function to change credits into time. The c2t() function, however, is expensive, as it requires an integer division. c2t() was being called twice, once for the main vcpu's credit and once for the difference between its credit and the next in the queue. But this is unnecessary; by calculating in "credit" first, we can make it so that we just do one conversion later in the algorithm. This also adds more documentation describing the intended algorithm, along with a relevant assertion.. The effect of the new code should be the same as the old code. Spotted-by: Jan Beulich Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 48 +++++++++++++++++++++++++++++++++---------- 1 files changed, 37 insertions(+), 11 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index b0af010..804049e 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -1505,31 +1505,57 @@ csched_dom_destroy(const struct scheduler *ops, struct domain *dom) static s_time_t csched_runtime(const struct scheduler *ops, int cpu, struct csched_vcpu *snext) { - s_time_t time = CSCHED_MAX_TIMER; + s_time_t time; + int rt_credit; /* Proposed runtime measured in credits */ struct csched_runqueue_data *rqd = RQD(ops, cpu); struct list_head *runq = &rqd->runq; if ( is_idle_vcpu(snext->vcpu) ) return CSCHED_MAX_TIMER; - /* Basic time */ - time = c2t(rqd, snext->credit, snext); + /* General algorithm: + * 1) Run until snext's credit will be 0 + * 2) But if someone is waiting, run until snext's credit is equal + * to his + * 3) But never run longer than MAX_TIMER or shorter than MIN_TIMER. + */ + + /* 1) Basic time: Run until credit is 0. */ + rt_credit = snext->credit; - /* Next guy on runqueue */ + /* 2) If there's someone waiting whose credit is positive, + * run until your credit ~= his */ if ( ! list_empty(runq) ) { - struct csched_vcpu *svc = __runq_elem(runq->next); - s_time_t ntime; + struct csched_vcpu *swait = __runq_elem(runq->next); - if ( ! is_idle_vcpu(svc->vcpu) ) + if ( ! is_idle_vcpu(swait->vcpu) + && swait->credit > 0 ) { - ntime = c2t(rqd, snext->credit - svc->credit, snext); - - if ( time > ntime ) - time = ntime; + rt_credit = snext->credit - swait->credit; } } + /* + * snext is about to be scheduled; so: + * + * 1. if snext->credit were less than 0 when it was taken off the + * runqueue, then csched_schedule() should have called + * reset_credit(). So at this point snext->credit must be greater + * than 0. + * + * 2. snext's credit must be greater than or equal to anyone else + * in the queue, so snext->credit - swait->credit must be greater + * than or equal to 0. + */ + ASSERT(rt_credit >= 0); + + /* FIXME: See if we can eliminate this conversion if we know time + * will be outside (MIN,MAX). Probably requires pre-calculating + * credit values of MIN,MAX per vcpu, since each vcpu burns credit + * at a different rate. */ + time = c2t(rqd, rt_credit, snext); + /* Check limits */ if ( time < CSCHED_MIN_TIMER ) time = CSCHED_MIN_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 Tue Mar 12 11:25:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKK-0007Fq-4I; Tue, 12 Mar 2013 11:25:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKJ-0007FR-3G for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:03 +0000 Received: from [85.158.139.211:52575] by server-10.bemta-5.messagelabs.com id 65/E0-23714-E801F315; Tue, 12 Mar 2013 11:25:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1363087500!19083709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27411 invoked from network); 12 Mar 2013 11:25:01 -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 Mar 2013 11:25:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKG-0007xf-8M for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKG-00064R-77 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:00 +0000 Date: Tue, 12 Mar 2013 11:25:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Avoid extra c2t calcuation in csched_runtime X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b3072a050a67405022f9e7911c37ccff9c0cdb5 Author: George Dunlap AuthorDate: Mon Mar 4 13:38:45 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:38:45 2013 +0100 credit2: Avoid extra c2t calcuation in csched_runtime csched_runtime() needs to call the ct2() function to change credits into time. The c2t() function, however, is expensive, as it requires an integer division. c2t() was being called twice, once for the main vcpu's credit and once for the difference between its credit and the next in the queue. But this is unnecessary; by calculating in "credit" first, we can make it so that we just do one conversion later in the algorithm. This also adds more documentation describing the intended algorithm, along with a relevant assertion.. The effect of the new code should be the same as the old code. Spotted-by: Jan Beulich Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 48 +++++++++++++++++++++++++++++++++---------- 1 files changed, 37 insertions(+), 11 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index b0af010..804049e 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -1505,31 +1505,57 @@ csched_dom_destroy(const struct scheduler *ops, struct domain *dom) static s_time_t csched_runtime(const struct scheduler *ops, int cpu, struct csched_vcpu *snext) { - s_time_t time = CSCHED_MAX_TIMER; + s_time_t time; + int rt_credit; /* Proposed runtime measured in credits */ struct csched_runqueue_data *rqd = RQD(ops, cpu); struct list_head *runq = &rqd->runq; if ( is_idle_vcpu(snext->vcpu) ) return CSCHED_MAX_TIMER; - /* Basic time */ - time = c2t(rqd, snext->credit, snext); + /* General algorithm: + * 1) Run until snext's credit will be 0 + * 2) But if someone is waiting, run until snext's credit is equal + * to his + * 3) But never run longer than MAX_TIMER or shorter than MIN_TIMER. + */ + + /* 1) Basic time: Run until credit is 0. */ + rt_credit = snext->credit; - /* Next guy on runqueue */ + /* 2) If there's someone waiting whose credit is positive, + * run until your credit ~= his */ if ( ! list_empty(runq) ) { - struct csched_vcpu *svc = __runq_elem(runq->next); - s_time_t ntime; + struct csched_vcpu *swait = __runq_elem(runq->next); - if ( ! is_idle_vcpu(svc->vcpu) ) + if ( ! is_idle_vcpu(swait->vcpu) + && swait->credit > 0 ) { - ntime = c2t(rqd, snext->credit - svc->credit, snext); - - if ( time > ntime ) - time = ntime; + rt_credit = snext->credit - swait->credit; } } + /* + * snext is about to be scheduled; so: + * + * 1. if snext->credit were less than 0 when it was taken off the + * runqueue, then csched_schedule() should have called + * reset_credit(). So at this point snext->credit must be greater + * than 0. + * + * 2. snext's credit must be greater than or equal to anyone else + * in the queue, so snext->credit - swait->credit must be greater + * than or equal to 0. + */ + ASSERT(rt_credit >= 0); + + /* FIXME: See if we can eliminate this conversion if we know time + * will be outside (MIN,MAX). Probably requires pre-calculating + * credit values of MIN,MAX per vcpu, since each vcpu burns credit + * at a different rate. */ + time = c2t(rqd, rt_credit, snext); + /* Check limits */ if ( time < CSCHED_MIN_TIMER ) time = CSCHED_MIN_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 Tue Mar 12 11:25:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKa-0007JC-7h; Tue, 12 Mar 2013 11:25:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKY-0007Iv-QC for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:19 +0000 Received: from [85.158.138.51:62337] by server-8.bemta-3.messagelabs.com id 45/3A-20604-9901F315; Tue, 12 Mar 2013 11:25:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1363087510!21760166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28131 invoked from network); 12 Mar 2013 11:25:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKQ-0007yB-Cr for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKQ-00064s-BF for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:10 +0000 Date: Tue, 12 Mar 2013 11:25:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: track residual from divisions done during accounting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0704a8a90d3219cbbc607f5b83cd4f60371a47e Author: George Dunlap AuthorDate: Mon Mar 4 13:39:19 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:39:19 2013 +0100 credit2: track residual from divisions done during accounting This should help with under-accounting of vCPU-s running for extremly short periods of time, but becoming runnable again at a high frequency. Don't bother subtracting the residual from the runtime, as it can only ever add up to one nanosecond, and will end up being debited during the next reset interval anyway. Original-patch-by: Jan Beulich Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 804049e..a7bd2ee 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -205,7 +205,7 @@ struct csched_runqueue_data { struct list_head runq; /* Ordered list of runnable vms */ struct list_head svc; /* List of all vcpus assigned to this runqueue */ - int max_weight; + unsigned int max_weight; cpumask_t idle, /* Currently idle */ tickled; /* Another cpu in the queue is already targeted for this one */ @@ -244,7 +244,8 @@ struct csched_vcpu { struct csched_dom *sdom; struct vcpu *vcpu; - int weight; + unsigned int weight; + unsigned int residual; int credit; s_time_t start_time; /* When we were scheduled (used for credit) */ @@ -271,11 +272,19 @@ struct csched_dom { /* * Time-to-credit, credit-to-time. + * + * We keep track of the "residual" time to make sure that frequent short + * schedules still get accounted for in the end. + * * FIXME: Do pre-calculated division? */ -static s_time_t t2c(struct csched_runqueue_data *rqd, s_time_t time, struct csched_vcpu *svc) +static void t2c_update(struct csched_runqueue_data *rqd, s_time_t time, + struct csched_vcpu *svc) { - return time * rqd->max_weight / svc->weight; + uint64_t val = time * rqd->max_weight + svc->residual; + + svc->residual = do_div(val, svc->weight); + svc->credit -= val; } static s_time_t c2t(struct csched_runqueue_data *rqd, s_time_t credit, struct csched_vcpu *svc) @@ -636,8 +645,7 @@ void burn_credits(struct csched_runqueue_data *rqd, struct csched_vcpu *svc, s_t delta = now - svc->start_time; if ( delta > 0 ) { - /* This will round down; should we consider rounding up...? */ - svc->credit -= t2c(rqd, delta, svc); + t2c_update(rqd, delta, svc); svc->start_time = now; d2printk("b d%dv%d c%d\n", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:25:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKa-0007JC-7h; Tue, 12 Mar 2013 11:25:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKY-0007Iv-QC for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:19 +0000 Received: from [85.158.138.51:62337] by server-8.bemta-3.messagelabs.com id 45/3A-20604-9901F315; Tue, 12 Mar 2013 11:25:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1363087510!21760166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28131 invoked from network); 12 Mar 2013 11:25:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKQ-0007yB-Cr for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKQ-00064s-BF for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:10 +0000 Date: Tue, 12 Mar 2013 11:25:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: track residual from divisions done during accounting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0704a8a90d3219cbbc607f5b83cd4f60371a47e Author: George Dunlap AuthorDate: Mon Mar 4 13:39:19 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:39:19 2013 +0100 credit2: track residual from divisions done during accounting This should help with under-accounting of vCPU-s running for extremly short periods of time, but becoming runnable again at a high frequency. Don't bother subtracting the residual from the runtime, as it can only ever add up to one nanosecond, and will end up being debited during the next reset interval anyway. Original-patch-by: Jan Beulich Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 804049e..a7bd2ee 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -205,7 +205,7 @@ struct csched_runqueue_data { struct list_head runq; /* Ordered list of runnable vms */ struct list_head svc; /* List of all vcpus assigned to this runqueue */ - int max_weight; + unsigned int max_weight; cpumask_t idle, /* Currently idle */ tickled; /* Another cpu in the queue is already targeted for this one */ @@ -244,7 +244,8 @@ struct csched_vcpu { struct csched_dom *sdom; struct vcpu *vcpu; - int weight; + unsigned int weight; + unsigned int residual; int credit; s_time_t start_time; /* When we were scheduled (used for credit) */ @@ -271,11 +272,19 @@ struct csched_dom { /* * Time-to-credit, credit-to-time. + * + * We keep track of the "residual" time to make sure that frequent short + * schedules still get accounted for in the end. + * * FIXME: Do pre-calculated division? */ -static s_time_t t2c(struct csched_runqueue_data *rqd, s_time_t time, struct csched_vcpu *svc) +static void t2c_update(struct csched_runqueue_data *rqd, s_time_t time, + struct csched_vcpu *svc) { - return time * rqd->max_weight / svc->weight; + uint64_t val = time * rqd->max_weight + svc->residual; + + svc->residual = do_div(val, svc->weight); + svc->credit -= val; } static s_time_t c2t(struct csched_runqueue_data *rqd, s_time_t credit, struct csched_vcpu *svc) @@ -636,8 +645,7 @@ void burn_credits(struct csched_runqueue_data *rqd, struct csched_vcpu *svc, s_t delta = now - svc->start_time; if ( delta > 0 ) { - /* This will round down; should we consider rounding up...? */ - svc->credit -= t2c(rqd, delta, svc); + t2c_update(rqd, delta, svc); svc->start_time = now; d2printk("b d%dv%d c%d\n", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:25:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKf-0007KN-AC; Tue, 12 Mar 2013 11:25:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKd-0007K3-OX for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:23 +0000 Received: from [85.158.139.83:52324] by server-6.bemta-5.messagelabs.com id 96/86-21466-3A01F315; Tue, 12 Mar 2013 11:25:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1363087520!25727274!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10827 invoked from network); 12 Mar 2013 11:25:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKa-0007yH-I3 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKa-00065H-Fa for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:20 +0000 Date: Tue, 12 Mar 2013 11:25:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: fix off-by-one in calculate_tbuf_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 d9fb28ae6d41c8201482948660e52889481830dd Author: Olaf Hering AuthorDate: Mon Mar 4 13:42:17 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:42:17 2013 +0100 xentrace: fix off-by-one in calculate_tbuf_size Commit "xentrace: reduce trace buffer size to something mfn_offset can reach" contains an off-by-one bug. max_mfn_offset needs to be reduced by exactly the value of t_info_first_offset. If the system has two cpus and the number of requested trace pages is very large, the final number of trace pages + the offset will not fit into a short. As a result the variable offset in alloc_trace_bufs() will wrap while allocating buffers for the second cpu. Later share_xen_page_with_privileged_guests() will be called with a wrong page and the ASSERT in this function triggers. If the ASSERT is ignored by running a non-dbg hypervisor the asserts in xentrace itself trigger because "cons" is not aligned because the very last trace page for the second cpu is a random mfn. Thanks to Jan for the quick analysis. Signed-off-by: Olaf Hering Acked-by: George Dunlap --- xen/common/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/trace.c b/xen/common/trace.c index 08e5b20..506c498 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -133,7 +133,7 @@ static int calculate_tbuf_size(unsigned int pages, uint16_t t_info_first_offset) * The array of mfns for the highest cpu can start at the maximum value * mfn_offset can hold. So reduce the number of cpus and also the mfn_offset. */ - max_mfn_offset -= t_info_first_offset - 1; + max_mfn_offset -= t_info_first_offset; max_cpus--; if ( max_cpus ) max_mfn_offset /= max_cpus; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:25:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKf-0007KN-AC; Tue, 12 Mar 2013 11:25:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKd-0007K3-OX for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:23 +0000 Received: from [85.158.139.83:52324] by server-6.bemta-5.messagelabs.com id 96/86-21466-3A01F315; Tue, 12 Mar 2013 11:25:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1363087520!25727274!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10827 invoked from network); 12 Mar 2013 11:25:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKa-0007yH-I3 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKa-00065H-Fa for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:20 +0000 Date: Tue, 12 Mar 2013 11:25:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: fix off-by-one in calculate_tbuf_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 d9fb28ae6d41c8201482948660e52889481830dd Author: Olaf Hering AuthorDate: Mon Mar 4 13:42:17 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 13:42:17 2013 +0100 xentrace: fix off-by-one in calculate_tbuf_size Commit "xentrace: reduce trace buffer size to something mfn_offset can reach" contains an off-by-one bug. max_mfn_offset needs to be reduced by exactly the value of t_info_first_offset. If the system has two cpus and the number of requested trace pages is very large, the final number of trace pages + the offset will not fit into a short. As a result the variable offset in alloc_trace_bufs() will wrap while allocating buffers for the second cpu. Later share_xen_page_with_privileged_guests() will be called with a wrong page and the ASSERT in this function triggers. If the ASSERT is ignored by running a non-dbg hypervisor the asserts in xentrace itself trigger because "cons" is not aligned because the very last trace page for the second cpu is a random mfn. Thanks to Jan for the quick analysis. Signed-off-by: Olaf Hering Acked-by: George Dunlap --- xen/common/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/trace.c b/xen/common/trace.c index 08e5b20..506c498 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -133,7 +133,7 @@ static int calculate_tbuf_size(unsigned int pages, uint16_t t_info_first_offset) * The array of mfns for the highest cpu can start at the maximum value * mfn_offset can hold. So reduce the number of cpus and also the mfn_offset. */ - max_mfn_offset -= t_info_first_offset - 1; + max_mfn_offset -= t_info_first_offset; max_cpus--; if ( max_cpus ) max_mfn_offset /= max_cpus; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:25:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKp-0007Mf-Cr; Tue, 12 Mar 2013 11:25:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKn-0007M7-Na for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:33 +0000 Received: from [85.158.139.83:53551] by server-15.bemta-5.messagelabs.com id 25/4D-22815-CA01F315; Tue, 12 Mar 2013 11:25:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1363087531!21091803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25661 invoked from network); 12 Mar 2013 11:25:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKk-0007yS-O2 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKk-00066M-M5 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:30 +0000 Date: Tue, 12 Mar 2013 11:25:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: don't use PV LDT area for cross-pages access emulation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ada00228b18db21bc2fab5557b3a73be2bc47b4 Author: Jan Beulich AuthorDate: Tue Mar 5 08:51:10 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 5 08:51:10 2013 +0100 x86/shadow: don't use PV LDT area for cross-pages access emulation As of 703ac3a ("x86: introduce create_perdomain_mapping()"), the page tables for this range don't get set up anymore for non-PV guests. And the way this was done was marked as a hack rather than a proper mechanism anyway. Use vmap() instead. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 68f5505..a593f76 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4621,7 +4621,6 @@ static void *emulate_map_dest(struct vcpu *v, u32 bytes, struct sh_emulate_ctxt *sh_ctxt) { - unsigned long offset; void *map = NULL; sh_ctxt->mfn1 = emulate_gva_to_mfn(v, vaddr, sh_ctxt); @@ -4653,6 +4652,8 @@ static void *emulate_map_dest(struct vcpu *v, } else { + unsigned long mfns[2]; + /* Cross-page emulated writes are only supported for HVM guests; * PV guests ought to know better */ if ( !is_hvm_vcpu(v) ) @@ -4670,17 +4671,11 @@ static void *emulate_map_dest(struct vcpu *v, /* Cross-page writes mean probably not a pagetable */ sh_remove_shadows(v, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); - /* Hack: we map the pages into the vcpu's LDT space, since we - * know that we're not going to need the LDT for HVM guests, - * and only HVM guests are allowed unaligned writes. */ - ASSERT(is_hvm_vcpu(v)); - map = (void *)LDT_VIRT_START(v); - offset = l1_linear_offset((unsigned long) map); - l1e_write(&__linear_l1_table[offset], - l1e_from_pfn(mfn_x(sh_ctxt->mfn1), __PAGE_HYPERVISOR)); - l1e_write(&__linear_l1_table[offset + 1], - l1e_from_pfn(mfn_x(sh_ctxt->mfn2), __PAGE_HYPERVISOR)); - flush_tlb_local(); + mfns[0] = mfn_x(sh_ctxt->mfn1); + mfns[1] = mfn_x(sh_ctxt->mfn2); + map = vmap(mfns, 2); + if ( !map ) + return MAPPING_UNHANDLEABLE; map += (vaddr & ~PAGE_MASK); } @@ -4758,14 +4753,8 @@ static void emulate_unmap_dest(struct vcpu *v, if ( unlikely(mfn_valid(sh_ctxt->mfn2)) ) { - unsigned long offset; paging_mark_dirty(v->domain, mfn_x(sh_ctxt->mfn2)); - /* Undo the hacky two-frame contiguous map. */ - ASSERT(((unsigned long) addr & PAGE_MASK) == LDT_VIRT_START(v)); - offset = l1_linear_offset((unsigned long) addr); - l1e_write(&__linear_l1_table[offset], l1e_empty()); - l1e_write(&__linear_l1_table[offset + 1], l1e_empty()); - flush_tlb_all(); + vunmap((void *)((unsigned long)addr & PAGE_MASK)); } else sh_unmap_domain_page(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 Tue Mar 12 11:25:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNKp-0007Mf-Cr; Tue, 12 Mar 2013 11:25:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKn-0007M7-Na for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:33 +0000 Received: from [85.158.139.83:53551] by server-15.bemta-5.messagelabs.com id 25/4D-22815-CA01F315; Tue, 12 Mar 2013 11:25:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1363087531!21091803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25661 invoked from network); 12 Mar 2013 11:25:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKk-0007yS-O2 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKk-00066M-M5 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:30 +0000 Date: Tue, 12 Mar 2013 11:25:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: don't use PV LDT area for cross-pages access emulation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ada00228b18db21bc2fab5557b3a73be2bc47b4 Author: Jan Beulich AuthorDate: Tue Mar 5 08:51:10 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 5 08:51:10 2013 +0100 x86/shadow: don't use PV LDT area for cross-pages access emulation As of 703ac3a ("x86: introduce create_perdomain_mapping()"), the page tables for this range don't get set up anymore for non-PV guests. And the way this was done was marked as a hack rather than a proper mechanism anyway. Use vmap() instead. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 68f5505..a593f76 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4621,7 +4621,6 @@ static void *emulate_map_dest(struct vcpu *v, u32 bytes, struct sh_emulate_ctxt *sh_ctxt) { - unsigned long offset; void *map = NULL; sh_ctxt->mfn1 = emulate_gva_to_mfn(v, vaddr, sh_ctxt); @@ -4653,6 +4652,8 @@ static void *emulate_map_dest(struct vcpu *v, } else { + unsigned long mfns[2]; + /* Cross-page emulated writes are only supported for HVM guests; * PV guests ought to know better */ if ( !is_hvm_vcpu(v) ) @@ -4670,17 +4671,11 @@ static void *emulate_map_dest(struct vcpu *v, /* Cross-page writes mean probably not a pagetable */ sh_remove_shadows(v, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); - /* Hack: we map the pages into the vcpu's LDT space, since we - * know that we're not going to need the LDT for HVM guests, - * and only HVM guests are allowed unaligned writes. */ - ASSERT(is_hvm_vcpu(v)); - map = (void *)LDT_VIRT_START(v); - offset = l1_linear_offset((unsigned long) map); - l1e_write(&__linear_l1_table[offset], - l1e_from_pfn(mfn_x(sh_ctxt->mfn1), __PAGE_HYPERVISOR)); - l1e_write(&__linear_l1_table[offset + 1], - l1e_from_pfn(mfn_x(sh_ctxt->mfn2), __PAGE_HYPERVISOR)); - flush_tlb_local(); + mfns[0] = mfn_x(sh_ctxt->mfn1); + mfns[1] = mfn_x(sh_ctxt->mfn2); + map = vmap(mfns, 2); + if ( !map ) + return MAPPING_UNHANDLEABLE; map += (vaddr & ~PAGE_MASK); } @@ -4758,14 +4753,8 @@ static void emulate_unmap_dest(struct vcpu *v, if ( unlikely(mfn_valid(sh_ctxt->mfn2)) ) { - unsigned long offset; paging_mark_dirty(v->domain, mfn_x(sh_ctxt->mfn2)); - /* Undo the hacky two-frame contiguous map. */ - ASSERT(((unsigned long) addr & PAGE_MASK) == LDT_VIRT_START(v)); - offset = l1_linear_offset((unsigned long) addr); - l1e_write(&__linear_l1_table[offset], l1e_empty()); - l1e_write(&__linear_l1_table[offset + 1], l1e_empty()); - flush_tlb_all(); + vunmap((void *)((unsigned long)addr & PAGE_MASK)); } else sh_unmap_domain_page(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 Tue Mar 12 11:25:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNLB-0007Qy-Im; Tue, 12 Mar 2013 11:25:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNL9-0007QT-Lk for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:55 +0000 Received: from [85.158.143.99:54888] by server-1.bemta-4.messagelabs.com id CF/CB-06203-3C01F315; Tue, 12 Mar 2013 11:25:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087551!27742439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4422 invoked from network); 12 Mar 2013 11:25:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNL5-0007yi-4d for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNL5-000678-1s for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:51 +0000 Date: Tue, 12 Mar 2013 11:25:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix domain unlocking in some xsm error paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9581c4f9a55372a21e759cd449cb676d0e8feddb Author: Matthew Daley AuthorDate: Wed Mar 6 17:10:26 2013 +0100 Commit: Jan Beulich CommitDate: Wed Mar 6 17:10:26 2013 +0100 fix domain unlocking in some xsm error paths A couple of xsm error/access-denied code paths in hypercalls neglect to unlock a previously locked domain. Fix by ensuring the domains are unlocked correctly. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/physdev.c | 2 +- xen/common/grant_table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 134eb73..e8b4e76 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -111,7 +111,7 @@ int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, ret = xsm_map_domain_pirq(XSM_TARGET, d); if ( ret ) - return ret; + goto free_domain; /* Verify or get irq. */ switch ( type ) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 287714b..3f97328 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2283,7 +2283,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_t) uop, rc = xsm_grant_setup(XSM_TARGET, current->domain, d); if ( rc ) { op.status = GNTST_permission_denied; - goto out1; + goto out2; } gt = d->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 Tue Mar 12 11:25:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:25: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 1UFNLB-0007Qy-Im; Tue, 12 Mar 2013 11:25:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNL9-0007QT-Lk for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:55 +0000 Received: from [85.158.143.99:54888] by server-1.bemta-4.messagelabs.com id CF/CB-06203-3C01F315; Tue, 12 Mar 2013 11:25:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087551!27742439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4422 invoked from network); 12 Mar 2013 11:25:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNL5-0007yi-4d for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNL5-000678-1s for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:51 +0000 Date: Tue, 12 Mar 2013 11:25:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix domain unlocking in some xsm error paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9581c4f9a55372a21e759cd449cb676d0e8feddb Author: Matthew Daley AuthorDate: Wed Mar 6 17:10:26 2013 +0100 Commit: Jan Beulich CommitDate: Wed Mar 6 17:10:26 2013 +0100 fix domain unlocking in some xsm error paths A couple of xsm error/access-denied code paths in hypercalls neglect to unlock a previously locked domain. Fix by ensuring the domains are unlocked correctly. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/physdev.c | 2 +- xen/common/grant_table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 134eb73..e8b4e76 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -111,7 +111,7 @@ int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, ret = xsm_map_domain_pirq(XSM_TARGET, d); if ( ret ) - return ret; + goto free_domain; /* Verify or get irq. */ switch ( type ) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 287714b..3f97328 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2283,7 +2283,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_t) uop, rc = xsm_grant_setup(XSM_TARGET, current->domain, d); if ( rc ) { op.status = GNTST_permission_denied; - goto out1; + goto out2; } gt = d->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 Tue Mar 12 11:26:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLe-0007XK-8L; Tue, 12 Mar 2013 11:26:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLc-0007Wy-Uv for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:25 +0000 Received: from [85.158.143.99:58900] by server-3.bemta-4.messagelabs.com id 6B/00-02186-0E01F315; Tue, 12 Mar 2013 11:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363087429!27491834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27362 invoked from network); 12 Mar 2013 11:23:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:23:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJ6-0007vh-W7 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJ6-00061J-SW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:48 +0000 Date: Tue, 12 Mar 2013 11:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make certain memory sub-ops return valid values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ffc9779aa5120c5098d938cb88f69a1dda9a0fe Author: Jan Beulich AuthorDate: Mon Mar 4 10:16:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:16:04 2013 +0100 x86: make certain memory sub-ops return valid values When a domain's shared info field "max_pfn" is zero, domain_get_maximum_gpfn() so far returned ULONG_MAX, which do_memory_op() in turn converted to -1 (i.e. -EPERM). Make the former always return a sensible number (i.e. zero if the field was zero) and have the latter no longer truncate return values. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm.c | 2 +- xen/common/compat/memory.c | 11 +++++++++-- xen/common/memory.c | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 7d5c25b..d00d9a2 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -433,7 +433,7 @@ unsigned long domain_get_maximum_gpfn(struct domain *d) if ( is_hvm_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ - return arch_get_max_pfn(d) - 1; + return (arch_get_max_pfn(d) ?: 1) - 1; } void share_xen_page_with_guest( diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index caa24cc..ba7e6eb 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -15,7 +15,8 @@ CHECK_TYPE(domid); int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) { - int rc, split, op = cmd & MEMOP_CMD_MASK; + int split, op = cmd & MEMOP_CMD_MASK; + long rc; unsigned int start_extent = cmd >> MEMOP_EXTENT_SHIFT; do @@ -204,7 +205,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) rc = do_memory_op(cmd, nat.hnd); if ( rc < 0 ) - return rc; + break; cmd = 0; if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) @@ -326,5 +327,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) __HYPERVISOR_memory_op, "ih", cmd, compat); } while ( split > 0 ); + if ( unlikely(rc > INT_MAX) ) + return INT_MAX; + + if ( unlikely(rc < INT_MIN) ) + return INT_MIN; + return rc; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 08550ef..3cf9e6c 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -545,14 +545,13 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d; - int rc, op; + long rc; unsigned int address_bits; unsigned long start_extent; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; - - op = cmd & MEMOP_CMD_MASK; + int op = cmd & MEMOP_CMD_MASK; switch ( op ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLe-0007XK-8L; Tue, 12 Mar 2013 11:26:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLc-0007Wy-Uv for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:25 +0000 Received: from [85.158.143.99:58900] by server-3.bemta-4.messagelabs.com id 6B/00-02186-0E01F315; Tue, 12 Mar 2013 11:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363087429!27491834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27362 invoked from network); 12 Mar 2013 11:23:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:23:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNJ6-0007vh-W7 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNJ6-00061J-SW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:23:48 +0000 Date: Tue, 12 Mar 2013 11:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make certain memory sub-ops return valid values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ffc9779aa5120c5098d938cb88f69a1dda9a0fe Author: Jan Beulich AuthorDate: Mon Mar 4 10:16:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 4 10:16:04 2013 +0100 x86: make certain memory sub-ops return valid values When a domain's shared info field "max_pfn" is zero, domain_get_maximum_gpfn() so far returned ULONG_MAX, which do_memory_op() in turn converted to -1 (i.e. -EPERM). Make the former always return a sensible number (i.e. zero if the field was zero) and have the latter no longer truncate return values. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm.c | 2 +- xen/common/compat/memory.c | 11 +++++++++-- xen/common/memory.c | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 7d5c25b..d00d9a2 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -433,7 +433,7 @@ unsigned long domain_get_maximum_gpfn(struct domain *d) if ( is_hvm_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ - return arch_get_max_pfn(d) - 1; + return (arch_get_max_pfn(d) ?: 1) - 1; } void share_xen_page_with_guest( diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index caa24cc..ba7e6eb 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -15,7 +15,8 @@ CHECK_TYPE(domid); int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) { - int rc, split, op = cmd & MEMOP_CMD_MASK; + int split, op = cmd & MEMOP_CMD_MASK; + long rc; unsigned int start_extent = cmd >> MEMOP_EXTENT_SHIFT; do @@ -204,7 +205,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) rc = do_memory_op(cmd, nat.hnd); if ( rc < 0 ) - return rc; + break; cmd = 0; if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) @@ -326,5 +327,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) __HYPERVISOR_memory_op, "ih", cmd, compat); } while ( split > 0 ); + if ( unlikely(rc > INT_MAX) ) + return INT_MAX; + + if ( unlikely(rc < INT_MIN) ) + return INT_MIN; + return rc; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 08550ef..3cf9e6c 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -545,14 +545,13 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d; - int rc, op; + long rc; unsigned int address_bits; unsigned long start_extent; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; - - op = cmd & MEMOP_CMD_MASK; + int op = cmd & MEMOP_CMD_MASK; switch ( op ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLe-0007XS-B7; Tue, 12 Mar 2013 11:26:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLd-0007X0-3Y for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:25 +0000 Received: from [85.158.138.51:42802] by server-4.bemta-3.messagelabs.com id E1/E8-21470-0E01F315; Tue, 12 Mar 2013 11:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1363087581!27392096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1200 invoked from network); 12 Mar 2013 11:26:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLZ-0007zd-NP for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLZ-00068I-Ls for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:21 +0000 Date: Tue, 12 Mar 2013 11:26:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4245d331e0e75de8d1bddbbb518f3a8ce6d0bb7e Author: Jan Beulich AuthorDate: Fri Mar 8 14:05:34 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:05:34 2013 +0100 x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses This adds two new physdev operations for Dom0 to invoke when resource allocation for devices is known to be complete, so that the hypervisor can arrange for the respective MMIO ranges to be marked read-only before an eventual guest getting such a device assigned even gets started, such that it won't be able to set up writable mappings for these MMIO ranges before Xen has a chance to protect them. This also addresses another issue with the code being modified here, in that so far write protection for the address ranges in question got set up only once during the lifetime of a device (i.e. until either system shutdown or device hot removal), while teardown happened when the last interrupt was disposed of by the guest (which at least allowed the tables to be writable when the device got assigned to a second guest [instance] after the first terminated). Signed-off-by: Jan Beulich --- xen/arch/x86/msi.c | 202 +++++++++++++++++++++++++++-------------- xen/arch/x86/physdev.c | 12 +++ xen/include/asm-x86/msi.h | 1 + xen/include/public/physdev.h | 6 ++ xen/include/xen/pci.h | 1 + 5 files changed, 153 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 09e081f..8804306 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -659,8 +659,8 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) * @entries: pointer to an array of struct msix_entry entries * @nvec: number of @entries * - * Setup the MSI-X capability structure of device function with a - * single MSI-X irq. A return of zero indicates the successful setup of + * Setup the MSI-X capability structure of device function with the requested + * number MSI-X irqs. A return of zero indicates the successful setup of * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, @@ -668,86 +668,69 @@ static int msix_capability_init(struct pci_dev *dev, struct msi_desc **desc, unsigned int nr_entries) { - struct msi_desc *entry; - int pos; + struct msi_desc *entry = NULL; + int pos, vf; u16 control; - u64 table_paddr, entry_paddr; - u32 table_offset, entry_offset; - u8 bir; - void __iomem *base; - int idx; + u64 table_paddr; + u32 table_offset; + u8 bir, pbus, pslot, pfunc; u16 seg = dev->seg; u8 bus = dev->bus; u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); ASSERT(spin_is_locked(&pcidevs_lock)); - ASSERT(desc); 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 */ - /* MSI-X Table Initialization */ - entry = alloc_msi_entry(); - if ( !entry ) - return -ENOMEM; + if ( desc ) + { + entry = alloc_msi_entry(); + if ( !entry ) + return -ENOMEM; + ASSERT(msi); + } - /* Request & Map MSI-X table region */ + /* Locate MSI-X table region */ table_offset = pci_conf_read32(seg, bus, slot, func, msix_table_offset_reg(pos)); bir = (u8)(table_offset & PCI_MSIX_BIRMASK); table_offset &= ~PCI_MSIX_BIRMASK; - entry_offset = msi->entry_nr * PCI_MSIX_ENTRY_SIZE; - table_paddr = msi->table_base + table_offset; - entry_paddr = table_paddr + entry_offset; - idx = msix_get_fixmap(dev, table_paddr, entry_paddr); - if ( idx < 0 ) + if ( !dev->info.is_virtfn ) { - xfree(entry); - return idx; + pbus = bus; + pslot = slot; + pfunc = func; + vf = -1; } - base = (void *)(fix_to_virt(idx) + - ((unsigned long)entry_paddr & ((1UL << PAGE_SHIFT) - 1))); - - entry->msi_attrib.type = PCI_CAP_ID_MSIX; - 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.pos = pos; - entry->irq = msi->irq; - entry->dev = dev; - entry->mask_base = base; - - list_add_tail(&entry->list, &dev->msi_list); - - if ( !dev->msix_nr_entries ) + else { - u8 pbus, pslot, pfunc; - int vf; - u64 pba_paddr; - u32 pba_offset; + pbus = dev->info.physfn.bus; + pslot = PCI_SLOT(dev->info.physfn.devfn); + pfunc = PCI_FUNC(dev->info.physfn.devfn); + vf = PCI_BDF2(dev->bus, dev->devfn); + } - if ( !dev->info.is_virtfn ) - { - pbus = bus; - pslot = slot; - pfunc = func; - vf = -1; - } - else + table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf); + WARN_ON(msi && msi->table_base != table_paddr); + if ( !table_paddr ) + { + if ( !msi || !msi->table_base ) { - pbus = dev->info.physfn.bus; - pslot = PCI_SLOT(dev->info.physfn.devfn); - pfunc = PCI_FUNC(dev->info.physfn.devfn); - vf = PCI_BDF2(dev->bus, dev->devfn); + xfree(entry); + return -ENXIO; } + table_paddr = msi->table_base; + } + table_paddr += table_offset; - ASSERT(!dev->msix_used_entries); - WARN_ON(msi->table_base != - read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf)); + if ( !dev->msix_used_entries ) + { + u64 pba_paddr; + u32 pba_offset; dev->msix_nr_entries = nr_entries; dev->msix_table.first = PFN_DOWN(table_paddr); @@ -768,7 +751,42 @@ static int msix_capability_init(struct pci_dev *dev, BITS_TO_LONGS(nr_entries) - 1); WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, dev->msix_pba.first, dev->msix_pba.last)); + } + if ( entry ) + { + /* Map MSI-X table region */ + u64 entry_paddr = table_paddr + msi->entry_nr * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(dev, table_paddr, entry_paddr); + void __iomem *base; + + if ( idx < 0 ) + { + xfree(entry); + return idx; + } + base = (void *)(fix_to_virt(idx) + + ((unsigned long)entry_paddr & (PAGE_SIZE - 1))); + + /* Mask interrupt here */ + writel(1, base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); + + entry->msi_attrib.type = PCI_CAP_ID_MSIX; + 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.pos = pos; + entry->irq = msi->irq; + entry->dev = dev; + entry->mask_base = base; + + list_add_tail(&entry->list, &dev->msi_list); + *desc = entry; + } + + if ( !dev->msix_used_entries ) + { if ( rangeset_add_range(mmio_ro_ranges, dev->msix_table.first, dev->msix_table.last) ) WARN(); @@ -779,7 +797,7 @@ static int msix_capability_init(struct pci_dev *dev, if ( dev->domain ) p2m_change_entry_type_global(dev->domain, p2m_mmio_direct, p2m_mmio_direct); - if ( !dev->domain || !paging_mode_translate(dev->domain) ) + if ( desc && (!dev->domain || !paging_mode_translate(dev->domain)) ) { struct domain *d = dev->domain; @@ -793,6 +811,13 @@ static int msix_capability_init(struct pci_dev *dev, break; if ( d ) { + if ( !IS_PRIV(d) && dev->msix_warned != d->domain_id ) + { + dev->msix_warned = d->domain_id; + printk(XENLOG_ERR + "Potentially insecure use of MSI-X on %04x:%02x:%02x.%u by Dom%d\n", + seg, bus, slot, func, d->domain_id); + } /* XXX How to deal with existing mappings? */ } } @@ -801,10 +826,6 @@ static int msix_capability_init(struct pci_dev *dev, WARN_ON(dev->msix_table.first != (table_paddr >> PAGE_SHIFT)); ++dev->msix_used_entries; - /* Mask interrupt here */ - writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); - - *desc = entry; /* Restore MSI-X enabled bits */ pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); @@ -929,6 +950,19 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) return status; } +static void _pci_cleanup_msix(struct pci_dev *dev) +{ + if ( !--dev->msix_used_entries ) + { + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, + dev->msix_table.last) ) + WARN(); + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, + dev->msix_pba.last) ) + WARN(); + } +} + static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev; @@ -952,15 +986,45 @@ static void __pci_disable_msix(struct msi_desc *entry) pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); - if ( !--dev->msix_used_entries ) + _pci_cleanup_msix(dev); +} + +int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off) +{ + int rc; + struct pci_dev *pdev; + u8 slot = PCI_SLOT(devfn), func = PCI_FUNC(devfn); + unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, + PCI_CAP_ID_MSIX); + + if ( !use_msi ) + return 0; + + if ( !pos ) + return -ENODEV; + + spin_lock(&pcidevs_lock); + pdev = pci_get_pdev(seg, bus, devfn); + if ( !pdev ) + rc = -ENODEV; + else if ( pdev->msix_used_entries != !!off ) + rc = -EBUSY; + else if ( off ) { - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, - dev->msix_table.last) ) - WARN(); - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, - dev->msix_pba.last) ) - WARN(); + _pci_cleanup_msix(pdev); + rc = 0; } + else + { + u16 control = pci_conf_read16(seg, bus, slot, func, + msix_control_reg(pos)); + + rc = msix_capability_init(pdev, NULL, NULL, + multi_msix_capable(control)); + } + spin_unlock(&pcidevs_lock); + + return rc; } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index e8b4e76..876ac9d 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -579,6 +579,18 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } + case PHYSDEVOP_prepare_msix: + case PHYSDEVOP_release_msix: { + struct physdev_pci_device dev; + + if ( copy_from_guest(&dev, arg, 1) ) + ret = -EFAULT; + else + ret = pci_prepare_msix(dev.seg, dev.bus, dev.devfn, + cmd != PHYSDEVOP_prepare_msix); + break; + } + case PHYSDEVOP_pci_mmcfg_reserved: { struct physdev_pci_mmcfg_reserved info; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index e8e2b31..6fe67dc 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -76,6 +76,7 @@ struct msi_desc; /* Helper functions */ extern int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc); extern void pci_disable_msi(struct msi_desc *desc); +extern int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off); extern void pci_cleanup_msi(struct pci_dev *pdev); extern void setup_msi_handler(struct irq_desc *, struct msi_desc *); extern void setup_msi_irq(struct irq_desc *); diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index f5e237b..db7e37a 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -303,6 +303,12 @@ DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_add_t); #define PHYSDEVOP_pci_device_remove 26 #define PHYSDEVOP_restore_msi_ext 27 +/* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 struct physdev_pci_device { /* IN */ uint16_t seg; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 9724bb2..ca72a99 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -57,6 +57,7 @@ struct pci_dev { int msix_table_refcnt[MAX_MSIX_TABLE_PAGES]; int msix_table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t msix_table_lock; + domid_t msix_warned; struct domain *domain; const u16 seg; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLe-0007XS-B7; Tue, 12 Mar 2013 11:26:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLd-0007X0-3Y for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:25 +0000 Received: from [85.158.138.51:42802] by server-4.bemta-3.messagelabs.com id E1/E8-21470-0E01F315; Tue, 12 Mar 2013 11:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1363087581!27392096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1200 invoked from network); 12 Mar 2013 11:26:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLZ-0007zd-NP for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLZ-00068I-Ls for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:21 +0000 Date: Tue, 12 Mar 2013 11:26:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4245d331e0e75de8d1bddbbb518f3a8ce6d0bb7e Author: Jan Beulich AuthorDate: Fri Mar 8 14:05:34 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:05:34 2013 +0100 x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses This adds two new physdev operations for Dom0 to invoke when resource allocation for devices is known to be complete, so that the hypervisor can arrange for the respective MMIO ranges to be marked read-only before an eventual guest getting such a device assigned even gets started, such that it won't be able to set up writable mappings for these MMIO ranges before Xen has a chance to protect them. This also addresses another issue with the code being modified here, in that so far write protection for the address ranges in question got set up only once during the lifetime of a device (i.e. until either system shutdown or device hot removal), while teardown happened when the last interrupt was disposed of by the guest (which at least allowed the tables to be writable when the device got assigned to a second guest [instance] after the first terminated). Signed-off-by: Jan Beulich --- xen/arch/x86/msi.c | 202 +++++++++++++++++++++++++++-------------- xen/arch/x86/physdev.c | 12 +++ xen/include/asm-x86/msi.h | 1 + xen/include/public/physdev.h | 6 ++ xen/include/xen/pci.h | 1 + 5 files changed, 153 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 09e081f..8804306 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -659,8 +659,8 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) * @entries: pointer to an array of struct msix_entry entries * @nvec: number of @entries * - * Setup the MSI-X capability structure of device function with a - * single MSI-X irq. A return of zero indicates the successful setup of + * Setup the MSI-X capability structure of device function with the requested + * number MSI-X irqs. A return of zero indicates the successful setup of * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, @@ -668,86 +668,69 @@ static int msix_capability_init(struct pci_dev *dev, struct msi_desc **desc, unsigned int nr_entries) { - struct msi_desc *entry; - int pos; + struct msi_desc *entry = NULL; + int pos, vf; u16 control; - u64 table_paddr, entry_paddr; - u32 table_offset, entry_offset; - u8 bir; - void __iomem *base; - int idx; + u64 table_paddr; + u32 table_offset; + u8 bir, pbus, pslot, pfunc; u16 seg = dev->seg; u8 bus = dev->bus; u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); ASSERT(spin_is_locked(&pcidevs_lock)); - ASSERT(desc); 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 */ - /* MSI-X Table Initialization */ - entry = alloc_msi_entry(); - if ( !entry ) - return -ENOMEM; + if ( desc ) + { + entry = alloc_msi_entry(); + if ( !entry ) + return -ENOMEM; + ASSERT(msi); + } - /* Request & Map MSI-X table region */ + /* Locate MSI-X table region */ table_offset = pci_conf_read32(seg, bus, slot, func, msix_table_offset_reg(pos)); bir = (u8)(table_offset & PCI_MSIX_BIRMASK); table_offset &= ~PCI_MSIX_BIRMASK; - entry_offset = msi->entry_nr * PCI_MSIX_ENTRY_SIZE; - table_paddr = msi->table_base + table_offset; - entry_paddr = table_paddr + entry_offset; - idx = msix_get_fixmap(dev, table_paddr, entry_paddr); - if ( idx < 0 ) + if ( !dev->info.is_virtfn ) { - xfree(entry); - return idx; + pbus = bus; + pslot = slot; + pfunc = func; + vf = -1; } - base = (void *)(fix_to_virt(idx) + - ((unsigned long)entry_paddr & ((1UL << PAGE_SHIFT) - 1))); - - entry->msi_attrib.type = PCI_CAP_ID_MSIX; - 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.pos = pos; - entry->irq = msi->irq; - entry->dev = dev; - entry->mask_base = base; - - list_add_tail(&entry->list, &dev->msi_list); - - if ( !dev->msix_nr_entries ) + else { - u8 pbus, pslot, pfunc; - int vf; - u64 pba_paddr; - u32 pba_offset; + pbus = dev->info.physfn.bus; + pslot = PCI_SLOT(dev->info.physfn.devfn); + pfunc = PCI_FUNC(dev->info.physfn.devfn); + vf = PCI_BDF2(dev->bus, dev->devfn); + } - if ( !dev->info.is_virtfn ) - { - pbus = bus; - pslot = slot; - pfunc = func; - vf = -1; - } - else + table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf); + WARN_ON(msi && msi->table_base != table_paddr); + if ( !table_paddr ) + { + if ( !msi || !msi->table_base ) { - pbus = dev->info.physfn.bus; - pslot = PCI_SLOT(dev->info.physfn.devfn); - pfunc = PCI_FUNC(dev->info.physfn.devfn); - vf = PCI_BDF2(dev->bus, dev->devfn); + xfree(entry); + return -ENXIO; } + table_paddr = msi->table_base; + } + table_paddr += table_offset; - ASSERT(!dev->msix_used_entries); - WARN_ON(msi->table_base != - read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf)); + if ( !dev->msix_used_entries ) + { + u64 pba_paddr; + u32 pba_offset; dev->msix_nr_entries = nr_entries; dev->msix_table.first = PFN_DOWN(table_paddr); @@ -768,7 +751,42 @@ static int msix_capability_init(struct pci_dev *dev, BITS_TO_LONGS(nr_entries) - 1); WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, dev->msix_pba.first, dev->msix_pba.last)); + } + if ( entry ) + { + /* Map MSI-X table region */ + u64 entry_paddr = table_paddr + msi->entry_nr * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(dev, table_paddr, entry_paddr); + void __iomem *base; + + if ( idx < 0 ) + { + xfree(entry); + return idx; + } + base = (void *)(fix_to_virt(idx) + + ((unsigned long)entry_paddr & (PAGE_SIZE - 1))); + + /* Mask interrupt here */ + writel(1, base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); + + entry->msi_attrib.type = PCI_CAP_ID_MSIX; + 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.pos = pos; + entry->irq = msi->irq; + entry->dev = dev; + entry->mask_base = base; + + list_add_tail(&entry->list, &dev->msi_list); + *desc = entry; + } + + if ( !dev->msix_used_entries ) + { if ( rangeset_add_range(mmio_ro_ranges, dev->msix_table.first, dev->msix_table.last) ) WARN(); @@ -779,7 +797,7 @@ static int msix_capability_init(struct pci_dev *dev, if ( dev->domain ) p2m_change_entry_type_global(dev->domain, p2m_mmio_direct, p2m_mmio_direct); - if ( !dev->domain || !paging_mode_translate(dev->domain) ) + if ( desc && (!dev->domain || !paging_mode_translate(dev->domain)) ) { struct domain *d = dev->domain; @@ -793,6 +811,13 @@ static int msix_capability_init(struct pci_dev *dev, break; if ( d ) { + if ( !IS_PRIV(d) && dev->msix_warned != d->domain_id ) + { + dev->msix_warned = d->domain_id; + printk(XENLOG_ERR + "Potentially insecure use of MSI-X on %04x:%02x:%02x.%u by Dom%d\n", + seg, bus, slot, func, d->domain_id); + } /* XXX How to deal with existing mappings? */ } } @@ -801,10 +826,6 @@ static int msix_capability_init(struct pci_dev *dev, WARN_ON(dev->msix_table.first != (table_paddr >> PAGE_SHIFT)); ++dev->msix_used_entries; - /* Mask interrupt here */ - writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); - - *desc = entry; /* Restore MSI-X enabled bits */ pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); @@ -929,6 +950,19 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) return status; } +static void _pci_cleanup_msix(struct pci_dev *dev) +{ + if ( !--dev->msix_used_entries ) + { + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, + dev->msix_table.last) ) + WARN(); + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, + dev->msix_pba.last) ) + WARN(); + } +} + static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev; @@ -952,15 +986,45 @@ static void __pci_disable_msix(struct msi_desc *entry) pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); - if ( !--dev->msix_used_entries ) + _pci_cleanup_msix(dev); +} + +int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off) +{ + int rc; + struct pci_dev *pdev; + u8 slot = PCI_SLOT(devfn), func = PCI_FUNC(devfn); + unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, + PCI_CAP_ID_MSIX); + + if ( !use_msi ) + return 0; + + if ( !pos ) + return -ENODEV; + + spin_lock(&pcidevs_lock); + pdev = pci_get_pdev(seg, bus, devfn); + if ( !pdev ) + rc = -ENODEV; + else if ( pdev->msix_used_entries != !!off ) + rc = -EBUSY; + else if ( off ) { - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, - dev->msix_table.last) ) - WARN(); - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, - dev->msix_pba.last) ) - WARN(); + _pci_cleanup_msix(pdev); + rc = 0; } + else + { + u16 control = pci_conf_read16(seg, bus, slot, func, + msix_control_reg(pos)); + + rc = msix_capability_init(pdev, NULL, NULL, + multi_msix_capable(control)); + } + spin_unlock(&pcidevs_lock); + + return rc; } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index e8b4e76..876ac9d 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -579,6 +579,18 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } + case PHYSDEVOP_prepare_msix: + case PHYSDEVOP_release_msix: { + struct physdev_pci_device dev; + + if ( copy_from_guest(&dev, arg, 1) ) + ret = -EFAULT; + else + ret = pci_prepare_msix(dev.seg, dev.bus, dev.devfn, + cmd != PHYSDEVOP_prepare_msix); + break; + } + case PHYSDEVOP_pci_mmcfg_reserved: { struct physdev_pci_mmcfg_reserved info; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index e8e2b31..6fe67dc 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -76,6 +76,7 @@ struct msi_desc; /* Helper functions */ extern int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc); extern void pci_disable_msi(struct msi_desc *desc); +extern int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off); extern void pci_cleanup_msi(struct pci_dev *pdev); extern void setup_msi_handler(struct irq_desc *, struct msi_desc *); extern void setup_msi_irq(struct irq_desc *); diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index f5e237b..db7e37a 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -303,6 +303,12 @@ DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_add_t); #define PHYSDEVOP_pci_device_remove 26 #define PHYSDEVOP_restore_msi_ext 27 +/* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 struct physdev_pci_device { /* IN */ uint16_t seg; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 9724bb2..ca72a99 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -57,6 +57,7 @@ struct pci_dev { int msix_table_refcnt[MAX_MSIX_TABLE_PAGES]; int msix_table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t msix_table_lock; + domid_t msix_warned; struct domain *domain; const u16 seg; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLf-0007YM-Dq; Tue, 12 Mar 2013 11:26:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLe-0007XQ-OT for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:26 +0000 Received: from [85.158.143.99:59235] by server-1.bemta-4.messagelabs.com id 46/5C-06203-2E01F315; Tue, 12 Mar 2013 11:26:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1363087541!22841862!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23804 invoked from network); 12 Mar 2013 11:25:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKu-0007yc-Tr for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKu-00066m-Rh for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:40 +0000 Date: Tue, 12 Mar 2013 11:25:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] change arguments of do_kexec_op and compat_set_timer_op prototypes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17b65c793ca5e924f355d433945d868b4427ea12 Author: Robbie VanVossen AuthorDate: Wed Mar 6 17:08:08 2013 +0100 Commit: Jan Beulich CommitDate: Wed Mar 6 17:08:08 2013 +0100 change arguments of do_kexec_op and compat_set_timer_op prototypes ... to match the actual functions. Signed-off-by: Robbie VanVossen Also make sure the source files defining these symbols include the header declaring them (had we done so, the problem would have been noticed long ago). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/kexec.c | 1 + xen/common/schedule.c | 1 + xen/include/xen/hypercall.h | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 7b04c1c..1ba8556 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/schedule.c b/xen/common/schedule.c index de11110..5f677c3 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 7c3d719..a9e5229 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -126,8 +126,7 @@ do_hvm_op( extern long do_kexec_op( unsigned long op, - int arg1, - XEN_GUEST_HANDLE_PARAM(void) arg); + XEN_GUEST_HANDLE_PARAM(void) uarg); extern long do_xsm_op( @@ -174,7 +173,8 @@ compat_sched_op( extern int compat_set_timer_op( - s_time_t timeout); + u32 lo, + s32 hi); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLf-0007YM-Dq; Tue, 12 Mar 2013 11:26:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLe-0007XQ-OT for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:26 +0000 Received: from [85.158.143.99:59235] by server-1.bemta-4.messagelabs.com id 46/5C-06203-2E01F315; Tue, 12 Mar 2013 11:26:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1363087541!22841862!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23804 invoked from network); 12 Mar 2013 11:25:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:25:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNKu-0007yc-Tr for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNKu-00066m-Rh for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:25:40 +0000 Date: Tue, 12 Mar 2013 11:25:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] change arguments of do_kexec_op and compat_set_timer_op prototypes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17b65c793ca5e924f355d433945d868b4427ea12 Author: Robbie VanVossen AuthorDate: Wed Mar 6 17:08:08 2013 +0100 Commit: Jan Beulich CommitDate: Wed Mar 6 17:08:08 2013 +0100 change arguments of do_kexec_op and compat_set_timer_op prototypes ... to match the actual functions. Signed-off-by: Robbie VanVossen Also make sure the source files defining these symbols include the header declaring them (had we done so, the problem would have been noticed long ago). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/kexec.c | 1 + xen/common/schedule.c | 1 + xen/include/xen/hypercall.h | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 7b04c1c..1ba8556 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/schedule.c b/xen/common/schedule.c index de11110..5f677c3 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 7c3d719..a9e5229 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -126,8 +126,7 @@ do_hvm_op( extern long do_kexec_op( unsigned long op, - int arg1, - XEN_GUEST_HANDLE_PARAM(void) arg); + XEN_GUEST_HANDLE_PARAM(void) uarg); extern long do_xsm_op( @@ -174,7 +173,8 @@ compat_sched_op( extern int compat_set_timer_op( - s_time_t timeout); + u32 lo, + s32 hi); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLj-0007Zh-Gg; Tue, 12 Mar 2013 11:26:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLi-0007ZK-QI for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:31 +0000 Received: from [85.158.139.211:65478] by server-14.bemta-5.messagelabs.com id D0/D8-13158-6E01F315; Tue, 12 Mar 2013 11:26:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1363087561!19185766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8611 invoked from network); 12 Mar 2013 11:26:03 -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; 12 Mar 2013 11:26:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLF-0007zI-Bh for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLF-00067V-7s for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:01 +0000 Date: Tue, 12 Mar 2013 11:26:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Initialise pointers before trying to use them X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e31d4781c0e04bec01135dea0cb7d634ee035cd3 Author: Andrew Cooper AuthorDate: Thu Mar 7 16:20:50 2013 +0000 Commit: Ian Jackson CommitDate: Thu Mar 7 17:53:55 2013 +0000 tools/xenconsoled: Initialise pointers before trying to use them This is a regression introduced by "Switch from select() to poll() in xenconsoled's IO loop." hg c/s 26405:7359c3122c5d git cc5434c933153c4b8812d1df901f8915c22830a8 which results in reliable segfaults during VM power operations. Switch to calloc(3) in an effort to avoid similar problems with changes in the future. Signed-off-by: Marcus Granado Signed-off-by: Andrew Cooper --- tools/console/daemon/io.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 176ac3c..50f91b5 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -651,7 +651,7 @@ static struct domain *create_domain(int domid) return NULL; } - dom = (struct domain *)malloc(sizeof(struct domain)); + dom = calloc(1, sizeof *dom); if (dom == NULL) { dolog(LOG_ERR, "Out of memory %s:%s():L%d", __FILE__, __FUNCTION__, __LINE__); @@ -672,21 +672,11 @@ static struct domain *create_domain(int domid) dom->slave_fd = -1; dom->log_fd = -1; - dom->is_dead = false; - dom->buffer.data = 0; - dom->buffer.consumed = 0; - dom->buffer.size = 0; - dom->buffer.capacity = 0; - dom->buffer.max_capacity = 0; - dom->event_count = 0; dom->next_period = ((long long)ts.tv_sec * 1000) + (ts.tv_nsec / 1000000) + RATE_LIMIT_PERIOD; - dom->next = NULL; dom->ring_ref = -1; dom->local_port = -1; dom->remote_port = -1; - dom->interface = NULL; - dom->xce_handle = NULL; if (!watch_domain(dom, true)) 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 Tue Mar 12 11:26:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLj-0007Zh-Gg; Tue, 12 Mar 2013 11:26:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLi-0007ZK-QI for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:31 +0000 Received: from [85.158.139.211:65478] by server-14.bemta-5.messagelabs.com id D0/D8-13158-6E01F315; Tue, 12 Mar 2013 11:26:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1363087561!19185766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8611 invoked from network); 12 Mar 2013 11:26:03 -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; 12 Mar 2013 11:26:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLF-0007zI-Bh for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLF-00067V-7s for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:01 +0000 Date: Tue, 12 Mar 2013 11:26:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Initialise pointers before trying to use them X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e31d4781c0e04bec01135dea0cb7d634ee035cd3 Author: Andrew Cooper AuthorDate: Thu Mar 7 16:20:50 2013 +0000 Commit: Ian Jackson CommitDate: Thu Mar 7 17:53:55 2013 +0000 tools/xenconsoled: Initialise pointers before trying to use them This is a regression introduced by "Switch from select() to poll() in xenconsoled's IO loop." hg c/s 26405:7359c3122c5d git cc5434c933153c4b8812d1df901f8915c22830a8 which results in reliable segfaults during VM power operations. Switch to calloc(3) in an effort to avoid similar problems with changes in the future. Signed-off-by: Marcus Granado Signed-off-by: Andrew Cooper --- tools/console/daemon/io.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 176ac3c..50f91b5 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -651,7 +651,7 @@ static struct domain *create_domain(int domid) return NULL; } - dom = (struct domain *)malloc(sizeof(struct domain)); + dom = calloc(1, sizeof *dom); if (dom == NULL) { dolog(LOG_ERR, "Out of memory %s:%s():L%d", __FILE__, __FUNCTION__, __LINE__); @@ -672,21 +672,11 @@ static struct domain *create_domain(int domid) dom->slave_fd = -1; dom->log_fd = -1; - dom->is_dead = false; - dom->buffer.data = 0; - dom->buffer.consumed = 0; - dom->buffer.size = 0; - dom->buffer.capacity = 0; - dom->buffer.max_capacity = 0; - dom->event_count = 0; dom->next_period = ((long long)ts.tv_sec * 1000) + (ts.tv_nsec / 1000000) + RATE_LIMIT_PERIOD; - dom->next = NULL; dom->ring_ref = -1; dom->local_port = -1; dom->remote_port = -1; - dom->interface = NULL; - dom->xce_handle = NULL; if (!watch_domain(dom, true)) 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 Tue Mar 12 11:26:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLo-0007bS-Le; Tue, 12 Mar 2013 11:26:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLn-0007b1-KC for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:35 +0000 Received: from [85.158.143.99:60177] by server-3.bemta-4.messagelabs.com id 31/60-02186-BE01F315; Tue, 12 Mar 2013 11:26:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1363087571!18278623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2934 invoked from network); 12 Mar 2013 11:26:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLP-0007zW-IT for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLP-00067t-GU for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:11 +0000 Date: Tue, 12 Mar 2013 11:26:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: always ask the scheduler to re-place the vcpu when the affinity 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 0f3b02d07e12b76c568ce82d7ec6bf80fdf3870f Author: George Dunlap AuthorDate: Fri Mar 8 09:43:40 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 09:43:40 2013 +0100 sched: always ask the scheduler to re-place the vcpu when the affinity changes It's probably a good idea to re-evaluate placement whenever the affinity changes. This additionally has the benefit of removing scheduler-specific exceptions introduced in git c/s e6a6fd63. The conditionals surrounding vcpu_migrate() are left pending a re-work of the logic to avoid the common case calling vcpu_migrate() twice (once here, and once in context_saved(). Signed-off-by: George Dunlap --- xen/common/schedule.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 5f677c3..83fae4c 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -614,9 +614,10 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); - if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || - !cpumask_test_cpu(v->processor, v->cpu_affinity) ) - set_bit(_VPF_migrating, &v->pause_flags); + + /* Always ask the scheduler to re-evaluate placement + * when changing the affinity */ + set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNLo-0007bS-Le; Tue, 12 Mar 2013 11:26:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLn-0007b1-KC for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:35 +0000 Received: from [85.158.143.99:60177] by server-3.bemta-4.messagelabs.com id 31/60-02186-BE01F315; Tue, 12 Mar 2013 11:26:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1363087571!18278623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2934 invoked from network); 12 Mar 2013 11:26:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLP-0007zW-IT for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLP-00067t-GU for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:11 +0000 Date: Tue, 12 Mar 2013 11:26:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: always ask the scheduler to re-place the vcpu when the affinity 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 0f3b02d07e12b76c568ce82d7ec6bf80fdf3870f Author: George Dunlap AuthorDate: Fri Mar 8 09:43:40 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 09:43:40 2013 +0100 sched: always ask the scheduler to re-place the vcpu when the affinity changes It's probably a good idea to re-evaluate placement whenever the affinity changes. This additionally has the benefit of removing scheduler-specific exceptions introduced in git c/s e6a6fd63. The conditionals surrounding vcpu_migrate() are left pending a re-work of the logic to avoid the common case calling vcpu_migrate() twice (once here, and once in context_saved(). Signed-off-by: George Dunlap --- xen/common/schedule.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 5f677c3..83fae4c 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -614,9 +614,10 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); - if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || - !cpumask_test_cpu(v->processor, v->cpu_affinity) ) - set_bit(_VPF_migrating, &v->pause_flags); + + /* Always ask the scheduler to re-evaluate placement + * when changing the affinity */ + set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNM7-0007gA-P3; Tue, 12 Mar 2013 11:26:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNM6-0007fm-Jm for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:54 +0000 Received: from [85.158.143.99:63914] by server-1.bemta-4.messagelabs.com id B6/0D-06203-DF01F315; Tue, 12 Mar 2013 11:26:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1363087612!20219456!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23976 invoked from network); 12 Mar 2013 11:26:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNM4-00080D-86 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNM4-00069w-3D for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:52 +0000 Date: Tue, 12 Mar 2013 11:26:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Update my mail address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb3b1ce50d04e4f6abe55988ef0c2e654cbb79d8 Author: Christoph Egger AuthorDate: Fri Mar 8 14:34:38 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:34:38 2013 +0100 MAINTAINERS: Update my mail address Remove myself as AMD SVM maintainer. Signed-off-by: Christoph Egger --- MAINTAINERS | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 62c2cfe..8925287 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -114,7 +114,6 @@ S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM -M: Christoph Egger M: Boris Ostrovsky M: Suravee Suthikulpanit M: Jacob Shin @@ -205,7 +204,7 @@ S: Supported T: hg http://xenbits.xen.org/XCP/linux-2.6.*.pq.hg MACHINE CHECK (MCA) & RAS -M: Christoph Egger +M: Christoph Egger M: Yunhong Jiang S: Supported F: xen/arch/x86/cpu/mcheck/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:26:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:26: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 1UFNM7-0007gA-P3; Tue, 12 Mar 2013 11:26:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNM6-0007fm-Jm for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:54 +0000 Received: from [85.158.143.99:63914] by server-1.bemta-4.messagelabs.com id B6/0D-06203-DF01F315; Tue, 12 Mar 2013 11:26:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1363087612!20219456!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23976 invoked from network); 12 Mar 2013 11:26:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNM4-00080D-86 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNM4-00069w-3D for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:52 +0000 Date: Tue, 12 Mar 2013 11:26:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Update my mail address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb3b1ce50d04e4f6abe55988ef0c2e654cbb79d8 Author: Christoph Egger AuthorDate: Fri Mar 8 14:34:38 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:34:38 2013 +0100 MAINTAINERS: Update my mail address Remove myself as AMD SVM maintainer. Signed-off-by: Christoph Egger --- MAINTAINERS | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 62c2cfe..8925287 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -114,7 +114,6 @@ S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM -M: Christoph Egger M: Boris Ostrovsky M: Suravee Suthikulpanit M: Jacob Shin @@ -205,7 +204,7 @@ S: Supported T: hg http://xenbits.xen.org/XCP/linux-2.6.*.pq.hg MACHINE CHECK (MCA) & RAS -M: Christoph Egger +M: Christoph Egger M: Yunhong Jiang S: Supported F: xen/arch/x86/cpu/mcheck/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMM-0007jV-Rz; Tue, 12 Mar 2013 11:27:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNML-0007jE-S0 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:09 +0000 Received: from [85.158.143.99:65069] by server-3.bemta-4.messagelabs.com id C9/21-02186-D011F315; Tue, 12 Mar 2013 11:27:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1363087592!22837114!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9506 invoked from network); 12 Mar 2013 11:26:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLj-0007zl-RV for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLj-00069B-QY for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:31 +0000 Date: Tue, 12 Mar 2013 11:26:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD: update MAINTAINERS file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0f4b87bcedc814b2099f82518f091d4c450183a Author: Suravee Suthikulpanit AuthorDate: Fri Mar 8 14:28:22 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:28:22 2013 +0100 AMD: update MAINTAINERS file Adding AMD engineers to the list of AMD-specific components' maintainers. Signed-off-by: Suravee Suthikulpanit --- MAINTAINERS | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 241ce63..6ba98d3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -108,13 +108,17 @@ F: xen/drivers/cpufreq/ AMD IOMMU M: Wei Wang +M: Suravee Suthikulpanit +M: Jacob Shin S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM M: Andre Przywara M: Christoph Egger -M: Boris Ostrovsky +M: Boris Ostrovsky +M: Suravee Suthikulpanit +M: Jacob Shin S: Supported F: xen/arch/x86/hvm/svm/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMM-0007jV-Rz; Tue, 12 Mar 2013 11:27:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNML-0007jE-S0 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:09 +0000 Received: from [85.158.143.99:65069] by server-3.bemta-4.messagelabs.com id C9/21-02186-D011F315; Tue, 12 Mar 2013 11:27:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1363087592!22837114!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9506 invoked from network); 12 Mar 2013 11:26:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLj-0007zl-RV for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLj-00069B-QY for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:31 +0000 Date: Tue, 12 Mar 2013 11:26:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD: update MAINTAINERS file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0f4b87bcedc814b2099f82518f091d4c450183a Author: Suravee Suthikulpanit AuthorDate: Fri Mar 8 14:28:22 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:28:22 2013 +0100 AMD: update MAINTAINERS file Adding AMD engineers to the list of AMD-specific components' maintainers. Signed-off-by: Suravee Suthikulpanit --- MAINTAINERS | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 241ce63..6ba98d3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -108,13 +108,17 @@ F: xen/drivers/cpufreq/ AMD IOMMU M: Wei Wang +M: Suravee Suthikulpanit +M: Jacob Shin S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM M: Andre Przywara M: Christoph Egger -M: Boris Ostrovsky +M: Boris Ostrovsky +M: Suravee Suthikulpanit +M: Jacob Shin S: Supported F: xen/arch/x86/hvm/svm/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMO-0007kP-Ua; Tue, 12 Mar 2013 11:27:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMN-0007jt-QG for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:11 +0000 Received: from [85.158.143.99:65363] by server-2.bemta-4.messagelabs.com id 27/5B-12656-F011F315; Tue, 12 Mar 2013 11:27:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1363087602!26841304!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13257 invoked from network); 12 Mar 2013 11:26:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLu-0007zu-03 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLt-00069a-Uj for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:41 +0000 Date: Tue, 12 Mar 2013 11:26:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remove Andre from the SVM 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 33353118031c47d60601c55262379601a5224664 Author: Andre Przywara AuthorDate: Fri Mar 8 14:29:32 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:29:32 2013 +0100 remove Andre from the SVM maintainers list Signed-off-by: Andre Przywara --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6ba98d3..62c2cfe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -114,7 +114,6 @@ S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM -M: Andre Przywara M: Christoph Egger M: Boris Ostrovsky M: Suravee Suthikulpanit -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMO-0007kP-Ua; Tue, 12 Mar 2013 11:27:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMN-0007jt-QG for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:11 +0000 Received: from [85.158.143.99:65363] by server-2.bemta-4.messagelabs.com id 27/5B-12656-F011F315; Tue, 12 Mar 2013 11:27:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1363087602!26841304!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13257 invoked from network); 12 Mar 2013 11:26:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:26:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNLu-0007zu-03 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNLt-00069a-Uj for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:26:41 +0000 Date: Tue, 12 Mar 2013 11:26:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remove Andre from the SVM 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 33353118031c47d60601c55262379601a5224664 Author: Andre Przywara AuthorDate: Fri Mar 8 14:29:32 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 14:29:32 2013 +0100 remove Andre from the SVM maintainers list Signed-off-by: Andre Przywara --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6ba98d3..62c2cfe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -114,7 +114,6 @@ S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM -M: Andre Przywara M: Christoph Egger M: Boris Ostrovsky M: Suravee Suthikulpanit -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMQ-0007kz-1A; Tue, 12 Mar 2013 11:27:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMO-0007k3-GS for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:12 +0000 Received: from [85.158.139.83:32080] by server-14.bemta-5.messagelabs.com id 3A/EA-13158-F011F315; Tue, 12 Mar 2013 11:27:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1363087625!17156874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8308 invoked from network); 12 Mar 2013 11:27:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNME-00080p-EF for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNME-0006AR-BL for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:02 +0000 Date: Tue, 12 Mar 2013 11:27:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: provide comments for which Intel model is what X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97d8201de7e437e41f37539a657ff8ac1b77599a Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 8 16:18:15 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 16:18:15 2013 +0100 x86/vPMU: provide comments for which Intel model is what Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Tim Deegan --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 2cef2d6..4d33231 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -738,16 +738,16 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { switch ( cpu_model ) { - case 15: - case 23: - case 26: - case 29: - case 42: - case 45: - case 46: - case 47: - case 58: - case 62: + case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ + case 23: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ + case 26: /* 45 nm nehalem, "Bloomfield" */ + case 29: /* six-core 45 nm xeon "Dunnington" */ + case 42: /* SandyBridge */ + case 45: /* SandyBridge, "Romley-EP" */ + case 46: /* 45 nm nehalem-ex, "Beckton" */ + case 47: /* 32 nm Xeon E7 */ + case 58: /* IvyBridge */ + case 62: /* IvyBridge EP */ ret = core2_vpmu_initialise(v, vpmu_flags); if ( !ret ) vpmu->arch_vpmu_ops = &core2_vpmu_ops; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMQ-0007kz-1A; Tue, 12 Mar 2013 11:27:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMO-0007k3-GS for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:12 +0000 Received: from [85.158.139.83:32080] by server-14.bemta-5.messagelabs.com id 3A/EA-13158-F011F315; Tue, 12 Mar 2013 11:27:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1363087625!17156874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8308 invoked from network); 12 Mar 2013 11:27:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNME-00080p-EF for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNME-0006AR-BL for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:02 +0000 Date: Tue, 12 Mar 2013 11:27:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: provide comments for which Intel model is what X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97d8201de7e437e41f37539a657ff8ac1b77599a Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 8 16:18:15 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 16:18:15 2013 +0100 x86/vPMU: provide comments for which Intel model is what Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Tim Deegan --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 2cef2d6..4d33231 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -738,16 +738,16 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { switch ( cpu_model ) { - case 15: - case 23: - case 26: - case 29: - case 42: - case 45: - case 46: - case 47: - case 58: - case 62: + case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ + case 23: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ + case 26: /* 45 nm nehalem, "Bloomfield" */ + case 29: /* six-core 45 nm xeon "Dunnington" */ + case 42: /* SandyBridge */ + case 45: /* SandyBridge, "Romley-EP" */ + case 46: /* 45 nm nehalem-ex, "Beckton" */ + case 47: /* 32 nm Xeon E7 */ + case 58: /* IvyBridge */ + case 62: /* IvyBridge EP */ ret = core2_vpmu_initialise(v, vpmu_flags); if ( !ret ) vpmu->arch_vpmu_ops = &core2_vpmu_ops; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMW-0007nD-4A; Tue, 12 Mar 2013 11:27:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMU-0007mb-Lp for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:18 +0000 Received: from [85.158.138.51:52166] by server-14.bemta-3.messagelabs.com id 72/86-27076-5111F315; Tue, 12 Mar 2013 11:27:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1363087636!22174683!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16477 invoked from network); 12 Mar 2013 11:27:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMR-00080x-S8 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMR-0006Ap-Qv for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:15 +0000 Date: Tue, 12 Mar 2013 11:27:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: add missing Merom, Westmere, and Nehalem models X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f7eb639b7ef1c050f5081e432bbb54c53f43ecb Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 8 16:21:03 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 16:21:03 2013 +0100 x86/vPMU: add missing Merom, Westmere, and Nehalem models Mainly 22 (Merom-L); 30 (Nehelem); and 37, 44 (Westmere). A comprehensive list is available at: http://software.intel.com/en-us/articles/intel-architecture-and-processor-identification-with-cpuid-model-and-family-numbers Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 4d33231..eb595cd 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -738,14 +738,25 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { switch ( cpu_model ) { + /* Core2: */ case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ + case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ case 23: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ - case 26: /* 45 nm nehalem, "Bloomfield" */ case 29: /* six-core 45 nm xeon "Dunnington" */ + case 42: /* SandyBridge */ case 45: /* SandyBridge, "Romley-EP" */ + + /* Nehalem: */ + case 26: /* 45 nm nehalem, "Bloomfield" */ + case 30: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ case 46: /* 45 nm nehalem-ex, "Beckton" */ - case 47: /* 32 nm Xeon E7 */ + + /* Westmere: */ + case 37: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ + case 44: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ + case 47: /* 32 nm Westmere-EX */ + case 58: /* IvyBridge */ case 62: /* IvyBridge EP */ ret = core2_vpmu_initialise(v, vpmu_flags); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMW-0007nD-4A; Tue, 12 Mar 2013 11:27:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMU-0007mb-Lp for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:18 +0000 Received: from [85.158.138.51:52166] by server-14.bemta-3.messagelabs.com id 72/86-27076-5111F315; Tue, 12 Mar 2013 11:27:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1363087636!22174683!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16477 invoked from network); 12 Mar 2013 11:27:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMR-00080x-S8 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMR-0006Ap-Qv for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:15 +0000 Date: Tue, 12 Mar 2013 11:27:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: add missing Merom, Westmere, and Nehalem models X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f7eb639b7ef1c050f5081e432bbb54c53f43ecb Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 8 16:21:03 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 16:21:03 2013 +0100 x86/vPMU: add missing Merom, Westmere, and Nehalem models Mainly 22 (Merom-L); 30 (Nehelem); and 37, 44 (Westmere). A comprehensive list is available at: http://software.intel.com/en-us/articles/intel-architecture-and-processor-identification-with-cpuid-model-and-family-numbers Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 4d33231..eb595cd 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -738,14 +738,25 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { switch ( cpu_model ) { + /* Core2: */ case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ + case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ case 23: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ - case 26: /* 45 nm nehalem, "Bloomfield" */ case 29: /* six-core 45 nm xeon "Dunnington" */ + case 42: /* SandyBridge */ case 45: /* SandyBridge, "Romley-EP" */ + + /* Nehalem: */ + case 26: /* 45 nm nehalem, "Bloomfield" */ + case 30: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ case 46: /* 45 nm nehalem-ex, "Beckton" */ - case 47: /* 32 nm Xeon E7 */ + + /* Westmere: */ + case 37: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ + case 44: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ + case 47: /* 32 nm Westmere-EX */ + case 58: /* IvyBridge */ case 62: /* IvyBridge EP */ ret = core2_vpmu_initialise(v, vpmu_flags); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMg-0007qh-7c; Tue, 12 Mar 2013 11:27:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMe-0007q1-Av for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:28 +0000 Received: from [85.158.143.99:7534] by server-1.bemta-4.messagelabs.com id D6/DD-06203-F111F315; Tue, 12 Mar 2013 11:27:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087646!27742825!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13386 invoked from network); 12 Mar 2013 11:27:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMc-00081A-0n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMb-0006BB-VM for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:25 +0000 Date: Tue, 12 Mar 2013 11:27:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: change Intel model numbers from decimal to hex X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d112f2b50ba9cf6ecf0b35eea691345cc0196d7 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 8 16:22:43 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 16:22:43 2013 +0100 x86/vPMU: change Intel model numbers from decimal to hex Suggested-by: "Nakajima, Jun" Suggested-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index eb595cd..2af8966 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -739,26 +739,26 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) switch ( cpu_model ) { /* Core2: */ - case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ - case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ - case 23: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ - case 29: /* six-core 45 nm xeon "Dunnington" */ + case 0x0f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ + case 0x16: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ + case 0x17: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ + case 0x1d: /* six-core 45 nm xeon "Dunnington" */ - case 42: /* SandyBridge */ - case 45: /* SandyBridge, "Romley-EP" */ + case 0x2a: /* SandyBridge */ + case 0x2d: /* SandyBridge, "Romley-EP" */ /* Nehalem: */ - case 26: /* 45 nm nehalem, "Bloomfield" */ - case 30: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ - case 46: /* 45 nm nehalem-ex, "Beckton" */ + case 0x1a: /* 45 nm nehalem, "Bloomfield" */ + case 0x1e: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ + case 0x2e: /* 45 nm nehalem-ex, "Beckton" */ /* Westmere: */ - case 37: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ - case 44: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 47: /* 32 nm Westmere-EX */ + case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ + case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ + case 0x27: /* 32 nm Westmere-EX */ - case 58: /* IvyBridge */ - case 62: /* IvyBridge EP */ + case 0x3a: /* IvyBridge */ + case 0x3e: /* IvyBridge EP */ ret = core2_vpmu_initialise(v, vpmu_flags); if ( !ret ) vpmu->arch_vpmu_ops = &core2_vpmu_ops; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:27: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 1UFNMg-0007qh-7c; Tue, 12 Mar 2013 11:27:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMe-0007q1-Av for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:28 +0000 Received: from [85.158.143.99:7534] by server-1.bemta-4.messagelabs.com id D6/DD-06203-F111F315; Tue, 12 Mar 2013 11:27:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087646!27742825!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13386 invoked from network); 12 Mar 2013 11:27:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMc-00081A-0n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMb-0006BB-VM for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:25 +0000 Date: Tue, 12 Mar 2013 11:27:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: change Intel model numbers from decimal to hex X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d112f2b50ba9cf6ecf0b35eea691345cc0196d7 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 8 16:22:43 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 8 16:22:43 2013 +0100 x86/vPMU: change Intel model numbers from decimal to hex Suggested-by: "Nakajima, Jun" Suggested-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index eb595cd..2af8966 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -739,26 +739,26 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) switch ( cpu_model ) { /* Core2: */ - case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ - case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ - case 23: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ - case 29: /* six-core 45 nm xeon "Dunnington" */ + case 0x0f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ + case 0x16: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ + case 0x17: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ + case 0x1d: /* six-core 45 nm xeon "Dunnington" */ - case 42: /* SandyBridge */ - case 45: /* SandyBridge, "Romley-EP" */ + case 0x2a: /* SandyBridge */ + case 0x2d: /* SandyBridge, "Romley-EP" */ /* Nehalem: */ - case 26: /* 45 nm nehalem, "Bloomfield" */ - case 30: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ - case 46: /* 45 nm nehalem-ex, "Beckton" */ + case 0x1a: /* 45 nm nehalem, "Bloomfield" */ + case 0x1e: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ + case 0x2e: /* 45 nm nehalem-ex, "Beckton" */ /* Westmere: */ - case 37: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ - case 44: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 47: /* 32 nm Westmere-EX */ + case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ + case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ + case 0x27: /* 32 nm Westmere-EX */ - case 58: /* IvyBridge */ - case 62: /* IvyBridge EP */ + case 0x3a: /* IvyBridge */ + case 0x3e: /* IvyBridge EP */ ret = core2_vpmu_initialise(v, vpmu_flags); if ( !ret ) vpmu->arch_vpmu_ops = &core2_vpmu_ops; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNMq-0007to-Am; Tue, 12 Mar 2013 11:27:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMo-0007tA-Gc for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:38 +0000 Received: from [85.158.143.99:61776] by server-3.bemta-4.messagelabs.com id 35/F1-02186-9211F315; Tue, 12 Mar 2013 11:27:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087656!27742870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14660 invoked from network); 12 Mar 2013 11:27:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMm-00081F-9n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMm-0006CN-5G for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:36 +0000 Date: Tue, 12 Mar 2013 11:27:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Fix erronous ASSERT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 582ea94410cb266bbf3cd308046f5ea8ae25055f Author: George Dunlap AuthorDate: Mon Mar 11 09:56:02 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 11 09:56:02 2013 +0100 credit2: Fix erronous ASSERT In order to avoid high-frequency cpu migration, vcpus may in fact be scheduled slightly out-of-order. Account for this situation properly. Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index a7bd2ee..03814b7 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -1544,31 +1544,24 @@ csched_runtime(const struct scheduler *ops, int cpu, struct csched_vcpu *snext) } } - /* - * snext is about to be scheduled; so: - * - * 1. if snext->credit were less than 0 when it was taken off the - * runqueue, then csched_schedule() should have called - * reset_credit(). So at this point snext->credit must be greater - * than 0. - * - * 2. snext's credit must be greater than or equal to anyone else - * in the queue, so snext->credit - swait->credit must be greater - * than or equal to 0. - */ - ASSERT(rt_credit >= 0); - - /* FIXME: See if we can eliminate this conversion if we know time - * will be outside (MIN,MAX). Probably requires pre-calculating - * credit values of MIN,MAX per vcpu, since each vcpu burns credit - * at a different rate. */ - time = c2t(rqd, rt_credit, snext); - - /* Check limits */ - if ( time < CSCHED_MIN_TIMER ) + /* The next guy may actually have a higher credit, if we've tried to + * avoid migrating him from a different cpu. DTRT. */ + if ( rt_credit <= 0 ) time = CSCHED_MIN_TIMER; - else if ( time > CSCHED_MAX_TIMER ) - time = CSCHED_MAX_TIMER; + else + { + /* FIXME: See if we can eliminate this conversion if we know time + * will be outside (MIN,MAX). Probably requires pre-calculating + * credit values of MIN,MAX per vcpu, since each vcpu burns credit + * at a different rate. */ + time = c2t(rqd, rt_credit, snext); + + /* Check limits */ + if ( time < CSCHED_MIN_TIMER ) + time = CSCHED_MIN_TIMER; + else if ( time > CSCHED_MAX_TIMER ) + time = CSCHED_MAX_TIMER; + } return time; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:27:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11: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 1UFNMq-0007to-Am; Tue, 12 Mar 2013 11:27:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMo-0007tA-Gc for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:38 +0000 Received: from [85.158.143.99:61776] by server-3.bemta-4.messagelabs.com id 35/F1-02186-9211F315; Tue, 12 Mar 2013 11:27:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363087656!27742870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14660 invoked from network); 12 Mar 2013 11:27:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMm-00081F-9n for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMm-0006CN-5G for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:36 +0000 Date: Tue, 12 Mar 2013 11:27:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Fix erronous ASSERT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 582ea94410cb266bbf3cd308046f5ea8ae25055f Author: George Dunlap AuthorDate: Mon Mar 11 09:56:02 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 11 09:56:02 2013 +0100 credit2: Fix erronous ASSERT In order to avoid high-frequency cpu migration, vcpus may in fact be scheduled slightly out-of-order. Account for this situation properly. Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index a7bd2ee..03814b7 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -1544,31 +1544,24 @@ csched_runtime(const struct scheduler *ops, int cpu, struct csched_vcpu *snext) } } - /* - * snext is about to be scheduled; so: - * - * 1. if snext->credit were less than 0 when it was taken off the - * runqueue, then csched_schedule() should have called - * reset_credit(). So at this point snext->credit must be greater - * than 0. - * - * 2. snext's credit must be greater than or equal to anyone else - * in the queue, so snext->credit - swait->credit must be greater - * than or equal to 0. - */ - ASSERT(rt_credit >= 0); - - /* FIXME: See if we can eliminate this conversion if we know time - * will be outside (MIN,MAX). Probably requires pre-calculating - * credit values of MIN,MAX per vcpu, since each vcpu burns credit - * at a different rate. */ - time = c2t(rqd, rt_credit, snext); - - /* Check limits */ - if ( time < CSCHED_MIN_TIMER ) + /* The next guy may actually have a higher credit, if we've tried to + * avoid migrating him from a different cpu. DTRT. */ + if ( rt_credit <= 0 ) time = CSCHED_MIN_TIMER; - else if ( time > CSCHED_MAX_TIMER ) - time = CSCHED_MAX_TIMER; + else + { + /* FIXME: See if we can eliminate this conversion if we know time + * will be outside (MIN,MAX). Probably requires pre-calculating + * credit values of MIN,MAX per vcpu, since each vcpu burns credit + * at a different rate. */ + time = c2t(rqd, rt_credit, snext); + + /* Check limits */ + if ( time < CSCHED_MIN_TIMER ) + time = CSCHED_MIN_TIMER; + else if ( time > CSCHED_MAX_TIMER ) + time = CSCHED_MAX_TIMER; + } return time; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:28:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:28: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 1UFNND-0007zg-Gr; Tue, 12 Mar 2013 11:28:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNNA-0007yy-L0 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:28:01 +0000 Received: from [85.158.138.51:58931] by server-2.bemta-3.messagelabs.com id C7/AB-05208-F311F315; Tue, 12 Mar 2013 11:27:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1363087677!28252135!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.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1749 invoked from network); 12 Mar 2013 11:27:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNN6-00081U-WE for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNN6-0006DE-NW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:56 +0000 Date: Tue, 12 Mar 2013 11:27:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mmu: Introduce XENMEM_claim_pages (subop of memory 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 65c9792df60051b5f5eaadbc47a118cfba7edd49 Author: Dan Magenheimer AuthorDate: Mon Mar 11 16:13:42 2013 +0000 Commit: Keir Fraser CommitDate: Mon Mar 11 16:13:42 2013 +0000 mmu: Introduce XENMEM_claim_pages (subop of memory ops) When guests memory consumption is volatile (multiple guests ballooning up/down) we are presented with the problem of being able to determine exactly how much memory there is for allocation of new guests without negatively impacting existing guests. Note that the existing models (xapi, xend) drive the memory consumption from the tool-stack and assume that the guest will eventually hit the memory target. Other models, such as the dynamic memory utilized by tmem, do this differently - the guest drivers the memory consumption (up to the d->max_pages ceiling). With dynamic memory model, the guest frequently can balloon up and down as it sees fit. This presents the problem to the toolstack that it does not know atomically how much free memory there is (as the information gets stale the moment the d->tot_pages information is provided to the tool-stack), and hence when starting a guest can fail during the memory creation process. Especially if the process is done in parallel. In a nutshell what we need is a atomic value of all domains tot_pages during the allocation of guests. Naturally holding a lock for such a long time is unacceptable. Hence the goal of this hypercall is to attempt to atomically and very quickly determine if there are sufficient pages available in the system and, if so, "set aside" that quantity of pages for future allocations by that domain. Unlike an existing hypercall such as increase_reservation or populate_physmap, specific physical pageframes are not assigned to the domain because this cannot be done sufficiently quickly (especially for very large allocations in an arbitrarily fragmented system) and so the existing mechanisms result in classic time-of-check-time-of-use (TOCTOU) races. One can think of claiming as similar to a "lazy" allocation, but subsequent hypercalls are required to do the actual physical pageframe allocation. Note that one of effects of this hypercall is that from the perspective of other running guests - suddenly there is a new guest occupying X amount of pages. This means that when we try to balloon up they will hit the system-wide ceiling of available free memory (if the total sum of the existing d->max_pages >= host memory). This is OK - as that is part of the overcommit. What we DO NOT want to do is dictate their ceiling should be (d->max_pages) as that is risky and can lead to guests OOM-ing. It is something the guest needs to figure out. In order for a toolstack to "get" information about whether a domain has a claim and, if so, how large, and also for the toolstack to measure the total system-wide claim, a second subop has been added and exposed through domctl and libxl (see "xen: XENMEM_claim_pages: xc"). == Alternative solutions == There has been a variety of discussion whether the problem hypercall is solving can be done in user-space, such as: - For all the existing guest, set their d->max_pages temporarily to d->tot_pages and create the domain. This forces those domains to stay at their current consumption level (fyi, this is what the tmem freeze call is doing). The disadvantage of this is that needlessly forces the guests to stay at the memory usage instead of allowing it to decide the optimal target. - Account only using d->max_pages of how much free memory there is. This ignores ballooning changes and any over-commit scenario. This is similar to the scenario where the sum of all d->max_pages (and the one to be allocated now) on the host is smaller than the available free memory. As such it ignores the over-commit problem. - Provide a ring/FIFO along with event channel to notify an userspace daemon of guests memory consumption. This daemon can then provide up-to-date information to the toolstack of how much free memory there is. This duplicates what the hypervisor is already doing and introduced latency issues and catching breath for the toolstack as there might be millions of these updates on heavily used machine. There might not be any quiescent state ever and the toolstack will heavily consume CPU cycles and not ever provide up-to-date information. It has been noted that this claim mechanism solves the underlying problem (slow failure of domain creation) for a large class of domains but not all, specifically not handling (but also not making the problem worse for) PV domains that specify the "superpages" flag, and 32-bit PV domains on large RAM systems. These will be addressed at a later time. Code overview: Though the hypercall simply does arithmetic within locks, some of the semantics in the code may be a bit subtle. The key variables (d->unclaimed_pages and total_unclaimed_pages) starts at zero if no claim has yet been staked for any domain. (Perhaps a better name is "claimed_but_not_yet_possessed" but that's a bit unwieldy.) If no claim hypercalls are executed, there should be no impact on existing usage. When a claim is successfully staked by a domain, it is like a watermark but there is no record kept of the size of the claim. Instead, d->unclaimed_pages is set to the difference between d->tot_pages and the claim. When d->tot_pages increases or decreases, d->unclaimed_pages atomically decreases or increases. Once d->unclaimed_pages reaches zero, the claim is satisfied and d->unclaimed pages stays at zero -- unless a new claim is subsequently staked. The systemwide variable total_unclaimed_pages is always the sum of d->unclaimed_pages, across all domains. A non-domain- specific heap allocation will fail if total_unclaimed_pages exceeds free (plus, on tmem enabled systems, freeable) pages. Claim semantics could be modified by flags. The initial implementation had three flag, which discerns whether the caller would like tmem freeable pages to be considered in determining whether or not the claim can be successfully staked. This in later patches was removed and there are no flags. A claim can be cancelled by requesting a claim with the number of pages being zero. A second subop returns the total outstanding claimed pages systemwide. Note: Save/restore/migrate may need to be modified, else it can be documented that all claims are cancelled. This patch of the proposed XENMEM_claim_pages hypercall/subop, takes into account review feedback from Jan and Keir and IanC and Matthew Daley, plus some fixes found via runtime debugging. Signed-off-by: Dan Magenheimer Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Tim Deegan Acked-by: Keir Fraser --- xen/common/domain.c | 1 + xen/common/domctl.c | 1 + xen/common/memory.c | 33 ++++++++++++ xen/common/page_alloc.c | 116 ++++++++++++++++++++++++++++++++++++++++++- xen/include/public/domctl.h | 3 +- xen/include/public/memory.h | 35 ++++++++++++- xen/include/xen/mm.h | 3 + xen/include/xen/sched.h | 1 + 8 files changed, 188 insertions(+), 5 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index b360de1..64ee29d 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -507,6 +507,7 @@ int domain_kill(struct domain *d) evtchn_destroy(d); gnttab_release_mappings(d); tmem_destroy(d->tmem); + domain_set_outstanding_pages(d, 0); d->tmem = NULL; /* fallthrough */ case DOMDYING_dying: diff --git a/xen/common/domctl.c b/xen/common/domctl.c index b7f6619..c98e99c 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -154,6 +154,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->tot_pages = d->tot_pages; info->max_pages = d->max_pages; + info->outstanding_pages = d->outstanding_pages; info->shr_pages = atomic_read(&d->shr_pages); info->paged_pages = atomic_read(&d->paged_pages); info->shared_info_frame = mfn_to_gmfn(d, virt_to_mfn(d->shared_info)); diff --git a/xen/common/memory.c b/xen/common/memory.c index 3cf9e6c..68501d1 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -711,6 +711,39 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } + case XENMEM_claim_pages: + if ( !IS_PRIV(current->domain) ) + return -EPERM; + + if ( copy_from_guest(&reservation, arg, 1) ) + return -EFAULT; + + if ( !guest_handle_is_null(reservation.extent_start) ) + return -EINVAL; + + if ( reservation.extent_order != 0 ) + return -EINVAL; + + if ( reservation.mem_flags != 0 ) + return -EINVAL; + + d = rcu_lock_domain_by_id(reservation.domid); + if ( d == NULL ) + return -EINVAL; + + rc = domain_set_outstanding_pages(d, reservation.nr_extents); + + rcu_unlock_domain(d); + + break; + + case XENMEM_get_outstanding_pages: + if ( !IS_PRIV(current->domain) ) + return -EPERM; + + rc = get_outstanding_claims(); + break; + default: rc = arch_memory_op(op, arg); break; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 9e9fb15..aefef29 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -252,11 +252,114 @@ static long midsize_alloc_zone_pages; #define MIDSIZE_ALLOC_FRAC 128 static DEFINE_SPINLOCK(heap_lock); +static long outstanding_claims; /* total outstanding claims by all domains */ unsigned long domain_adjust_tot_pages(struct domain *d, long pages) { + long dom_before, dom_after, dom_claimed, sys_before, sys_after; + ASSERT(spin_is_locked(&d->page_alloc_lock)); - return d->tot_pages += pages; + d->tot_pages += pages; + + /* + * can test d->claimed_pages race-free because it can only change + * if d->page_alloc_lock and heap_lock are both held, see also + * domain_set_outstanding_pages below + */ + if ( !d->outstanding_pages ) + goto out; + + spin_lock(&heap_lock); + /* adjust domain outstanding pages; may not go negative */ + dom_before = d->outstanding_pages; + dom_after = dom_before - pages; + BUG_ON(dom_before < 0); + dom_claimed = dom_after < 0 ? 0 : dom_after; + d->outstanding_pages = dom_claimed; + /* flag accounting bug if system outstanding_claims would go negative */ + sys_before = outstanding_claims; + sys_after = sys_before - (dom_before - dom_claimed); + BUG_ON(sys_after < 0); + outstanding_claims = sys_after; + spin_unlock(&heap_lock); + +out: + return d->tot_pages; +} + +int domain_set_outstanding_pages(struct domain *d, unsigned long pages) +{ + int ret = -ENOMEM; + unsigned long claim, avail_pages; + + /* + * take the domain's page_alloc_lock, else all d->tot_page adjustments + * must always take the global heap_lock rather than only in the much + * rarer case that d->outstanding_pages is non-zero + */ + spin_lock(&d->page_alloc_lock); + spin_lock(&heap_lock); + + /* pages==0 means "unset" the claim. */ + if ( pages == 0 ) + { + outstanding_claims -= d->outstanding_pages; + d->outstanding_pages = 0; + ret = 0; + goto out; + } + + /* only one active claim per domain please */ + if ( d->outstanding_pages ) + { + ret = -EINVAL; + goto out; + } + + /* disallow a claim not exceeding current tot_pages or above max_pages */ + if ( (pages <= d->tot_pages) || (pages > d->max_pages) ) + { + ret = -EINVAL; + goto out; + } + + /* how much memory is available? */ + avail_pages = total_avail_pages; + + /* Note: The usage of claim means that allocation from a guest *might* + * have to come from freeable memory. Using free memory is always better, if + * it is available, than using freeable memory. + * + * But that is OK as once the claim has been made, it still can take minutes + * before the claim is fully satisfied. Tmem can make use of the unclaimed + * pages during this time (to store ephemeral/freeable pages only, + * not persistent pages). + */ + avail_pages += tmem_freeable_pages(); + avail_pages -= outstanding_claims; + + /* + * Note, if domain has already allocated memory before making a claim + * then the claim must take tot_pages into account + */ + claim = pages - d->tot_pages; + if ( claim > avail_pages ) + goto out; + + /* yay, claim fits in available memory, stake the claim, success! */ + d->outstanding_pages = claim; + outstanding_claims += d->outstanding_pages; + ret = 0; + +out: + spin_unlock(&heap_lock); + spin_unlock(&d->page_alloc_lock); + return ret; +} + +long get_outstanding_claims(void) +{ + return outstanding_claims; } static unsigned long init_node_heap(int node, unsigned long mfn, @@ -397,7 +500,7 @@ static void __init setup_low_mem_virq(void) static void check_low_mem_virq(void) { unsigned long avail_pages = total_avail_pages + - (opt_tmem ? tmem_freeable_pages() : 0); + (opt_tmem ? tmem_freeable_pages() : 0) - outstanding_claims; if ( unlikely(avail_pages <= low_mem_virq_th) ) { @@ -466,6 +569,15 @@ static struct page_info *alloc_heap_pages( spin_lock(&heap_lock); /* + * Claimed memory is considered unavailable unless the request + * is made by a domain with sufficient unclaimed pages. + */ + if ( (outstanding_claims + request > + total_avail_pages + tmem_freeable_pages()) && + (d == NULL || d->outstanding_pages < request) ) + goto not_found; + + /* * TMEM: When available memory is scarce due to tmem absorbing it, allow * only mid-size allocations to avoid worst of fragmentation issues. * Others try tmem pools then fail. This is a workaround until all diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index deb19db..113b8dc 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -36,7 +36,7 @@ #include "grant_table.h" #include "hvm/save.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000008 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000009 /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -95,6 +95,7 @@ struct xen_domctl_getdomaininfo { uint32_t flags; /* XEN_DOMINF_* */ uint64_aligned_t tot_pages; uint64_aligned_t max_pages; + uint64_aligned_t outstanding_pages; uint64_aligned_t shr_pages; uint64_aligned_t paged_pages; uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 1c5ca19..51d5254 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -68,6 +68,8 @@ struct xen_memory_reservation { * IN: GPFN bases of extents to populate with memory * OUT: GMFN bases of extents that were allocated * (NB. This command also updates the mach_to_phys translation table) + * XENMEM_claim_pages: + * IN: must be zero */ XEN_GUEST_HANDLE(xen_pfn_t) extent_start; @@ -430,10 +432,39 @@ typedef struct xen_mem_sharing_op xen_mem_sharing_op_t; DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); /* - * Reserve ops for future/out-of-tree "claim" patches (Oracle) + * Attempt to stake a claim for a domain on a quantity of pages + * of system RAM, but _not_ assign specific pageframes. Only + * arithmetic is performed so the hypercall is very fast and need + * not be preemptible, thus sidestepping time-of-check-time-of-use + * races for memory allocation. Returns 0 if the hypervisor page + * allocator has atomically and successfully claimed the requested + * number of pages, else non-zero. + * + * Any domain may have only one active claim. When sufficient memory + * has been allocated to resolve the claim, the claim silently expires. + * Claiming zero pages effectively resets any outstanding claim and + * is always successful. + * + * Note that a valid claim may be staked even after memory has been + * allocated for a domain. In this case, the claim is not incremental, + * i.e. if the domain's tot_pages is 3, and a claim is staked for 10, + * only 7 additional pages are claimed. + * + * Caller must be privileged or the hypercall fails. */ #define XENMEM_claim_pages 24 -#define XENMEM_get_unclaimed_pages 25 + +/* + * XENMEM_claim_pages flags - the are no flags at this time. + * The zero value is appropiate. + */ + +/* + * Get the number of pages currently claimed (but not yet "possessed") + * across all domains. The caller must be privileged but otherwise + * the call never fails. + */ +#define XENMEM_get_outstanding_pages 25 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 2f701f5..28512fb 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -49,7 +49,10 @@ void free_xenheap_pages(void *v, unsigned int order); #define alloc_xenheap_page() (alloc_xenheap_pages(0,0)) #define free_xenheap_page(v) (free_xenheap_pages(v,0)) +/* Claim handling */ unsigned long domain_adjust_tot_pages(struct domain *d, long pages); +int domain_set_outstanding_pages(struct domain *d, unsigned long pages); +long get_outstanding_claims(void); /* Domain suballocator. These functions are *not* interrupt-safe.*/ void init_domheap_pages(paddr_t ps, paddr_t pe); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index e108436..569e76e 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -242,6 +242,7 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages) */ unsigned int tot_pages; /* number of pages currently possesed */ + unsigned int outstanding_pages; /* pages claimed but not possessed */ unsigned int max_pages; /* maximum value for tot_pages */ atomic_t shr_pages; /* number of shared pages */ atomic_t paged_pages; /* number of paged-out pages */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:28:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:28: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 1UFNND-0007zg-Gr; Tue, 12 Mar 2013 11:28:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNNA-0007yy-L0 for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:28:01 +0000 Received: from [85.158.138.51:58931] by server-2.bemta-3.messagelabs.com id C7/AB-05208-F311F315; Tue, 12 Mar 2013 11:27:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1363087677!28252135!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.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1749 invoked from network); 12 Mar 2013 11:27:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNN6-00081U-WE for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNN6-0006DE-NW for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:56 +0000 Date: Tue, 12 Mar 2013 11:27:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mmu: Introduce XENMEM_claim_pages (subop of memory 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 65c9792df60051b5f5eaadbc47a118cfba7edd49 Author: Dan Magenheimer AuthorDate: Mon Mar 11 16:13:42 2013 +0000 Commit: Keir Fraser CommitDate: Mon Mar 11 16:13:42 2013 +0000 mmu: Introduce XENMEM_claim_pages (subop of memory ops) When guests memory consumption is volatile (multiple guests ballooning up/down) we are presented with the problem of being able to determine exactly how much memory there is for allocation of new guests without negatively impacting existing guests. Note that the existing models (xapi, xend) drive the memory consumption from the tool-stack and assume that the guest will eventually hit the memory target. Other models, such as the dynamic memory utilized by tmem, do this differently - the guest drivers the memory consumption (up to the d->max_pages ceiling). With dynamic memory model, the guest frequently can balloon up and down as it sees fit. This presents the problem to the toolstack that it does not know atomically how much free memory there is (as the information gets stale the moment the d->tot_pages information is provided to the tool-stack), and hence when starting a guest can fail during the memory creation process. Especially if the process is done in parallel. In a nutshell what we need is a atomic value of all domains tot_pages during the allocation of guests. Naturally holding a lock for such a long time is unacceptable. Hence the goal of this hypercall is to attempt to atomically and very quickly determine if there are sufficient pages available in the system and, if so, "set aside" that quantity of pages for future allocations by that domain. Unlike an existing hypercall such as increase_reservation or populate_physmap, specific physical pageframes are not assigned to the domain because this cannot be done sufficiently quickly (especially for very large allocations in an arbitrarily fragmented system) and so the existing mechanisms result in classic time-of-check-time-of-use (TOCTOU) races. One can think of claiming as similar to a "lazy" allocation, but subsequent hypercalls are required to do the actual physical pageframe allocation. Note that one of effects of this hypercall is that from the perspective of other running guests - suddenly there is a new guest occupying X amount of pages. This means that when we try to balloon up they will hit the system-wide ceiling of available free memory (if the total sum of the existing d->max_pages >= host memory). This is OK - as that is part of the overcommit. What we DO NOT want to do is dictate their ceiling should be (d->max_pages) as that is risky and can lead to guests OOM-ing. It is something the guest needs to figure out. In order for a toolstack to "get" information about whether a domain has a claim and, if so, how large, and also for the toolstack to measure the total system-wide claim, a second subop has been added and exposed through domctl and libxl (see "xen: XENMEM_claim_pages: xc"). == Alternative solutions == There has been a variety of discussion whether the problem hypercall is solving can be done in user-space, such as: - For all the existing guest, set their d->max_pages temporarily to d->tot_pages and create the domain. This forces those domains to stay at their current consumption level (fyi, this is what the tmem freeze call is doing). The disadvantage of this is that needlessly forces the guests to stay at the memory usage instead of allowing it to decide the optimal target. - Account only using d->max_pages of how much free memory there is. This ignores ballooning changes and any over-commit scenario. This is similar to the scenario where the sum of all d->max_pages (and the one to be allocated now) on the host is smaller than the available free memory. As such it ignores the over-commit problem. - Provide a ring/FIFO along with event channel to notify an userspace daemon of guests memory consumption. This daemon can then provide up-to-date information to the toolstack of how much free memory there is. This duplicates what the hypervisor is already doing and introduced latency issues and catching breath for the toolstack as there might be millions of these updates on heavily used machine. There might not be any quiescent state ever and the toolstack will heavily consume CPU cycles and not ever provide up-to-date information. It has been noted that this claim mechanism solves the underlying problem (slow failure of domain creation) for a large class of domains but not all, specifically not handling (but also not making the problem worse for) PV domains that specify the "superpages" flag, and 32-bit PV domains on large RAM systems. These will be addressed at a later time. Code overview: Though the hypercall simply does arithmetic within locks, some of the semantics in the code may be a bit subtle. The key variables (d->unclaimed_pages and total_unclaimed_pages) starts at zero if no claim has yet been staked for any domain. (Perhaps a better name is "claimed_but_not_yet_possessed" but that's a bit unwieldy.) If no claim hypercalls are executed, there should be no impact on existing usage. When a claim is successfully staked by a domain, it is like a watermark but there is no record kept of the size of the claim. Instead, d->unclaimed_pages is set to the difference between d->tot_pages and the claim. When d->tot_pages increases or decreases, d->unclaimed_pages atomically decreases or increases. Once d->unclaimed_pages reaches zero, the claim is satisfied and d->unclaimed pages stays at zero -- unless a new claim is subsequently staked. The systemwide variable total_unclaimed_pages is always the sum of d->unclaimed_pages, across all domains. A non-domain- specific heap allocation will fail if total_unclaimed_pages exceeds free (plus, on tmem enabled systems, freeable) pages. Claim semantics could be modified by flags. The initial implementation had three flag, which discerns whether the caller would like tmem freeable pages to be considered in determining whether or not the claim can be successfully staked. This in later patches was removed and there are no flags. A claim can be cancelled by requesting a claim with the number of pages being zero. A second subop returns the total outstanding claimed pages systemwide. Note: Save/restore/migrate may need to be modified, else it can be documented that all claims are cancelled. This patch of the proposed XENMEM_claim_pages hypercall/subop, takes into account review feedback from Jan and Keir and IanC and Matthew Daley, plus some fixes found via runtime debugging. Signed-off-by: Dan Magenheimer Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Tim Deegan Acked-by: Keir Fraser --- xen/common/domain.c | 1 + xen/common/domctl.c | 1 + xen/common/memory.c | 33 ++++++++++++ xen/common/page_alloc.c | 116 ++++++++++++++++++++++++++++++++++++++++++- xen/include/public/domctl.h | 3 +- xen/include/public/memory.h | 35 ++++++++++++- xen/include/xen/mm.h | 3 + xen/include/xen/sched.h | 1 + 8 files changed, 188 insertions(+), 5 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index b360de1..64ee29d 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -507,6 +507,7 @@ int domain_kill(struct domain *d) evtchn_destroy(d); gnttab_release_mappings(d); tmem_destroy(d->tmem); + domain_set_outstanding_pages(d, 0); d->tmem = NULL; /* fallthrough */ case DOMDYING_dying: diff --git a/xen/common/domctl.c b/xen/common/domctl.c index b7f6619..c98e99c 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -154,6 +154,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->tot_pages = d->tot_pages; info->max_pages = d->max_pages; + info->outstanding_pages = d->outstanding_pages; info->shr_pages = atomic_read(&d->shr_pages); info->paged_pages = atomic_read(&d->paged_pages); info->shared_info_frame = mfn_to_gmfn(d, virt_to_mfn(d->shared_info)); diff --git a/xen/common/memory.c b/xen/common/memory.c index 3cf9e6c..68501d1 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -711,6 +711,39 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } + case XENMEM_claim_pages: + if ( !IS_PRIV(current->domain) ) + return -EPERM; + + if ( copy_from_guest(&reservation, arg, 1) ) + return -EFAULT; + + if ( !guest_handle_is_null(reservation.extent_start) ) + return -EINVAL; + + if ( reservation.extent_order != 0 ) + return -EINVAL; + + if ( reservation.mem_flags != 0 ) + return -EINVAL; + + d = rcu_lock_domain_by_id(reservation.domid); + if ( d == NULL ) + return -EINVAL; + + rc = domain_set_outstanding_pages(d, reservation.nr_extents); + + rcu_unlock_domain(d); + + break; + + case XENMEM_get_outstanding_pages: + if ( !IS_PRIV(current->domain) ) + return -EPERM; + + rc = get_outstanding_claims(); + break; + default: rc = arch_memory_op(op, arg); break; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 9e9fb15..aefef29 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -252,11 +252,114 @@ static long midsize_alloc_zone_pages; #define MIDSIZE_ALLOC_FRAC 128 static DEFINE_SPINLOCK(heap_lock); +static long outstanding_claims; /* total outstanding claims by all domains */ unsigned long domain_adjust_tot_pages(struct domain *d, long pages) { + long dom_before, dom_after, dom_claimed, sys_before, sys_after; + ASSERT(spin_is_locked(&d->page_alloc_lock)); - return d->tot_pages += pages; + d->tot_pages += pages; + + /* + * can test d->claimed_pages race-free because it can only change + * if d->page_alloc_lock and heap_lock are both held, see also + * domain_set_outstanding_pages below + */ + if ( !d->outstanding_pages ) + goto out; + + spin_lock(&heap_lock); + /* adjust domain outstanding pages; may not go negative */ + dom_before = d->outstanding_pages; + dom_after = dom_before - pages; + BUG_ON(dom_before < 0); + dom_claimed = dom_after < 0 ? 0 : dom_after; + d->outstanding_pages = dom_claimed; + /* flag accounting bug if system outstanding_claims would go negative */ + sys_before = outstanding_claims; + sys_after = sys_before - (dom_before - dom_claimed); + BUG_ON(sys_after < 0); + outstanding_claims = sys_after; + spin_unlock(&heap_lock); + +out: + return d->tot_pages; +} + +int domain_set_outstanding_pages(struct domain *d, unsigned long pages) +{ + int ret = -ENOMEM; + unsigned long claim, avail_pages; + + /* + * take the domain's page_alloc_lock, else all d->tot_page adjustments + * must always take the global heap_lock rather than only in the much + * rarer case that d->outstanding_pages is non-zero + */ + spin_lock(&d->page_alloc_lock); + spin_lock(&heap_lock); + + /* pages==0 means "unset" the claim. */ + if ( pages == 0 ) + { + outstanding_claims -= d->outstanding_pages; + d->outstanding_pages = 0; + ret = 0; + goto out; + } + + /* only one active claim per domain please */ + if ( d->outstanding_pages ) + { + ret = -EINVAL; + goto out; + } + + /* disallow a claim not exceeding current tot_pages or above max_pages */ + if ( (pages <= d->tot_pages) || (pages > d->max_pages) ) + { + ret = -EINVAL; + goto out; + } + + /* how much memory is available? */ + avail_pages = total_avail_pages; + + /* Note: The usage of claim means that allocation from a guest *might* + * have to come from freeable memory. Using free memory is always better, if + * it is available, than using freeable memory. + * + * But that is OK as once the claim has been made, it still can take minutes + * before the claim is fully satisfied. Tmem can make use of the unclaimed + * pages during this time (to store ephemeral/freeable pages only, + * not persistent pages). + */ + avail_pages += tmem_freeable_pages(); + avail_pages -= outstanding_claims; + + /* + * Note, if domain has already allocated memory before making a claim + * then the claim must take tot_pages into account + */ + claim = pages - d->tot_pages; + if ( claim > avail_pages ) + goto out; + + /* yay, claim fits in available memory, stake the claim, success! */ + d->outstanding_pages = claim; + outstanding_claims += d->outstanding_pages; + ret = 0; + +out: + spin_unlock(&heap_lock); + spin_unlock(&d->page_alloc_lock); + return ret; +} + +long get_outstanding_claims(void) +{ + return outstanding_claims; } static unsigned long init_node_heap(int node, unsigned long mfn, @@ -397,7 +500,7 @@ static void __init setup_low_mem_virq(void) static void check_low_mem_virq(void) { unsigned long avail_pages = total_avail_pages + - (opt_tmem ? tmem_freeable_pages() : 0); + (opt_tmem ? tmem_freeable_pages() : 0) - outstanding_claims; if ( unlikely(avail_pages <= low_mem_virq_th) ) { @@ -466,6 +569,15 @@ static struct page_info *alloc_heap_pages( spin_lock(&heap_lock); /* + * Claimed memory is considered unavailable unless the request + * is made by a domain with sufficient unclaimed pages. + */ + if ( (outstanding_claims + request > + total_avail_pages + tmem_freeable_pages()) && + (d == NULL || d->outstanding_pages < request) ) + goto not_found; + + /* * TMEM: When available memory is scarce due to tmem absorbing it, allow * only mid-size allocations to avoid worst of fragmentation issues. * Others try tmem pools then fail. This is a workaround until all diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index deb19db..113b8dc 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -36,7 +36,7 @@ #include "grant_table.h" #include "hvm/save.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000008 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000009 /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -95,6 +95,7 @@ struct xen_domctl_getdomaininfo { uint32_t flags; /* XEN_DOMINF_* */ uint64_aligned_t tot_pages; uint64_aligned_t max_pages; + uint64_aligned_t outstanding_pages; uint64_aligned_t shr_pages; uint64_aligned_t paged_pages; uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 1c5ca19..51d5254 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -68,6 +68,8 @@ struct xen_memory_reservation { * IN: GPFN bases of extents to populate with memory * OUT: GMFN bases of extents that were allocated * (NB. This command also updates the mach_to_phys translation table) + * XENMEM_claim_pages: + * IN: must be zero */ XEN_GUEST_HANDLE(xen_pfn_t) extent_start; @@ -430,10 +432,39 @@ typedef struct xen_mem_sharing_op xen_mem_sharing_op_t; DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); /* - * Reserve ops for future/out-of-tree "claim" patches (Oracle) + * Attempt to stake a claim for a domain on a quantity of pages + * of system RAM, but _not_ assign specific pageframes. Only + * arithmetic is performed so the hypercall is very fast and need + * not be preemptible, thus sidestepping time-of-check-time-of-use + * races for memory allocation. Returns 0 if the hypervisor page + * allocator has atomically and successfully claimed the requested + * number of pages, else non-zero. + * + * Any domain may have only one active claim. When sufficient memory + * has been allocated to resolve the claim, the claim silently expires. + * Claiming zero pages effectively resets any outstanding claim and + * is always successful. + * + * Note that a valid claim may be staked even after memory has been + * allocated for a domain. In this case, the claim is not incremental, + * i.e. if the domain's tot_pages is 3, and a claim is staked for 10, + * only 7 additional pages are claimed. + * + * Caller must be privileged or the hypercall fails. */ #define XENMEM_claim_pages 24 -#define XENMEM_get_unclaimed_pages 25 + +/* + * XENMEM_claim_pages flags - the are no flags at this time. + * The zero value is appropiate. + */ + +/* + * Get the number of pages currently claimed (but not yet "possessed") + * across all domains. The caller must be privileged but otherwise + * the call never fails. + */ +#define XENMEM_get_outstanding_pages 25 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 2f701f5..28512fb 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -49,7 +49,10 @@ void free_xenheap_pages(void *v, unsigned int order); #define alloc_xenheap_page() (alloc_xenheap_pages(0,0)) #define free_xenheap_page(v) (free_xenheap_pages(v,0)) +/* Claim handling */ unsigned long domain_adjust_tot_pages(struct domain *d, long pages); +int domain_set_outstanding_pages(struct domain *d, unsigned long pages); +long get_outstanding_claims(void); /* Domain suballocator. These functions are *not* interrupt-safe.*/ void init_domheap_pages(paddr_t ps, paddr_t pe); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index e108436..569e76e 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -242,6 +242,7 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages) */ unsigned int tot_pages; /* number of pages currently possesed */ + unsigned int outstanding_pages; /* pages claimed but not possessed */ unsigned int max_pages; /* maximum value for tot_pages */ atomic_t shr_pages; /* number of shared pages */ atomic_t paged_pages; /* number of paged-out pages */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:28:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:28: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 1UFNNQ-00082X-Kc; Tue, 12 Mar 2013 11:28:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNNP-00082L-UA for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:28:16 +0000 Received: from [85.158.139.83:22043] by server-15.bemta-5.messagelabs.com id A2/B4-22815-F411F315; Tue, 12 Mar 2013 11:28:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1363087666!27506447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.0 required=7.0 tests=BODY_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11576 invoked from network); 12 Mar 2013 11:27:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMw-00081L-Js for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMw-0006Cl-DD for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:46 +0000 Date: Tue, 12 Mar 2013 11:27:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Reset until the front of the runqueue is positive X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e98fd591232d33b1a3785fe1e5e1361955d9d90 Author: George Dunlap AuthorDate: Mon Mar 11 09:57:11 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 11 09:57:11 2013 +0100 credit2: Reset until the front of the runqueue is positive Under normal circumstances, snext->credit should never be less than -CSCHED_MIN_TIMER. However, under some circumstances, a vcpu with low credits may be allowed to run long enough that its credits are actually less than -CSCHED_CREDIT_INIT. (Instances have been observed, for example, where a vcpu with 200us of credit was allowed to run for 11ms, giving it -10.8ms of credit. Thus it was still negative even after the reset.) If this is the case for snext, we simply want to keep moving everyone up until it is in the black again. This fair because none of the other vcpus want to run at the moment. Rather than loop, just detect how many times we want to add CSCHED_CREDIT_INIT. Try to avoid integer divides and multiplies in the common case. Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 48 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 8 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 03814b7..825ec98 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -588,38 +588,70 @@ no_tickle: /* * Credit-related code */ -static void reset_credit(const struct scheduler *ops, int cpu, s_time_t now) +static void reset_credit(const struct scheduler *ops, int cpu, s_time_t now, + struct csched_vcpu *snext) { struct csched_runqueue_data *rqd = RQD(ops, cpu); struct list_head *iter; + int m; + + /* + * Under normal circumstances, snext->credit should never be less + * than -CSCHED_MIN_TIMER. However, under some circumstances, a + * vcpu with low credits may be allowed to run long enough that + * its credits are actually less than -CSCHED_CREDIT_INIT. + * (Instances have been observed, for example, where a vcpu with + * 200us of credit was allowed to run for 11ms, giving it -10.8ms + * of credit. Thus it was still negative even after the reset.) + * + * If this is the case for snext, we simply want to keep moving + * everyone up until it is in the black again. This fair because + * none of the other vcpus want to run at the moment. + * + * Rather than looping, however, we just calculate a multiplier, + * avoiding an integer division and multiplication in the common + * case. + */ + m = 1; + if ( snext->credit < -CSCHED_CREDIT_INIT ) + m += (-snext->credit) / CSCHED_CREDIT_INIT; list_for_each( iter, &rqd->svc ) { - struct csched_vcpu * svc = list_entry(iter, struct csched_vcpu, rqd_elem); - + struct csched_vcpu * svc; int start_credit; + svc = list_entry(iter, struct csched_vcpu, rqd_elem); + BUG_ON( is_idle_vcpu(svc->vcpu) ); BUG_ON( svc->rqd != rqd ); start_credit = svc->credit; + /* And add INIT * m, avoiding integer multiplication in the + * common case. */ + if ( likely(m==1) ) + svc->credit += CSCHED_CREDIT_INIT; + else + svc->credit += m * CSCHED_CREDIT_INIT; + /* "Clip" credits to max carryover */ - if ( svc->credit > CSCHED_CARRYOVER_MAX ) - svc->credit = CSCHED_CARRYOVER_MAX; - /* And add INIT */ - svc->credit += CSCHED_CREDIT_INIT; + if ( svc->credit > CSCHED_CREDIT_INIT + CSCHED_CARRYOVER_MAX ) + svc->credit = CSCHED_CREDIT_INIT + CSCHED_CARRYOVER_MAX; + svc->start_time = now; /* TRACE */ { struct { unsigned dom:16,vcpu:16; unsigned credit_start, credit_end; + unsigned multiplier; } d; d.dom = svc->vcpu->domain->domain_id; d.vcpu = svc->vcpu->vcpu_id; d.credit_start = start_credit; d.credit_end = svc->credit; + d.multiplier = m; trace_var(TRC_CSCHED2_CREDIT_RESET, 1, sizeof(d), (unsigned char *)&d); @@ -1732,7 +1764,7 @@ csched_schedule( /* Check for the reset condition */ if ( snext->credit <= CSCHED_CREDIT_RESET ) { - reset_credit(ops, cpu, now); + reset_credit(ops, cpu, now, snext); balance_load(ops, cpu, now); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 11:28:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 11:28: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 1UFNNQ-00082X-Kc; Tue, 12 Mar 2013 11:28:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNNP-00082L-UA for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:28:16 +0000 Received: from [85.158.139.83:22043] by server-15.bemta-5.messagelabs.com id A2/B4-22815-F411F315; Tue, 12 Mar 2013 11:28:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1363087666!27506447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.0 required=7.0 tests=BODY_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11576 invoked from network); 12 Mar 2013 11:27:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 11:27:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFNMw-00081L-Js for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFNMw-0006Cl-DD for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 11:27:46 +0000 Date: Tue, 12 Mar 2013 11:27:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: Reset until the front of the runqueue is positive X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e98fd591232d33b1a3785fe1e5e1361955d9d90 Author: George Dunlap AuthorDate: Mon Mar 11 09:57:11 2013 +0100 Commit: Jan Beulich CommitDate: Mon Mar 11 09:57:11 2013 +0100 credit2: Reset until the front of the runqueue is positive Under normal circumstances, snext->credit should never be less than -CSCHED_MIN_TIMER. However, under some circumstances, a vcpu with low credits may be allowed to run long enough that its credits are actually less than -CSCHED_CREDIT_INIT. (Instances have been observed, for example, where a vcpu with 200us of credit was allowed to run for 11ms, giving it -10.8ms of credit. Thus it was still negative even after the reset.) If this is the case for snext, we simply want to keep moving everyone up until it is in the black again. This fair because none of the other vcpus want to run at the moment. Rather than loop, just detect how many times we want to add CSCHED_CREDIT_INIT. Try to avoid integer divides and multiplies in the common case. Signed-off-by: George Dunlap --- xen/common/sched_credit2.c | 48 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 8 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 03814b7..825ec98 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -588,38 +588,70 @@ no_tickle: /* * Credit-related code */ -static void reset_credit(const struct scheduler *ops, int cpu, s_time_t now) +static void reset_credit(const struct scheduler *ops, int cpu, s_time_t now, + struct csched_vcpu *snext) { struct csched_runqueue_data *rqd = RQD(ops, cpu); struct list_head *iter; + int m; + + /* + * Under normal circumstances, snext->credit should never be less + * than -CSCHED_MIN_TIMER. However, under some circumstances, a + * vcpu with low credits may be allowed to run long enough that + * its credits are actually less than -CSCHED_CREDIT_INIT. + * (Instances have been observed, for example, where a vcpu with + * 200us of credit was allowed to run for 11ms, giving it -10.8ms + * of credit. Thus it was still negative even after the reset.) + * + * If this is the case for snext, we simply want to keep moving + * everyone up until it is in the black again. This fair because + * none of the other vcpus want to run at the moment. + * + * Rather than looping, however, we just calculate a multiplier, + * avoiding an integer division and multiplication in the common + * case. + */ + m = 1; + if ( snext->credit < -CSCHED_CREDIT_INIT ) + m += (-snext->credit) / CSCHED_CREDIT_INIT; list_for_each( iter, &rqd->svc ) { - struct csched_vcpu * svc = list_entry(iter, struct csched_vcpu, rqd_elem); - + struct csched_vcpu * svc; int start_credit; + svc = list_entry(iter, struct csched_vcpu, rqd_elem); + BUG_ON( is_idle_vcpu(svc->vcpu) ); BUG_ON( svc->rqd != rqd ); start_credit = svc->credit; + /* And add INIT * m, avoiding integer multiplication in the + * common case. */ + if ( likely(m==1) ) + svc->credit += CSCHED_CREDIT_INIT; + else + svc->credit += m * CSCHED_CREDIT_INIT; + /* "Clip" credits to max carryover */ - if ( svc->credit > CSCHED_CARRYOVER_MAX ) - svc->credit = CSCHED_CARRYOVER_MAX; - /* And add INIT */ - svc->credit += CSCHED_CREDIT_INIT; + if ( svc->credit > CSCHED_CREDIT_INIT + CSCHED_CARRYOVER_MAX ) + svc->credit = CSCHED_CREDIT_INIT + CSCHED_CARRYOVER_MAX; + svc->start_time = now; /* TRACE */ { struct { unsigned dom:16,vcpu:16; unsigned credit_start, credit_end; + unsigned multiplier; } d; d.dom = svc->vcpu->domain->domain_id; d.vcpu = svc->vcpu->vcpu_id; d.credit_start = start_credit; d.credit_end = svc->credit; + d.multiplier = m; trace_var(TRC_CSCHED2_CREDIT_RESET, 1, sizeof(d), (unsigned char *)&d); @@ -1732,7 +1764,7 @@ csched_schedule( /* Check for the reset condition */ if ( snext->credit <= CSCHED_CREDIT_RESET ) { - reset_credit(ops, cpu, now); + reset_credit(ops, cpu, now, snext); balance_load(ops, cpu, now); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 12 16:22:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 16: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 1UFRxp-0006hK-FT; Tue, 12 Mar 2013 16:22:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFRxo-0006h1-Jt for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 16:22:09 +0000 Received: from [85.158.138.51:3116] by server-16.bemta-3.messagelabs.com id B7/F1-20692-F265F315; Tue, 12 Mar 2013 16:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1363105323!31645425!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.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2651 invoked from network); 12 Mar 2013 16:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 16:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFRxj-0003JE-Fq for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 16:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFRxj-0005Oy-Cv for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 16:22:03 +0000 Message-Id: Date: Tue, 12 Mar 2013 16: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] sync Xen public headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1363104595 -3600 # Node ID 870ad354925b6e9ace2637a51a5c8b2dd78a9d7e # Parent 805186ebb4ab418f1ff968a634a59d7658ba126c sync Xen public headers (once again without dropping ia64 bits) --- diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-arm.h --- a/include/xen/interface/arch-arm.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-arm.h Tue Mar 12 17:09:55 2013 +0100 @@ -86,52 +86,80 @@ #endif #define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val) -struct cpu_user_regs +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +/* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */ +# define __DECL_REG(n64, n32) union { \ + uint64_t n64; \ + uint32_t n32; \ + } +#else +/* Non-gcc sources must always use the proper 64-bit name (e.g., x0). */ +#define __DECL_REG(n64, n32) uint64_t n64 +#endif + +struct vcpu_guest_core_regs { - uint32_t r0; - uint32_t r1; - uint32_t r2; - uint32_t r3; - uint32_t r4; - uint32_t r5; - uint32_t r6; - uint32_t r7; - uint32_t r8; - uint32_t r9; - uint32_t r10; + /* Aarch64 Aarch32 */ + __DECL_REG(x0, r0_usr); + __DECL_REG(x1, r1_usr); + __DECL_REG(x2, r2_usr); + __DECL_REG(x3, r3_usr); + __DECL_REG(x4, r4_usr); + __DECL_REG(x5, r5_usr); + __DECL_REG(x6, r6_usr); + __DECL_REG(x7, r7_usr); + __DECL_REG(x8, r8_usr); + __DECL_REG(x9, r9_usr); + __DECL_REG(x10, r10_usr); + __DECL_REG(x11, r11_usr); + __DECL_REG(x12, r12_usr); + + __DECL_REG(x13, sp_usr); + __DECL_REG(x14, lr_usr); + + __DECL_REG(x15, __unused_sp_hyp); + + __DECL_REG(x16, lr_irq); + __DECL_REG(x17, sp_irq); + + __DECL_REG(x18, lr_svc); + __DECL_REG(x19, sp_svc); + + __DECL_REG(x20, lr_abt); + __DECL_REG(x21, sp_abt); + + __DECL_REG(x22, lr_und); + __DECL_REG(x23, sp_und); + + __DECL_REG(x24, r8_fiq); + __DECL_REG(x25, r9_fiq); + __DECL_REG(x26, r10_fiq); + __DECL_REG(x27, r11_fiq); + __DECL_REG(x28, r12_fiq); + + __DECL_REG(x29, sp_fiq); + __DECL_REG(x30, lr_fiq); + + /* Return address and mode */ + __DECL_REG(pc64, pc32); /* ELR_EL2 */ + uint32_t cpsr; /* SPSR_EL2 */ + union { - uint32_t r11; - uint32_t fp; - }; - uint32_t r12; - - uint32_t sp; /* r13 - SP: Valid for Hyp. frames only, o/w banked (see below) */ - - /* r14 - LR: is the same physical register as LR_usr */ - union { - uint32_t lr; /* r14 - LR: Valid for Hyp. Same physical register as lr_usr. */ - uint32_t lr_usr; + uint32_t spsr_el1; /* AArch64 */ + uint32_t spsr_svc; /* AArch32 */ }; - uint32_t pc; /* Return IP */ - uint32_t cpsr; /* Return mode */ - uint32_t pad0; /* Doubleword-align the kernel half of the frame */ + /* AArch32 guests only */ + uint32_t spsr_fiq, spsr_irq, spsr_und, spsr_abt; - /* Outer guest frame only from here on... */ + /* AArch64 guests only */ + uint64_t sp_el0; + uint64_t sp_el1, elr_el1; +}; +typedef struct vcpu_guest_core_regs vcpu_guest_core_regs_t; +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_core_regs_t); - uint32_t r8_fiq, r9_fiq, r10_fiq, r11_fiq, r12_fiq; - - uint32_t sp_usr; /* LR_usr is the same register as LR, see above */ - - uint32_t sp_svc, sp_abt, sp_und, sp_irq, sp_fiq; - uint32_t lr_svc, lr_abt, lr_und, lr_irq, lr_fiq; - - uint32_t spsr_svc, spsr_abt, spsr_und, spsr_irq, spsr_fiq; - - uint32_t pad1; /* Doubleword-align the user half of the frame */ -}; -typedef struct cpu_user_regs cpu_user_regs_t; -DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); +#undef __DECL_REG typedef uint64_t xen_pfn_t; #define PRI_xen_pfn PRIx64 @@ -148,10 +176,10 @@ struct vcpu_guest_context { #define VGCF_online (1<<_VGCF_online) uint32_t flags; /* VGCF_* */ - struct cpu_user_regs user_regs; /* User-level CPU registers */ + struct vcpu_guest_core_regs user_regs; /* Core CPU registers */ - uint32_t sctlr; - uint32_t ttbr0, ttbr1, ttbcr; + uint32_t sctlr, ttbcr; + uint64_t ttbr0, ttbr1; }; typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); @@ -169,6 +197,8 @@ typedef uint64_t xen_callback_t; /* 0-4: Mode */ #define PSR_MODE_MASK 0x1f + +/* 32 bit modes */ #define PSR_MODE_USR 0x10 #define PSR_MODE_FIQ 0x11 #define PSR_MODE_IRQ 0x12 @@ -179,6 +209,18 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_UND 0x1b #define PSR_MODE_SYS 0x1f +/* 64 bit modes */ +#ifdef CONFIG_ARM_64 +#define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ +#define PSR_MODE_EL3h 0x0d +#define PSR_MODE_EL3t 0x0c +#define PSR_MODE_EL2h 0x09 +#define PSR_MODE_EL2t 0x08 +#define PSR_MODE_EL1h 0x05 +#define PSR_MODE_EL1t 0x04 +#define PSR_MODE_EL0t 0x00 +#endif + #define PSR_THUMB (1<<5) /* Thumb Mode enable */ #define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ #define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ @@ -191,7 +233,7 @@ typedef uint64_t xen_callback_t; /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-arm/hvm/save.h --- a/include/xen/interface/arch-arm/hvm/save.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-arm/hvm/save.h Tue Mar 12 17:09:55 2013 +0100 @@ -31,7 +31,7 @@ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/hvm/save.h --- a/include/xen/interface/arch-x86/hvm/save.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/hvm/save.h Tue Mar 12 17:09:55 2013 +0100 @@ -269,15 +269,18 @@ struct hvm_hw_cpu_compat { }; static inline int _hvm_hw_fix_cpu(void *h) { - struct hvm_hw_cpu *new=h; - struct hvm_hw_cpu_compat *old=h; + + union hvm_hw_cpu_union { + struct hvm_hw_cpu nat; + struct hvm_hw_cpu_compat cmp; + } *ucpu = (union hvm_hw_cpu_union *)h; /* If we copy from the end backwards, we should * be able to do the modification in-place */ - new->error_code=old->error_code; - new->pending_event=old->pending_event; - new->tsc=old->tsc; - new->msr_tsc_aux=0; + ucpu->nat.error_code = ucpu->cmp.error_code; + ucpu->nat.pending_event = ucpu->cmp.pending_event; + ucpu->nat.tsc = ucpu->cmp.tsc; + ucpu->nat.msr_tsc_aux = 0; return 0; } diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/xen-x86_32.h --- a/include/xen/interface/arch-x86/xen-x86_32.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/xen-x86_32.h Tue Mar 12 17:09:55 2013 +0100 @@ -163,7 +163,7 @@ typedef struct xen_callback xen_callback /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/xen-x86_64.h --- a/include/xen/interface/arch-x86/xen-x86_64.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/xen-x86_64.h Tue Mar 12 17:09:55 2013 +0100 @@ -194,7 +194,7 @@ typedef unsigned long xen_callback_t; /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/xen.h --- a/include/xen/interface/arch-x86/xen.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/xen.h Tue Mar 12 17:09:55 2013 +0100 @@ -252,7 +252,7 @@ typedef struct arch_shared_info arch_sha /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/callback.h --- a/include/xen/interface/callback.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/callback.h Tue Mar 12 17:09:55 2013 +0100 @@ -113,7 +113,7 @@ DEFINE_XEN_GUEST_HANDLE(callback_unregis /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/dom0_ops.h --- a/include/xen/interface/dom0_ops.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/dom0_ops.h Tue Mar 12 17:09:55 2013 +0100 @@ -112,7 +112,7 @@ DEFINE_XEN_GUEST_HANDLE(dom0_op_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/domctl.h --- a/include/xen/interface/domctl.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/domctl.h Tue Mar 12 17:09:55 2013 +0100 @@ -36,7 +36,7 @@ #include "grant_table.h" #include "hvm/save.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000008 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000009 /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -95,6 +95,7 @@ struct xen_domctl_getdomaininfo { uint32_t flags; /* XEN_DOMINF_* */ uint64_aligned_t tot_pages; uint64_aligned_t max_pages; + uint64_aligned_t outstanding_pages; uint64_aligned_t shr_pages; uint64_aligned_t paged_pages; uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ @@ -999,7 +1000,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/elfnote.h --- a/include/xen/interface/elfnote.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/elfnote.h Tue Mar 12 17:09:55 2013 +0100 @@ -255,7 +255,7 @@ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/event_channel.h --- a/include/xen/interface/event_channel.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/event_channel.h Tue Mar 12 17:09:55 2013 +0100 @@ -286,7 +286,7 @@ DEFINE_XEN_GUEST_HANDLE(evtchn_op_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/features.h --- a/include/xen/interface/features.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/features.h Tue Mar 12 17:09:55 2013 +0100 @@ -87,7 +87,7 @@ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/gcov.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/xen/interface/gcov.h Tue Mar 12 17:09:55 2013 +0100 @@ -0,0 +1,115 @@ +/****************************************************************************** + * gcov.h + * + * Coverage structures exported by Xen. + * Structure is different from Gcc one. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2013, Citrix Systems R&D Ltd. + */ + +#ifndef __XEN_PUBLIC_GCOV_H__ +#define __XEN_PUBLIC_GCOV_H__ __XEN_PUBLIC_GCOV_H__ + +#define XENCOV_COUNTERS 5 +#define XENCOV_TAG_BASE 0x58544300u +#define XENCOV_TAG_FILE (XENCOV_TAG_BASE+0x46u) +#define XENCOV_TAG_FUNC (XENCOV_TAG_BASE+0x66u) +#define XENCOV_TAG_COUNTER(n) (XENCOV_TAG_BASE+0x30u+((n)&0xfu)) +#define XENCOV_TAG_END (XENCOV_TAG_BASE+0x2eu) +#define XENCOV_IS_TAG_COUNTER(n) \ + ((n) >= XENCOV_TAG_COUNTER(0) && (n) < XENCOV_TAG_COUNTER(XENCOV_COUNTERS)) +#define XENCOV_COUNTER_NUM(n) ((n)-XENCOV_TAG_COUNTER(0)) + +/* + * The main structure for the blob is + * BLOB := FILE.. END + * FILE := TAG_FILE VERSION STAMP FILENAME COUNTERS FUNCTIONS + * FILENAME := LEN characters + * characters are padded to 32 bit + * LEN := 32 bit value + * COUNTERS := TAG_COUNTER(n) NUM COUNTER.. + * NUM := 32 bit valie + * COUNTER := 64 bit value + * FUNCTIONS := TAG_FUNC NUM FUNCTION.. + * FUNCTION := IDENT CHECKSUM NUM_COUNTERS + * + * All tagged structures are aligned to 8 bytes + */ + +/** + * File information + * Prefixed with XENCOV_TAG_FILE and a string with filename + * Aligned to 8 bytes + */ +struct xencov_file +{ + uint32_t tag; /* XENCOV_TAG_FILE */ + uint32_t version; + uint32_t stamp; + uint32_t fn_len; + char filename[1]; +}; + + +/** + * Counters information + * Prefixed with XENCOV_TAG_COUNTER(n) where n is 0..(XENCOV_COUNTERS-1) + * Aligned to 8 bytes + */ +struct xencov_counter +{ + uint32_t tag; /* XENCOV_TAG_COUNTER(n) */ + uint32_t num; + uint64_t values[1]; +}; + +/** + * Information for each function + * Number of counter is equal to the number of counter structures got before + */ +struct xencov_function +{ + uint32_t ident; + uint32_t checksum; + uint32_t num_counters[1]; +}; + +/** + * Information for all functions + * Aligned to 8 bytes + */ +struct xencov_functions +{ + uint32_t tag; /* XENCOV_TAG_FUNC */ + uint32_t num; + struct xencov_function xencov_function[1]; +}; + +/** + * Terminator + */ +struct xencov_end +{ + uint32_t tag; /* XENCOV_TAG_END */ +}; + +#endif /* __XEN_PUBLIC_GCOV_H__ */ + diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/grant_table.h --- a/include/xen/interface/grant_table.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/grant_table.h Tue Mar 12 17:09:55 2013 +0100 @@ -656,7 +656,7 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_swap_gran /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/hvm_xs_strings.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/xen/interface/hvm/hvm_xs_strings.h Tue Mar 12 17:09:55 2013 +0100 @@ -0,0 +1,79 @@ +/****************************************************************************** + * hvm/hvm_xs_strings.h + * + * HVM xenstore strings used in HVMLOADER. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ +#define __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ + +#define HVM_XS_HVMLOADER "hvmloader" +#define HVM_XS_BIOS "hvmloader/bios" +#define HVM_XS_GENERATION_ID_ADDRESS "hvmloader/generation-id-address" + +/* The following values allow additional ACPI tables to be added to the + * virtual ACPI BIOS that hvmloader constructs. The values specify the guest + * physical address and length of a block of ACPI tables to add. The format of + * the block is simply concatenated raw tables (which specify their own length + * in the ACPI header). + */ +#define HVM_XS_ACPI_PT_ADDRESS "hvmloader/acpi/address" +#define HVM_XS_ACPI_PT_LENGTH "hvmloader/acpi/length" + +/* Any number of SMBIOS types can be passed through to an HVM guest using + * the following xenstore values. The values specify the guest physical + * address and length of a block of SMBIOS structures for hvmloader to use. + * The block is formatted in the following way: + * + * ... + * + * Each length separator is a 32b integer indicating the length of the next + * SMBIOS structure. For DMTF defined types (0 - 121), the passed in struct + * will replace the default structure in hvmloader. In addition, any + * OEM/vendortypes (128 - 255) will all be added. + */ +#define HVM_XS_SMBIOS_PT_ADDRESS "hvmloader/smbios/address" +#define HVM_XS_SMBIOS_PT_LENGTH "hvmloader/smbios/length" + +/* Set to 1 to enable SMBIOS default portable battery (type 22) values. */ +#define HVM_XS_SMBIOS_DEFAULT_BATTERY "hvmloader/smbios/default_battery" + +/* The following xenstore values are used to override some of the default + * string values in the SMBIOS table constructed in hvmloader. + */ +#define HVM_XS_BIOS_STRINGS "bios-strings" +#define HVM_XS_BIOS_VENDOR "bios-strings/bios-vendor" +#define HVM_XS_BIOS_VERSION "bios-strings/bios-version" +#define HVM_XS_SYSTEM_MANUFACTURER "bios-strings/system-manufacturer" +#define HVM_XS_SYSTEM_PRODUCT_NAME "bios-strings/system-product-name" +#define HVM_XS_SYSTEM_VERSION "bios-strings/system-version" +#define HVM_XS_SYSTEM_SERIAL_NUMBER "bios-strings/system-serial-number" +#define HVM_XS_ENCLOSURE_MANUFACTURER "bios-strings/enclosure-manufacturer" +#define HVM_XS_ENCLOSURE_SERIAL_NUMBER "bios-strings/enclosure-serial-number" +#define HVM_XS_BATTERY_MANUFACTURER "bios-strings/battery-manufacturer" +#define HVM_XS_BATTERY_DEVICE_NAME "bios-strings/battery-device-name" + +/* 1 to 99 OEM strings can be set in xenstore using values of the form + * below. These strings will be loaded into the SMBIOS type 11 structure. + */ +#define HVM_XS_OEM_STRINGS "bios-strings/oem-%02d" + +#endif /* __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ */ diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/ioreq.h --- a/include/xen/interface/hvm/ioreq.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/hvm/ioreq.h Tue Mar 12 17:09:55 2013 +0100 @@ -132,7 +132,7 @@ struct buffered_piopage { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/params.h --- a/include/xen/interface/hvm/params.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/hvm/params.h Tue Mar 12 17:09:55 2013 +0100 @@ -132,6 +132,7 @@ #define HVM_PARAM_MEMORY_EVENT_CR4 22 #define HVM_PARAM_MEMORY_EVENT_INT3 23 #define HVM_PARAM_MEMORY_EVENT_SINGLE_STEP 25 +#define HVM_PARAM_MEMORY_EVENT_MSR 30 #define HVMPME_MODE_MASK (3 << 0) #define HVMPME_mode_disabled 0 @@ -147,6 +148,9 @@ #define HVM_PARAM_ACCESS_RING_PFN 28 #define HVM_PARAM_SHARING_RING_PFN 29 -#define HVM_NR_PARAMS 30 +/* SHUTDOWN_* action in case of a triple fault */ +#define HVM_PARAM_TRIPLE_FAULT_REASON 31 + +#define HVM_NR_PARAMS 32 #endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */ diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/save.h --- a/include/xen/interface/hvm/save.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/hvm/save.h Tue Mar 12 17:09:55 2013 +0100 @@ -104,7 +104,7 @@ DECLARE_HVM_SAVE_TYPE(END, 0, struct hvm #include "../arch-x86/hvm/save.h" #elif defined(__ia64__) #include "../arch-ia64/hvm/save.h" -#elif defined(__arm__) +#elif defined(__arm__) || defined(__aarch64__) #include "../arch-arm/hvm/save.h" #else #error "unsupported architecture" diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/blkif.h --- a/include/xen/interface/io/blkif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/blkif.h Tue Mar 12 17:09:55 2013 +0100 @@ -542,7 +542,7 @@ DEFINE_RING_TYPES(blkif, struct blkif_re /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/console.h --- a/include/xen/interface/io/console.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/console.h Tue Mar 12 17:09:55 2013 +0100 @@ -43,7 +43,7 @@ struct xencons_interface { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/fbif.h --- a/include/xen/interface/io/fbif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/fbif.h Tue Mar 12 17:09:55 2013 +0100 @@ -168,7 +168,7 @@ struct xenfb_page /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/kbdif.h --- a/include/xen/interface/io/kbdif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/kbdif.h Tue Mar 12 17:09:55 2013 +0100 @@ -124,7 +124,7 @@ struct xenkbd_page /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/netif.h --- a/include/xen/interface/io/netif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/netif.h Tue Mar 12 17:09:55 2013 +0100 @@ -197,7 +197,7 @@ DEFINE_RING_TYPES(netif_rx, struct netif /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/pciif.h --- a/include/xen/interface/io/pciif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/pciif.h Tue Mar 12 17:09:55 2013 +0100 @@ -116,7 +116,7 @@ struct xen_pci_sharedinfo { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/ring.h --- a/include/xen/interface/io/ring.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/ring.h Tue Mar 12 17:09:55 2013 +0100 @@ -315,7 +315,7 @@ typedef struct __name##_back_ring __name /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/tpmif.h --- a/include/xen/interface/io/tpmif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/tpmif.h Tue Mar 12 17:09:55 2013 +0100 @@ -69,7 +69,7 @@ typedef struct tpmif_tx_interface tpmif_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/usbif.h --- a/include/xen/interface/io/usbif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/usbif.h Tue Mar 12 17:09:55 2013 +0100 @@ -71,7 +71,6 @@ enum usb_spec_version { #define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) #define usbif_setunlink_pipe(pipe) ((pipe)|(0x20)) -#define USBIF_BACK_MAX_PENDING_REQS (128) #define USBIF_MAX_SEGMENTS_PER_REQUEST (16) /* diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/vscsiif.h --- a/include/xen/interface/io/vscsiif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/vscsiif.h Tue Mar 12 17:09:55 2013 +0100 @@ -109,7 +109,7 @@ DEFINE_RING_TYPES(vscsiif, struct vscsii /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/xenbus.h --- a/include/xen/interface/io/xenbus.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/xenbus.h Tue Mar 12 17:09:55 2013 +0100 @@ -72,7 +72,7 @@ typedef enum xenbus_state XenbusState; /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/xs_wire.h --- a/include/xen/interface/io/xs_wire.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/xs_wire.h Tue Mar 12 17:09:55 2013 +0100 @@ -126,7 +126,7 @@ struct xenstore_domain_interface { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/kexec.h --- a/include/xen/interface/kexec.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/kexec.h Tue Mar 12 17:09:55 2013 +0100 @@ -160,7 +160,7 @@ typedef struct xen_kexec_range { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/mem_event.h --- a/include/xen/interface/mem_event.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/mem_event.h Tue Mar 12 17:09:55 2013 +0100 @@ -45,6 +45,8 @@ #define MEM_EVENT_REASON_CR4 4 /* CR4 was hit: gfn is CR4 value */ #define MEM_EVENT_REASON_INT3 5 /* int3 was hit: gla/gfn are RIP */ #define MEM_EVENT_REASON_SINGLESTEP 6 /* single step was invoked: gla/gfn are RIP */ +#define MEM_EVENT_REASON_MSR 7 /* MSR was hit: gfn is MSR value, gla is MSR address; + does NOT honour HVMPME_onchangeonly */ typedef struct mem_event_st { uint32_t flags; @@ -72,7 +74,7 @@ DEFINE_RING_TYPES(mem_event, mem_event_r /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/memory.h --- a/include/xen/interface/memory.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/memory.h Tue Mar 12 17:09:55 2013 +0100 @@ -68,6 +68,8 @@ struct xen_memory_reservation { * IN: GPFN bases of extents to populate with memory * OUT: GMFN bases of extents that were allocated * (NB. This command also updates the mach_to_phys translation table) + * XENMEM_claim_pages: + * IN: must be zero */ XEN_GUEST_HANDLE(xen_pfn_t) extent_start; @@ -203,8 +205,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_machphys_map #define XENMAPSPACE_shared_info 0 /* shared info page */ #define XENMAPSPACE_grant_table 1 /* grant table page */ #define XENMAPSPACE_gmfn 2 /* GMFN */ -#define XENMAPSPACE_gmfn_range 3 /* GMFN range */ -#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom */ +#define XENMAPSPACE_gmfn_range 3 /* GMFN range, XENMEM_add_to_physmap only. */ +#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom, + * XENMEM_add_to_physmap_range only. + */ /* ` } */ /* @@ -236,6 +240,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_add_to_physm /* A batched version of add_to_physmap. */ #define XENMEM_add_to_physmap_range 23 struct xen_add_to_physmap_range { + /* IN */ /* Which domain to change the mapping for. */ domid_t domid; uint16_t space; /* => enum phys_map_space */ @@ -247,8 +252,13 @@ struct xen_add_to_physmap_range { /* Indexes into space being mapped. */ XEN_GUEST_HANDLE(xen_ulong_t) idxs; - /* GPFN in domdwhere the source mapping page should appear. */ + /* GPFN in domid where the source mapping page should appear. */ XEN_GUEST_HANDLE(xen_pfn_t) gpfns; + + /* OUT */ + + /* Per index error code. */ + XEN_GUEST_HANDLE(int) errs; }; typedef struct xen_add_to_physmap_range xen_add_to_physmap_range_t; DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_range_t); @@ -422,10 +432,39 @@ typedef struct xen_mem_sharing_op xen_me DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); /* - * Reserve ops for future/out-of-tree "claim" patches (Oracle) + * Attempt to stake a claim for a domain on a quantity of pages + * of system RAM, but _not_ assign specific pageframes. Only + * arithmetic is performed so the hypercall is very fast and need + * not be preemptible, thus sidestepping time-of-check-time-of-use + * races for memory allocation. Returns 0 if the hypervisor page + * allocator has atomically and successfully claimed the requested + * number of pages, else non-zero. + * + * Any domain may have only one active claim. When sufficient memory + * has been allocated to resolve the claim, the claim silently expires. + * Claiming zero pages effectively resets any outstanding claim and + * is always successful. + * + * Note that a valid claim may be staked even after memory has been + * allocated for a domain. In this case, the claim is not incremental, + * i.e. if the domain's tot_pages is 3, and a claim is staked for 10, + * only 7 additional pages are claimed. + * + * Caller must be privileged or the hypercall fails. */ #define XENMEM_claim_pages 24 -#define XENMEM_get_unclaimed_pages 25 + +/* + * XENMEM_claim_pages flags - the are no flags at this time. + * The zero value is appropiate. + */ + +/* + * Get the number of pages currently claimed (but not yet "possessed") + * across all domains. The caller must be privileged but otherwise + * the call never fails. + */ +#define XENMEM_get_outstanding_pages 25 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ @@ -434,7 +473,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/nmi.h --- a/include/xen/interface/nmi.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/nmi.h Tue Mar 12 17:09:55 2013 +0100 @@ -36,9 +36,14 @@ /* I/O-check error reported via ISA port 0x61, bit 6. */ #define _XEN_NMIREASON_io_error 0 #define XEN_NMIREASON_io_error (1UL << _XEN_NMIREASON_io_error) + /* PCI SERR reported via ISA port 0x61, bit 7. */ +#define _XEN_NMIREASON_pci_serr 1 +#define XEN_NMIREASON_pci_serr (1UL << _XEN_NMIREASON_pci_serr) +#if __XEN_INTERFACE_VERSION__ < 0x00040300 /* legacy alias of the above */ /* Parity error reported via ISA port 0x61, bit 7. */ #define _XEN_NMIREASON_parity_error 1 #define XEN_NMIREASON_parity_error (1UL << _XEN_NMIREASON_parity_error) +#endif /* Unknown hardware-generated NMI. */ #define _XEN_NMIREASON_unknown 2 #define XEN_NMIREASON_unknown (1UL << _XEN_NMIREASON_unknown) @@ -72,7 +77,7 @@ DEFINE_XEN_GUEST_HANDLE(xennmi_callback_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/physdev.h --- a/include/xen/interface/physdev.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/physdev.h Tue Mar 12 17:09:55 2013 +0100 @@ -303,6 +303,12 @@ DEFINE_XEN_GUEST_HANDLE(physdev_pci_devi #define PHYSDEVOP_pci_device_remove 26 #define PHYSDEVOP_restore_msi_ext 27 +/* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 struct physdev_pci_device { /* IN */ uint16_t seg; @@ -362,7 +368,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_dbgp_op_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/platform.h --- a/include/xen/interface/platform.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/platform.h Tue Mar 12 17:09:55 2013 +0100 @@ -218,6 +218,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_efi_runtim #define XEN_FW_EFI_VENDOR 2 #define XEN_FW_EFI_MEM_INFO 3 #define XEN_FW_EFI_RT_VERSION 4 +#define XEN_FW_EFI_PCI_ROM 5 #define XEN_FW_KBD_SHIFT_FLAGS 5 struct xenpf_firmware_info { /* IN variables. */ @@ -266,6 +267,17 @@ struct xenpf_firmware_info { uint64_t attr; uint32_t type; } mem; + struct { + /* IN variables */ + uint16_t segment; + uint8_t bus; + uint8_t devfn; + uint16_t vendor; + uint16_t devid; + /* OUT variables */ + uint64_t address; + xen_ulong_t size; + } pci_rom; } efi_info; /* XEN_FW_EFI_INFO */ /* Int16, Fn02: Get keyboard shift flags. */ @@ -278,10 +290,16 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_firmware_i #define XENPF_enter_acpi_sleep 51 struct xenpf_enter_acpi_sleep { /* IN variables */ +#if __XEN_INTERFACE_VERSION__ < 0x00040300 uint16_t pm1a_cnt_val; /* PM1a control value. */ uint16_t pm1b_cnt_val; /* PM1b control value. */ +#else + uint16_t val_a; /* PM1a control / sleep type A. */ + uint16_t val_b; /* PM1b control / sleep type B. */ +#endif uint32_t sleep_state; /* Which state to enter (Sn). */ - uint32_t flags; /* Must be zero. */ +#define XENPF_ACPI_SLEEP_EXTENDED 0x00000001 + uint32_t flags; /* XENPF_ACPI_SLEEP_*. */ }; typedef struct xenpf_enter_acpi_sleep xenpf_enter_acpi_sleep_t; DEFINE_XEN_GUEST_HANDLE(xenpf_enter_acpi_sleep_t); @@ -545,7 +563,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_platform_op_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/sched.h --- a/include/xen/interface/sched.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/sched.h Tue Mar 12 17:09:55 2013 +0100 @@ -158,6 +158,7 @@ DEFINE_XEN_GUEST_HANDLE(sched_watchdog_t #define SHUTDOWN_suspend 2 /* Clean up, save suspend info, kill. */ #define SHUTDOWN_crash 3 /* Tell controller we've crashed. */ #define SHUTDOWN_watchdog 4 /* Restart because watchdog time expired. */ +#define SHUTDOWN_MAX 4 /* Maximum valid shutdown reason. */ /* ` } */ #endif /* __XEN_PUBLIC_SCHED_H__ */ @@ -165,7 +166,7 @@ DEFINE_XEN_GUEST_HANDLE(sched_watchdog_t /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/sysctl.h --- a/include/xen/interface/sysctl.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/sysctl.h Tue Mar 12 17:09:55 2013 +0100 @@ -596,6 +596,42 @@ struct xen_sysctl_scheduler_op { typedef struct xen_sysctl_scheduler_op xen_sysctl_scheduler_op_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_scheduler_op_t); +/* XEN_SYSCTL_coverage_op */ +/* + * Get total size of information, to help allocate + * the buffer. The pointer points to a 32 bit value. + */ +#define XEN_SYSCTL_COVERAGE_get_total_size 0 + +/* + * Read coverage information in a single run + * You must use a tool to split them. + */ +#define XEN_SYSCTL_COVERAGE_read 1 + +/* + * Reset all the coverage counters to 0 + * No parameters. + */ +#define XEN_SYSCTL_COVERAGE_reset 2 + +/* + * Like XEN_SYSCTL_COVERAGE_read but reset also + * counters to 0 in a single call. + */ +#define XEN_SYSCTL_COVERAGE_read_and_reset 3 + +struct xen_sysctl_coverage_op { + uint32_t cmd; /* XEN_SYSCTL_COVERAGE_* */ + union { + uint32_t total_size; /* OUT */ + XEN_GUEST_HANDLE_64(uint8) raw_info; /* OUT */ + } u; +}; +typedef struct xen_sysctl_coverage_op xen_sysctl_coverage_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_sysctl_coverage_op_t); + + struct xen_sysctl { uint32_t cmd; #define XEN_SYSCTL_readconsole 1 @@ -616,6 +652,7 @@ struct xen_sysctl { #define XEN_SYSCTL_numainfo 17 #define XEN_SYSCTL_cpupool_op 18 #define XEN_SYSCTL_scheduler_op 19 +#define XEN_SYSCTL_coverage_op 20 uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */ union { struct xen_sysctl_readconsole readconsole; @@ -636,6 +673,7 @@ struct xen_sysctl { struct xen_sysctl_lockprof_op lockprof_op; struct xen_sysctl_cpupool_op cpupool_op; struct xen_sysctl_scheduler_op scheduler_op; + struct xen_sysctl_coverage_op coverage_op; uint8_t pad[128]; } u; }; @@ -647,7 +685,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/tmem.h --- a/include/xen/interface/tmem.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/tmem.h Tue Mar 12 17:09:55 2013 +0100 @@ -140,7 +140,7 @@ struct tmem_handle { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/trace.h --- a/include/xen/interface/trace.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/trace.h Tue Mar 12 17:09:55 2013 +0100 @@ -57,6 +57,32 @@ #define TRC_SCHED_CLASS 0x00022000 /* Scheduler-specific */ #define TRC_SCHED_VERBOSE 0x00028000 /* More inclusive scheduling */ +/* + * The highest 3 bits of the last 12 bits of TRC_SCHED_CLASS above are + * reserved for encoding what scheduler produced the information. The + * actual event is encoded in the last 9 bits. + * + * This means we have 8 scheduling IDs available (which means at most 8 + * schedulers generating events) and, in each scheduler, up to 512 + * different events. + */ +#define TRC_SCHED_ID_BITS 3 +#define TRC_SCHED_ID_SHIFT (TRC_SUBCLS_SHIFT - TRC_SCHED_ID_BITS) +#define TRC_SCHED_ID_MASK (((1UL< Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Mar 2013 16: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 1UFRxp-0006hK-FT; Tue, 12 Mar 2013 16:22:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFRxo-0006h1-Jt for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 16:22:09 +0000 Received: from [85.158.138.51:3116] by server-16.bemta-3.messagelabs.com id B7/F1-20692-F265F315; Tue, 12 Mar 2013 16:22:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1363105323!31645425!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.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2651 invoked from network); 12 Mar 2013 16:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 12 Mar 2013 16:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFRxj-0003JE-Fq for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 16:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFRxj-0005Oy-Cv for xen-changelog@lists.xensource.com; Tue, 12 Mar 2013 16:22:03 +0000 Message-Id: Date: Tue, 12 Mar 2013 16: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] sync Xen public headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1363104595 -3600 # Node ID 870ad354925b6e9ace2637a51a5c8b2dd78a9d7e # Parent 805186ebb4ab418f1ff968a634a59d7658ba126c sync Xen public headers (once again without dropping ia64 bits) --- diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-arm.h --- a/include/xen/interface/arch-arm.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-arm.h Tue Mar 12 17:09:55 2013 +0100 @@ -86,52 +86,80 @@ #endif #define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val) -struct cpu_user_regs +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +/* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */ +# define __DECL_REG(n64, n32) union { \ + uint64_t n64; \ + uint32_t n32; \ + } +#else +/* Non-gcc sources must always use the proper 64-bit name (e.g., x0). */ +#define __DECL_REG(n64, n32) uint64_t n64 +#endif + +struct vcpu_guest_core_regs { - uint32_t r0; - uint32_t r1; - uint32_t r2; - uint32_t r3; - uint32_t r4; - uint32_t r5; - uint32_t r6; - uint32_t r7; - uint32_t r8; - uint32_t r9; - uint32_t r10; + /* Aarch64 Aarch32 */ + __DECL_REG(x0, r0_usr); + __DECL_REG(x1, r1_usr); + __DECL_REG(x2, r2_usr); + __DECL_REG(x3, r3_usr); + __DECL_REG(x4, r4_usr); + __DECL_REG(x5, r5_usr); + __DECL_REG(x6, r6_usr); + __DECL_REG(x7, r7_usr); + __DECL_REG(x8, r8_usr); + __DECL_REG(x9, r9_usr); + __DECL_REG(x10, r10_usr); + __DECL_REG(x11, r11_usr); + __DECL_REG(x12, r12_usr); + + __DECL_REG(x13, sp_usr); + __DECL_REG(x14, lr_usr); + + __DECL_REG(x15, __unused_sp_hyp); + + __DECL_REG(x16, lr_irq); + __DECL_REG(x17, sp_irq); + + __DECL_REG(x18, lr_svc); + __DECL_REG(x19, sp_svc); + + __DECL_REG(x20, lr_abt); + __DECL_REG(x21, sp_abt); + + __DECL_REG(x22, lr_und); + __DECL_REG(x23, sp_und); + + __DECL_REG(x24, r8_fiq); + __DECL_REG(x25, r9_fiq); + __DECL_REG(x26, r10_fiq); + __DECL_REG(x27, r11_fiq); + __DECL_REG(x28, r12_fiq); + + __DECL_REG(x29, sp_fiq); + __DECL_REG(x30, lr_fiq); + + /* Return address and mode */ + __DECL_REG(pc64, pc32); /* ELR_EL2 */ + uint32_t cpsr; /* SPSR_EL2 */ + union { - uint32_t r11; - uint32_t fp; - }; - uint32_t r12; - - uint32_t sp; /* r13 - SP: Valid for Hyp. frames only, o/w banked (see below) */ - - /* r14 - LR: is the same physical register as LR_usr */ - union { - uint32_t lr; /* r14 - LR: Valid for Hyp. Same physical register as lr_usr. */ - uint32_t lr_usr; + uint32_t spsr_el1; /* AArch64 */ + uint32_t spsr_svc; /* AArch32 */ }; - uint32_t pc; /* Return IP */ - uint32_t cpsr; /* Return mode */ - uint32_t pad0; /* Doubleword-align the kernel half of the frame */ + /* AArch32 guests only */ + uint32_t spsr_fiq, spsr_irq, spsr_und, spsr_abt; - /* Outer guest frame only from here on... */ + /* AArch64 guests only */ + uint64_t sp_el0; + uint64_t sp_el1, elr_el1; +}; +typedef struct vcpu_guest_core_regs vcpu_guest_core_regs_t; +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_core_regs_t); - uint32_t r8_fiq, r9_fiq, r10_fiq, r11_fiq, r12_fiq; - - uint32_t sp_usr; /* LR_usr is the same register as LR, see above */ - - uint32_t sp_svc, sp_abt, sp_und, sp_irq, sp_fiq; - uint32_t lr_svc, lr_abt, lr_und, lr_irq, lr_fiq; - - uint32_t spsr_svc, spsr_abt, spsr_und, spsr_irq, spsr_fiq; - - uint32_t pad1; /* Doubleword-align the user half of the frame */ -}; -typedef struct cpu_user_regs cpu_user_regs_t; -DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); +#undef __DECL_REG typedef uint64_t xen_pfn_t; #define PRI_xen_pfn PRIx64 @@ -148,10 +176,10 @@ struct vcpu_guest_context { #define VGCF_online (1<<_VGCF_online) uint32_t flags; /* VGCF_* */ - struct cpu_user_regs user_regs; /* User-level CPU registers */ + struct vcpu_guest_core_regs user_regs; /* Core CPU registers */ - uint32_t sctlr; - uint32_t ttbr0, ttbr1, ttbcr; + uint32_t sctlr, ttbcr; + uint64_t ttbr0, ttbr1; }; typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); @@ -169,6 +197,8 @@ typedef uint64_t xen_callback_t; /* 0-4: Mode */ #define PSR_MODE_MASK 0x1f + +/* 32 bit modes */ #define PSR_MODE_USR 0x10 #define PSR_MODE_FIQ 0x11 #define PSR_MODE_IRQ 0x12 @@ -179,6 +209,18 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_UND 0x1b #define PSR_MODE_SYS 0x1f +/* 64 bit modes */ +#ifdef CONFIG_ARM_64 +#define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ +#define PSR_MODE_EL3h 0x0d +#define PSR_MODE_EL3t 0x0c +#define PSR_MODE_EL2h 0x09 +#define PSR_MODE_EL2t 0x08 +#define PSR_MODE_EL1h 0x05 +#define PSR_MODE_EL1t 0x04 +#define PSR_MODE_EL0t 0x00 +#endif + #define PSR_THUMB (1<<5) /* Thumb Mode enable */ #define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ #define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ @@ -191,7 +233,7 @@ typedef uint64_t xen_callback_t; /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-arm/hvm/save.h --- a/include/xen/interface/arch-arm/hvm/save.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-arm/hvm/save.h Tue Mar 12 17:09:55 2013 +0100 @@ -31,7 +31,7 @@ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/hvm/save.h --- a/include/xen/interface/arch-x86/hvm/save.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/hvm/save.h Tue Mar 12 17:09:55 2013 +0100 @@ -269,15 +269,18 @@ struct hvm_hw_cpu_compat { }; static inline int _hvm_hw_fix_cpu(void *h) { - struct hvm_hw_cpu *new=h; - struct hvm_hw_cpu_compat *old=h; + + union hvm_hw_cpu_union { + struct hvm_hw_cpu nat; + struct hvm_hw_cpu_compat cmp; + } *ucpu = (union hvm_hw_cpu_union *)h; /* If we copy from the end backwards, we should * be able to do the modification in-place */ - new->error_code=old->error_code; - new->pending_event=old->pending_event; - new->tsc=old->tsc; - new->msr_tsc_aux=0; + ucpu->nat.error_code = ucpu->cmp.error_code; + ucpu->nat.pending_event = ucpu->cmp.pending_event; + ucpu->nat.tsc = ucpu->cmp.tsc; + ucpu->nat.msr_tsc_aux = 0; return 0; } diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/xen-x86_32.h --- a/include/xen/interface/arch-x86/xen-x86_32.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/xen-x86_32.h Tue Mar 12 17:09:55 2013 +0100 @@ -163,7 +163,7 @@ typedef struct xen_callback xen_callback /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/xen-x86_64.h --- a/include/xen/interface/arch-x86/xen-x86_64.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/xen-x86_64.h Tue Mar 12 17:09:55 2013 +0100 @@ -194,7 +194,7 @@ typedef unsigned long xen_callback_t; /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/arch-x86/xen.h --- a/include/xen/interface/arch-x86/xen.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/arch-x86/xen.h Tue Mar 12 17:09:55 2013 +0100 @@ -252,7 +252,7 @@ typedef struct arch_shared_info arch_sha /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/callback.h --- a/include/xen/interface/callback.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/callback.h Tue Mar 12 17:09:55 2013 +0100 @@ -113,7 +113,7 @@ DEFINE_XEN_GUEST_HANDLE(callback_unregis /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/dom0_ops.h --- a/include/xen/interface/dom0_ops.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/dom0_ops.h Tue Mar 12 17:09:55 2013 +0100 @@ -112,7 +112,7 @@ DEFINE_XEN_GUEST_HANDLE(dom0_op_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/domctl.h --- a/include/xen/interface/domctl.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/domctl.h Tue Mar 12 17:09:55 2013 +0100 @@ -36,7 +36,7 @@ #include "grant_table.h" #include "hvm/save.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000008 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000009 /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -95,6 +95,7 @@ struct xen_domctl_getdomaininfo { uint32_t flags; /* XEN_DOMINF_* */ uint64_aligned_t tot_pages; uint64_aligned_t max_pages; + uint64_aligned_t outstanding_pages; uint64_aligned_t shr_pages; uint64_aligned_t paged_pages; uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ @@ -999,7 +1000,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/elfnote.h --- a/include/xen/interface/elfnote.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/elfnote.h Tue Mar 12 17:09:55 2013 +0100 @@ -255,7 +255,7 @@ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/event_channel.h --- a/include/xen/interface/event_channel.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/event_channel.h Tue Mar 12 17:09:55 2013 +0100 @@ -286,7 +286,7 @@ DEFINE_XEN_GUEST_HANDLE(evtchn_op_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/features.h --- a/include/xen/interface/features.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/features.h Tue Mar 12 17:09:55 2013 +0100 @@ -87,7 +87,7 @@ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/gcov.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/xen/interface/gcov.h Tue Mar 12 17:09:55 2013 +0100 @@ -0,0 +1,115 @@ +/****************************************************************************** + * gcov.h + * + * Coverage structures exported by Xen. + * Structure is different from Gcc one. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2013, Citrix Systems R&D Ltd. + */ + +#ifndef __XEN_PUBLIC_GCOV_H__ +#define __XEN_PUBLIC_GCOV_H__ __XEN_PUBLIC_GCOV_H__ + +#define XENCOV_COUNTERS 5 +#define XENCOV_TAG_BASE 0x58544300u +#define XENCOV_TAG_FILE (XENCOV_TAG_BASE+0x46u) +#define XENCOV_TAG_FUNC (XENCOV_TAG_BASE+0x66u) +#define XENCOV_TAG_COUNTER(n) (XENCOV_TAG_BASE+0x30u+((n)&0xfu)) +#define XENCOV_TAG_END (XENCOV_TAG_BASE+0x2eu) +#define XENCOV_IS_TAG_COUNTER(n) \ + ((n) >= XENCOV_TAG_COUNTER(0) && (n) < XENCOV_TAG_COUNTER(XENCOV_COUNTERS)) +#define XENCOV_COUNTER_NUM(n) ((n)-XENCOV_TAG_COUNTER(0)) + +/* + * The main structure for the blob is + * BLOB := FILE.. END + * FILE := TAG_FILE VERSION STAMP FILENAME COUNTERS FUNCTIONS + * FILENAME := LEN characters + * characters are padded to 32 bit + * LEN := 32 bit value + * COUNTERS := TAG_COUNTER(n) NUM COUNTER.. + * NUM := 32 bit valie + * COUNTER := 64 bit value + * FUNCTIONS := TAG_FUNC NUM FUNCTION.. + * FUNCTION := IDENT CHECKSUM NUM_COUNTERS + * + * All tagged structures are aligned to 8 bytes + */ + +/** + * File information + * Prefixed with XENCOV_TAG_FILE and a string with filename + * Aligned to 8 bytes + */ +struct xencov_file +{ + uint32_t tag; /* XENCOV_TAG_FILE */ + uint32_t version; + uint32_t stamp; + uint32_t fn_len; + char filename[1]; +}; + + +/** + * Counters information + * Prefixed with XENCOV_TAG_COUNTER(n) where n is 0..(XENCOV_COUNTERS-1) + * Aligned to 8 bytes + */ +struct xencov_counter +{ + uint32_t tag; /* XENCOV_TAG_COUNTER(n) */ + uint32_t num; + uint64_t values[1]; +}; + +/** + * Information for each function + * Number of counter is equal to the number of counter structures got before + */ +struct xencov_function +{ + uint32_t ident; + uint32_t checksum; + uint32_t num_counters[1]; +}; + +/** + * Information for all functions + * Aligned to 8 bytes + */ +struct xencov_functions +{ + uint32_t tag; /* XENCOV_TAG_FUNC */ + uint32_t num; + struct xencov_function xencov_function[1]; +}; + +/** + * Terminator + */ +struct xencov_end +{ + uint32_t tag; /* XENCOV_TAG_END */ +}; + +#endif /* __XEN_PUBLIC_GCOV_H__ */ + diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/grant_table.h --- a/include/xen/interface/grant_table.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/grant_table.h Tue Mar 12 17:09:55 2013 +0100 @@ -656,7 +656,7 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_swap_gran /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/hvm_xs_strings.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/xen/interface/hvm/hvm_xs_strings.h Tue Mar 12 17:09:55 2013 +0100 @@ -0,0 +1,79 @@ +/****************************************************************************** + * hvm/hvm_xs_strings.h + * + * HVM xenstore strings used in HVMLOADER. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ +#define __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ + +#define HVM_XS_HVMLOADER "hvmloader" +#define HVM_XS_BIOS "hvmloader/bios" +#define HVM_XS_GENERATION_ID_ADDRESS "hvmloader/generation-id-address" + +/* The following values allow additional ACPI tables to be added to the + * virtual ACPI BIOS that hvmloader constructs. The values specify the guest + * physical address and length of a block of ACPI tables to add. The format of + * the block is simply concatenated raw tables (which specify their own length + * in the ACPI header). + */ +#define HVM_XS_ACPI_PT_ADDRESS "hvmloader/acpi/address" +#define HVM_XS_ACPI_PT_LENGTH "hvmloader/acpi/length" + +/* Any number of SMBIOS types can be passed through to an HVM guest using + * the following xenstore values. The values specify the guest physical + * address and length of a block of SMBIOS structures for hvmloader to use. + * The block is formatted in the following way: + * + * ... + * + * Each length separator is a 32b integer indicating the length of the next + * SMBIOS structure. For DMTF defined types (0 - 121), the passed in struct + * will replace the default structure in hvmloader. In addition, any + * OEM/vendortypes (128 - 255) will all be added. + */ +#define HVM_XS_SMBIOS_PT_ADDRESS "hvmloader/smbios/address" +#define HVM_XS_SMBIOS_PT_LENGTH "hvmloader/smbios/length" + +/* Set to 1 to enable SMBIOS default portable battery (type 22) values. */ +#define HVM_XS_SMBIOS_DEFAULT_BATTERY "hvmloader/smbios/default_battery" + +/* The following xenstore values are used to override some of the default + * string values in the SMBIOS table constructed in hvmloader. + */ +#define HVM_XS_BIOS_STRINGS "bios-strings" +#define HVM_XS_BIOS_VENDOR "bios-strings/bios-vendor" +#define HVM_XS_BIOS_VERSION "bios-strings/bios-version" +#define HVM_XS_SYSTEM_MANUFACTURER "bios-strings/system-manufacturer" +#define HVM_XS_SYSTEM_PRODUCT_NAME "bios-strings/system-product-name" +#define HVM_XS_SYSTEM_VERSION "bios-strings/system-version" +#define HVM_XS_SYSTEM_SERIAL_NUMBER "bios-strings/system-serial-number" +#define HVM_XS_ENCLOSURE_MANUFACTURER "bios-strings/enclosure-manufacturer" +#define HVM_XS_ENCLOSURE_SERIAL_NUMBER "bios-strings/enclosure-serial-number" +#define HVM_XS_BATTERY_MANUFACTURER "bios-strings/battery-manufacturer" +#define HVM_XS_BATTERY_DEVICE_NAME "bios-strings/battery-device-name" + +/* 1 to 99 OEM strings can be set in xenstore using values of the form + * below. These strings will be loaded into the SMBIOS type 11 structure. + */ +#define HVM_XS_OEM_STRINGS "bios-strings/oem-%02d" + +#endif /* __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ */ diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/ioreq.h --- a/include/xen/interface/hvm/ioreq.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/hvm/ioreq.h Tue Mar 12 17:09:55 2013 +0100 @@ -132,7 +132,7 @@ struct buffered_piopage { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/params.h --- a/include/xen/interface/hvm/params.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/hvm/params.h Tue Mar 12 17:09:55 2013 +0100 @@ -132,6 +132,7 @@ #define HVM_PARAM_MEMORY_EVENT_CR4 22 #define HVM_PARAM_MEMORY_EVENT_INT3 23 #define HVM_PARAM_MEMORY_EVENT_SINGLE_STEP 25 +#define HVM_PARAM_MEMORY_EVENT_MSR 30 #define HVMPME_MODE_MASK (3 << 0) #define HVMPME_mode_disabled 0 @@ -147,6 +148,9 @@ #define HVM_PARAM_ACCESS_RING_PFN 28 #define HVM_PARAM_SHARING_RING_PFN 29 -#define HVM_NR_PARAMS 30 +/* SHUTDOWN_* action in case of a triple fault */ +#define HVM_PARAM_TRIPLE_FAULT_REASON 31 + +#define HVM_NR_PARAMS 32 #endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */ diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/hvm/save.h --- a/include/xen/interface/hvm/save.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/hvm/save.h Tue Mar 12 17:09:55 2013 +0100 @@ -104,7 +104,7 @@ DECLARE_HVM_SAVE_TYPE(END, 0, struct hvm #include "../arch-x86/hvm/save.h" #elif defined(__ia64__) #include "../arch-ia64/hvm/save.h" -#elif defined(__arm__) +#elif defined(__arm__) || defined(__aarch64__) #include "../arch-arm/hvm/save.h" #else #error "unsupported architecture" diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/blkif.h --- a/include/xen/interface/io/blkif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/blkif.h Tue Mar 12 17:09:55 2013 +0100 @@ -542,7 +542,7 @@ DEFINE_RING_TYPES(blkif, struct blkif_re /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/console.h --- a/include/xen/interface/io/console.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/console.h Tue Mar 12 17:09:55 2013 +0100 @@ -43,7 +43,7 @@ struct xencons_interface { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/fbif.h --- a/include/xen/interface/io/fbif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/fbif.h Tue Mar 12 17:09:55 2013 +0100 @@ -168,7 +168,7 @@ struct xenfb_page /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/kbdif.h --- a/include/xen/interface/io/kbdif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/kbdif.h Tue Mar 12 17:09:55 2013 +0100 @@ -124,7 +124,7 @@ struct xenkbd_page /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/netif.h --- a/include/xen/interface/io/netif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/netif.h Tue Mar 12 17:09:55 2013 +0100 @@ -197,7 +197,7 @@ DEFINE_RING_TYPES(netif_rx, struct netif /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/pciif.h --- a/include/xen/interface/io/pciif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/pciif.h Tue Mar 12 17:09:55 2013 +0100 @@ -116,7 +116,7 @@ struct xen_pci_sharedinfo { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/ring.h --- a/include/xen/interface/io/ring.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/ring.h Tue Mar 12 17:09:55 2013 +0100 @@ -315,7 +315,7 @@ typedef struct __name##_back_ring __name /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/tpmif.h --- a/include/xen/interface/io/tpmif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/tpmif.h Tue Mar 12 17:09:55 2013 +0100 @@ -69,7 +69,7 @@ typedef struct tpmif_tx_interface tpmif_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/usbif.h --- a/include/xen/interface/io/usbif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/usbif.h Tue Mar 12 17:09:55 2013 +0100 @@ -71,7 +71,6 @@ enum usb_spec_version { #define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) #define usbif_setunlink_pipe(pipe) ((pipe)|(0x20)) -#define USBIF_BACK_MAX_PENDING_REQS (128) #define USBIF_MAX_SEGMENTS_PER_REQUEST (16) /* diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/vscsiif.h --- a/include/xen/interface/io/vscsiif.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/vscsiif.h Tue Mar 12 17:09:55 2013 +0100 @@ -109,7 +109,7 @@ DEFINE_RING_TYPES(vscsiif, struct vscsii /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/xenbus.h --- a/include/xen/interface/io/xenbus.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/xenbus.h Tue Mar 12 17:09:55 2013 +0100 @@ -72,7 +72,7 @@ typedef enum xenbus_state XenbusState; /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/io/xs_wire.h --- a/include/xen/interface/io/xs_wire.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/io/xs_wire.h Tue Mar 12 17:09:55 2013 +0100 @@ -126,7 +126,7 @@ struct xenstore_domain_interface { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/kexec.h --- a/include/xen/interface/kexec.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/kexec.h Tue Mar 12 17:09:55 2013 +0100 @@ -160,7 +160,7 @@ typedef struct xen_kexec_range { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/mem_event.h --- a/include/xen/interface/mem_event.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/mem_event.h Tue Mar 12 17:09:55 2013 +0100 @@ -45,6 +45,8 @@ #define MEM_EVENT_REASON_CR4 4 /* CR4 was hit: gfn is CR4 value */ #define MEM_EVENT_REASON_INT3 5 /* int3 was hit: gla/gfn are RIP */ #define MEM_EVENT_REASON_SINGLESTEP 6 /* single step was invoked: gla/gfn are RIP */ +#define MEM_EVENT_REASON_MSR 7 /* MSR was hit: gfn is MSR value, gla is MSR address; + does NOT honour HVMPME_onchangeonly */ typedef struct mem_event_st { uint32_t flags; @@ -72,7 +74,7 @@ DEFINE_RING_TYPES(mem_event, mem_event_r /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/memory.h --- a/include/xen/interface/memory.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/memory.h Tue Mar 12 17:09:55 2013 +0100 @@ -68,6 +68,8 @@ struct xen_memory_reservation { * IN: GPFN bases of extents to populate with memory * OUT: GMFN bases of extents that were allocated * (NB. This command also updates the mach_to_phys translation table) + * XENMEM_claim_pages: + * IN: must be zero */ XEN_GUEST_HANDLE(xen_pfn_t) extent_start; @@ -203,8 +205,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_machphys_map #define XENMAPSPACE_shared_info 0 /* shared info page */ #define XENMAPSPACE_grant_table 1 /* grant table page */ #define XENMAPSPACE_gmfn 2 /* GMFN */ -#define XENMAPSPACE_gmfn_range 3 /* GMFN range */ -#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom */ +#define XENMAPSPACE_gmfn_range 3 /* GMFN range, XENMEM_add_to_physmap only. */ +#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom, + * XENMEM_add_to_physmap_range only. + */ /* ` } */ /* @@ -236,6 +240,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_add_to_physm /* A batched version of add_to_physmap. */ #define XENMEM_add_to_physmap_range 23 struct xen_add_to_physmap_range { + /* IN */ /* Which domain to change the mapping for. */ domid_t domid; uint16_t space; /* => enum phys_map_space */ @@ -247,8 +252,13 @@ struct xen_add_to_physmap_range { /* Indexes into space being mapped. */ XEN_GUEST_HANDLE(xen_ulong_t) idxs; - /* GPFN in domdwhere the source mapping page should appear. */ + /* GPFN in domid where the source mapping page should appear. */ XEN_GUEST_HANDLE(xen_pfn_t) gpfns; + + /* OUT */ + + /* Per index error code. */ + XEN_GUEST_HANDLE(int) errs; }; typedef struct xen_add_to_physmap_range xen_add_to_physmap_range_t; DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_range_t); @@ -422,10 +432,39 @@ typedef struct xen_mem_sharing_op xen_me DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); /* - * Reserve ops for future/out-of-tree "claim" patches (Oracle) + * Attempt to stake a claim for a domain on a quantity of pages + * of system RAM, but _not_ assign specific pageframes. Only + * arithmetic is performed so the hypercall is very fast and need + * not be preemptible, thus sidestepping time-of-check-time-of-use + * races for memory allocation. Returns 0 if the hypervisor page + * allocator has atomically and successfully claimed the requested + * number of pages, else non-zero. + * + * Any domain may have only one active claim. When sufficient memory + * has been allocated to resolve the claim, the claim silently expires. + * Claiming zero pages effectively resets any outstanding claim and + * is always successful. + * + * Note that a valid claim may be staked even after memory has been + * allocated for a domain. In this case, the claim is not incremental, + * i.e. if the domain's tot_pages is 3, and a claim is staked for 10, + * only 7 additional pages are claimed. + * + * Caller must be privileged or the hypercall fails. */ #define XENMEM_claim_pages 24 -#define XENMEM_get_unclaimed_pages 25 + +/* + * XENMEM_claim_pages flags - the are no flags at this time. + * The zero value is appropiate. + */ + +/* + * Get the number of pages currently claimed (but not yet "possessed") + * across all domains. The caller must be privileged but otherwise + * the call never fails. + */ +#define XENMEM_get_outstanding_pages 25 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ @@ -434,7 +473,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/nmi.h --- a/include/xen/interface/nmi.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/nmi.h Tue Mar 12 17:09:55 2013 +0100 @@ -36,9 +36,14 @@ /* I/O-check error reported via ISA port 0x61, bit 6. */ #define _XEN_NMIREASON_io_error 0 #define XEN_NMIREASON_io_error (1UL << _XEN_NMIREASON_io_error) + /* PCI SERR reported via ISA port 0x61, bit 7. */ +#define _XEN_NMIREASON_pci_serr 1 +#define XEN_NMIREASON_pci_serr (1UL << _XEN_NMIREASON_pci_serr) +#if __XEN_INTERFACE_VERSION__ < 0x00040300 /* legacy alias of the above */ /* Parity error reported via ISA port 0x61, bit 7. */ #define _XEN_NMIREASON_parity_error 1 #define XEN_NMIREASON_parity_error (1UL << _XEN_NMIREASON_parity_error) +#endif /* Unknown hardware-generated NMI. */ #define _XEN_NMIREASON_unknown 2 #define XEN_NMIREASON_unknown (1UL << _XEN_NMIREASON_unknown) @@ -72,7 +77,7 @@ DEFINE_XEN_GUEST_HANDLE(xennmi_callback_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/physdev.h --- a/include/xen/interface/physdev.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/physdev.h Tue Mar 12 17:09:55 2013 +0100 @@ -303,6 +303,12 @@ DEFINE_XEN_GUEST_HANDLE(physdev_pci_devi #define PHYSDEVOP_pci_device_remove 26 #define PHYSDEVOP_restore_msi_ext 27 +/* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 struct physdev_pci_device { /* IN */ uint16_t seg; @@ -362,7 +368,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_dbgp_op_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/platform.h --- a/include/xen/interface/platform.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/platform.h Tue Mar 12 17:09:55 2013 +0100 @@ -218,6 +218,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_efi_runtim #define XEN_FW_EFI_VENDOR 2 #define XEN_FW_EFI_MEM_INFO 3 #define XEN_FW_EFI_RT_VERSION 4 +#define XEN_FW_EFI_PCI_ROM 5 #define XEN_FW_KBD_SHIFT_FLAGS 5 struct xenpf_firmware_info { /* IN variables. */ @@ -266,6 +267,17 @@ struct xenpf_firmware_info { uint64_t attr; uint32_t type; } mem; + struct { + /* IN variables */ + uint16_t segment; + uint8_t bus; + uint8_t devfn; + uint16_t vendor; + uint16_t devid; + /* OUT variables */ + uint64_t address; + xen_ulong_t size; + } pci_rom; } efi_info; /* XEN_FW_EFI_INFO */ /* Int16, Fn02: Get keyboard shift flags. */ @@ -278,10 +290,16 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_firmware_i #define XENPF_enter_acpi_sleep 51 struct xenpf_enter_acpi_sleep { /* IN variables */ +#if __XEN_INTERFACE_VERSION__ < 0x00040300 uint16_t pm1a_cnt_val; /* PM1a control value. */ uint16_t pm1b_cnt_val; /* PM1b control value. */ +#else + uint16_t val_a; /* PM1a control / sleep type A. */ + uint16_t val_b; /* PM1b control / sleep type B. */ +#endif uint32_t sleep_state; /* Which state to enter (Sn). */ - uint32_t flags; /* Must be zero. */ +#define XENPF_ACPI_SLEEP_EXTENDED 0x00000001 + uint32_t flags; /* XENPF_ACPI_SLEEP_*. */ }; typedef struct xenpf_enter_acpi_sleep xenpf_enter_acpi_sleep_t; DEFINE_XEN_GUEST_HANDLE(xenpf_enter_acpi_sleep_t); @@ -545,7 +563,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_platform_op_ /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/sched.h --- a/include/xen/interface/sched.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/sched.h Tue Mar 12 17:09:55 2013 +0100 @@ -158,6 +158,7 @@ DEFINE_XEN_GUEST_HANDLE(sched_watchdog_t #define SHUTDOWN_suspend 2 /* Clean up, save suspend info, kill. */ #define SHUTDOWN_crash 3 /* Tell controller we've crashed. */ #define SHUTDOWN_watchdog 4 /* Restart because watchdog time expired. */ +#define SHUTDOWN_MAX 4 /* Maximum valid shutdown reason. */ /* ` } */ #endif /* __XEN_PUBLIC_SCHED_H__ */ @@ -165,7 +166,7 @@ DEFINE_XEN_GUEST_HANDLE(sched_watchdog_t /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/sysctl.h --- a/include/xen/interface/sysctl.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/sysctl.h Tue Mar 12 17:09:55 2013 +0100 @@ -596,6 +596,42 @@ struct xen_sysctl_scheduler_op { typedef struct xen_sysctl_scheduler_op xen_sysctl_scheduler_op_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_scheduler_op_t); +/* XEN_SYSCTL_coverage_op */ +/* + * Get total size of information, to help allocate + * the buffer. The pointer points to a 32 bit value. + */ +#define XEN_SYSCTL_COVERAGE_get_total_size 0 + +/* + * Read coverage information in a single run + * You must use a tool to split them. + */ +#define XEN_SYSCTL_COVERAGE_read 1 + +/* + * Reset all the coverage counters to 0 + * No parameters. + */ +#define XEN_SYSCTL_COVERAGE_reset 2 + +/* + * Like XEN_SYSCTL_COVERAGE_read but reset also + * counters to 0 in a single call. + */ +#define XEN_SYSCTL_COVERAGE_read_and_reset 3 + +struct xen_sysctl_coverage_op { + uint32_t cmd; /* XEN_SYSCTL_COVERAGE_* */ + union { + uint32_t total_size; /* OUT */ + XEN_GUEST_HANDLE_64(uint8) raw_info; /* OUT */ + } u; +}; +typedef struct xen_sysctl_coverage_op xen_sysctl_coverage_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_sysctl_coverage_op_t); + + struct xen_sysctl { uint32_t cmd; #define XEN_SYSCTL_readconsole 1 @@ -616,6 +652,7 @@ struct xen_sysctl { #define XEN_SYSCTL_numainfo 17 #define XEN_SYSCTL_cpupool_op 18 #define XEN_SYSCTL_scheduler_op 19 +#define XEN_SYSCTL_coverage_op 20 uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */ union { struct xen_sysctl_readconsole readconsole; @@ -636,6 +673,7 @@ struct xen_sysctl { struct xen_sysctl_lockprof_op lockprof_op; struct xen_sysctl_cpupool_op cpupool_op; struct xen_sysctl_scheduler_op scheduler_op; + struct xen_sysctl_coverage_op coverage_op; uint8_t pad[128]; } u; }; @@ -647,7 +685,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_t); /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/tmem.h --- a/include/xen/interface/tmem.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/tmem.h Tue Mar 12 17:09:55 2013 +0100 @@ -140,7 +140,7 @@ struct tmem_handle { /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil diff -r 805186ebb4ab -r 870ad354925b include/xen/interface/trace.h --- a/include/xen/interface/trace.h Mon Mar 04 10:09:05 2013 +0100 +++ b/include/xen/interface/trace.h Tue Mar 12 17:09:55 2013 +0100 @@ -57,6 +57,32 @@ #define TRC_SCHED_CLASS 0x00022000 /* Scheduler-specific */ #define TRC_SCHED_VERBOSE 0x00028000 /* More inclusive scheduling */ +/* + * The highest 3 bits of the last 12 bits of TRC_SCHED_CLASS above are + * reserved for encoding what scheduler produced the information. The + * actual event is encoded in the last 9 bits. + * + * This means we have 8 scheduling IDs available (which means at most 8 + * schedulers generating events) and, in each scheduler, up to 512 + * different events. + */ +#define TRC_SCHED_ID_BITS 3 +#define TRC_SCHED_ID_SHIFT (TRC_SUBCLS_SHIFT - TRC_SCHED_ID_BITS) +#define TRC_SCHED_ID_MASK (((1UL< Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 09: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 1UFhst-0006Lk-4l; Wed, 13 Mar 2013 09: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 1UFhsr-0006Le-L6 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 09:22:05 +0000 Received: from [85.158.139.83:41672] by server-12.bemta-5.messagelabs.com id C8/DC-11486-C3540415; Wed, 13 Mar 2013 09:22:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1363166523!27629313!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23413 invoked from network); 13 Mar 2013 09:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 09:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFhso-0005Ec-T9 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 09:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFhso-0004hj-Ge for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 09:22:02 +0000 Message-Id: Date: Wed, 13 Mar 2013 09: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] pciback: notify hypervisor about devices intended to be assigned to guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1363166084 -3600 # Node ID 93fcadedde4884ead8b206563eba34b780e61db3 # Parent 870ad354925b6e9ace2637a51a5c8b2dd78a9d7e pciback: notify hypervisor about devices intended to be assigned to guests For MSI-X capable devices the hypervisor wants to write protect the MSI-X table and PBA, yet it can't assume that resources have been assigned to their final values at device enumeration time. Thus have pciback do that notification, as having the device controlled by it is a prerequisite to assigning the device to guests anyway. Signed-off-by: Jan Beulich --- diff -r 870ad354925b -r 93fcadedde48 drivers/xen/pciback/pci_stub.c --- a/drivers/xen/pciback/pci_stub.c Tue Mar 12 17:09:55 2013 +0100 +++ b/drivers/xen/pciback/pci_stub.c Wed Mar 13 10:14:44 2013 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include #include "pciback.h" #include "conf_space.h" #include "conf_space_quirks.h" @@ -82,19 +83,35 @@ static struct pcistub_device *pcistub_de static void pcistub_device_release(struct kref *kref) { struct pcistub_device *psdev; + struct pci_dev *dev; psdev = container_of(kref, struct pcistub_device, kref); + dev = psdev->dev; - dev_dbg(&psdev->dev->dev, "pcistub_device_release\n"); + dev_dbg(&dev->dev, "pcistub_device_release\n"); + + if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { + struct physdev_pci_device ppdev = { + .seg = pci_domain_nr(dev->bus), + .bus = dev->bus->number, + .devfn = dev->devfn + }; + int err = HYPERVISOR_physdev_op(PHYSDEVOP_release_msix, + &ppdev); + + if (err) + dev_warn(&dev->dev, "MSI-X release failed (%d)\n", + err); + } /* Clean-up the device */ - pciback_reset_device(psdev->dev); - pciback_config_free_dyn_fields(psdev->dev); - pciback_config_free_dev(psdev->dev); - kfree(pci_get_drvdata(psdev->dev)); - pci_set_drvdata(psdev->dev, NULL); + pciback_reset_device(dev); + pciback_config_free_dyn_fields(dev); + pciback_config_free_dev(dev); + kfree(pci_get_drvdata(dev)); + pci_set_drvdata(dev, NULL); - pci_dev_put(psdev->dev); + pci_dev_put(dev); kfree(psdev); } @@ -313,6 +330,19 @@ static int __devinit pcistub_init_device if (err) goto config_release; + if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { + struct physdev_pci_device ppdev = { + .seg = pci_domain_nr(dev->bus), + .bus = dev->bus->number, + .devfn = dev->devfn + }; + + err = HYPERVISOR_physdev_op(PHYSDEVOP_prepare_msix, &ppdev); + if (err) + dev_err(&dev->dev, "MSI-X preparation failed (%d)\n", + err); + } + /* Now disable the device (this also ensures some private device * data is setup before we export) */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 09:22:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 09: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 1UFhst-0006Lk-4l; Wed, 13 Mar 2013 09: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 1UFhsr-0006Le-L6 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 09:22:05 +0000 Received: from [85.158.139.83:41672] by server-12.bemta-5.messagelabs.com id C8/DC-11486-C3540415; Wed, 13 Mar 2013 09:22:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1363166523!27629313!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23413 invoked from network); 13 Mar 2013 09:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 09:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFhso-0005Ec-T9 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 09:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFhso-0004hj-Ge for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 09:22:02 +0000 Message-Id: Date: Wed, 13 Mar 2013 09: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] pciback: notify hypervisor about devices intended to be assigned to guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1363166084 -3600 # Node ID 93fcadedde4884ead8b206563eba34b780e61db3 # Parent 870ad354925b6e9ace2637a51a5c8b2dd78a9d7e pciback: notify hypervisor about devices intended to be assigned to guests For MSI-X capable devices the hypervisor wants to write protect the MSI-X table and PBA, yet it can't assume that resources have been assigned to their final values at device enumeration time. Thus have pciback do that notification, as having the device controlled by it is a prerequisite to assigning the device to guests anyway. Signed-off-by: Jan Beulich --- diff -r 870ad354925b -r 93fcadedde48 drivers/xen/pciback/pci_stub.c --- a/drivers/xen/pciback/pci_stub.c Tue Mar 12 17:09:55 2013 +0100 +++ b/drivers/xen/pciback/pci_stub.c Wed Mar 13 10:14:44 2013 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include #include "pciback.h" #include "conf_space.h" #include "conf_space_quirks.h" @@ -82,19 +83,35 @@ static struct pcistub_device *pcistub_de static void pcistub_device_release(struct kref *kref) { struct pcistub_device *psdev; + struct pci_dev *dev; psdev = container_of(kref, struct pcistub_device, kref); + dev = psdev->dev; - dev_dbg(&psdev->dev->dev, "pcistub_device_release\n"); + dev_dbg(&dev->dev, "pcistub_device_release\n"); + + if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { + struct physdev_pci_device ppdev = { + .seg = pci_domain_nr(dev->bus), + .bus = dev->bus->number, + .devfn = dev->devfn + }; + int err = HYPERVISOR_physdev_op(PHYSDEVOP_release_msix, + &ppdev); + + if (err) + dev_warn(&dev->dev, "MSI-X release failed (%d)\n", + err); + } /* Clean-up the device */ - pciback_reset_device(psdev->dev); - pciback_config_free_dyn_fields(psdev->dev); - pciback_config_free_dev(psdev->dev); - kfree(pci_get_drvdata(psdev->dev)); - pci_set_drvdata(psdev->dev, NULL); + pciback_reset_device(dev); + pciback_config_free_dyn_fields(dev); + pciback_config_free_dev(dev); + kfree(pci_get_drvdata(dev)); + pci_set_drvdata(dev, NULL); - pci_dev_put(psdev->dev); + pci_dev_put(dev); kfree(psdev); } @@ -313,6 +330,19 @@ static int __devinit pcistub_init_device if (err) goto config_release; + if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { + struct physdev_pci_device ppdev = { + .seg = pci_domain_nr(dev->bus), + .bus = dev->bus->number, + .devfn = dev->devfn + }; + + err = HYPERVISOR_physdev_op(PHYSDEVOP_prepare_msix, &ppdev); + if (err) + dev_err(&dev->dev, "MSI-X preparation failed (%d)\n", + err); + } + /* Now disable the device (this also ensures some private device * data is setup before we export) */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiec-0008SI-DI; Wed, 13 Mar 2013 10:11:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiea-0008S7-Kl for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:24 +0000 Received: from [85.158.139.211:13947] by server-9.bemta-5.messagelabs.com id 15/BC-08547-BC050415; Wed, 13 Mar 2013 10:11:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1363169475!18031356!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9849 invoked from network); 13 Mar 2013 10:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieQ-0005oY-N5 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFieQ-00062m-9J for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:14 +0000 Date: Wed, 13 Mar 2013 10:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Avoid stale pointer when moving domain to another cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 590db529d38c872b82b92a5559f8072bec73892e Author: Juergen Gross AuthorDate: Tue Mar 12 16:11:55 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:11:55 2013 +0100 Avoid stale pointer when moving domain to another cpupool When a domain is moved to another cpupool the scheduler private data pointers in vcpu and domain structures must never point to an already freed memory area. While at it, simplify sched_init_vcpu() by using DOM2OP instead VCPU2OP. Signed-off-by: Juergen Gross master changeset: 482300def7d08e773ccd2a0d978bcb9469fdd810 master date: 2013-02-28 14:56:45 +0000 --- xen/common/schedule.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 2807c34..b82b4fe 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -220,7 +220,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) if ( v->sched_priv == NULL ) return 1; - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(DOM2OP(d), insert_vcpu, v); return 0; } @@ -231,6 +231,9 @@ int sched_move_domain(struct domain *d, struct cpupool *c) unsigned int new_p; void **vcpu_priv; void *domdata; + void *vcpudata; + struct scheduler *old_ops; + void *old_domdata; domdata = SCHED_OP(c->sched, alloc_domdata, d); if ( domdata == NULL ) @@ -261,21 +264,22 @@ int sched_move_domain(struct domain *d, struct cpupool *c) domain_pause(d); + old_ops = DOM2OP(d); + old_domdata = d->sched_priv; + for_each_vcpu ( d, v ) { - SCHED_OP(VCPU2OP(v), remove_vcpu, v); - SCHED_OP(VCPU2OP(v), free_vdata, v->sched_priv); - v->sched_priv = NULL; + SCHED_OP(old_ops, remove_vcpu, v); } - SCHED_OP(DOM2OP(d), free_domdata, d->sched_priv); - d->cpupool = c; d->sched_priv = domdata; new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + vcpudata = v->sched_priv; + migrate_timer(&v->periodic_timer, new_p); migrate_timer(&v->singleshot_timer, new_p); migrate_timer(&v->poll_timer, new_p); @@ -288,12 +292,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_cycle(new_p, c->cpu_valid); SCHED_OP(c->sched, insert_vcpu, v); + + SCHED_OP(old_ops, free_vdata, vcpudata); } domain_update_node_affinity(d); domain_unpause(d); + SCHED_OP(old_ops, free_domdata, old_domdata); + xfree(vcpu_priv); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiec-0008SI-DI; Wed, 13 Mar 2013 10:11:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiea-0008S7-Kl for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:24 +0000 Received: from [85.158.139.211:13947] by server-9.bemta-5.messagelabs.com id 15/BC-08547-BC050415; Wed, 13 Mar 2013 10:11:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1363169475!18031356!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9849 invoked from network); 13 Mar 2013 10:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieQ-0005oY-N5 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFieQ-00062m-9J for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:14 +0000 Date: Wed, 13 Mar 2013 10:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Avoid stale pointer when moving domain to another cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 590db529d38c872b82b92a5559f8072bec73892e Author: Juergen Gross AuthorDate: Tue Mar 12 16:11:55 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:11:55 2013 +0100 Avoid stale pointer when moving domain to another cpupool When a domain is moved to another cpupool the scheduler private data pointers in vcpu and domain structures must never point to an already freed memory area. While at it, simplify sched_init_vcpu() by using DOM2OP instead VCPU2OP. Signed-off-by: Juergen Gross master changeset: 482300def7d08e773ccd2a0d978bcb9469fdd810 master date: 2013-02-28 14:56:45 +0000 --- xen/common/schedule.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 2807c34..b82b4fe 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -220,7 +220,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) if ( v->sched_priv == NULL ) return 1; - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(DOM2OP(d), insert_vcpu, v); return 0; } @@ -231,6 +231,9 @@ int sched_move_domain(struct domain *d, struct cpupool *c) unsigned int new_p; void **vcpu_priv; void *domdata; + void *vcpudata; + struct scheduler *old_ops; + void *old_domdata; domdata = SCHED_OP(c->sched, alloc_domdata, d); if ( domdata == NULL ) @@ -261,21 +264,22 @@ int sched_move_domain(struct domain *d, struct cpupool *c) domain_pause(d); + old_ops = DOM2OP(d); + old_domdata = d->sched_priv; + for_each_vcpu ( d, v ) { - SCHED_OP(VCPU2OP(v), remove_vcpu, v); - SCHED_OP(VCPU2OP(v), free_vdata, v->sched_priv); - v->sched_priv = NULL; + SCHED_OP(old_ops, remove_vcpu, v); } - SCHED_OP(DOM2OP(d), free_domdata, d->sched_priv); - d->cpupool = c; d->sched_priv = domdata; new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + vcpudata = v->sched_priv; + migrate_timer(&v->periodic_timer, new_p); migrate_timer(&v->singleshot_timer, new_p); migrate_timer(&v->poll_timer, new_p); @@ -288,12 +292,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_cycle(new_p, c->cpu_valid); SCHED_OP(c->sched, insert_vcpu, v); + + SCHED_OP(old_ops, free_vdata, vcpudata); } domain_update_node_affinity(d); domain_unpause(d); + SCHED_OP(old_ops, free_domdata, old_domdata); + xfree(vcpu_priv); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFief-0008Sj-G5; Wed, 13 Mar 2013 10:11:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFied-0008SR-Qj for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:28 +0000 Received: from [193.109.254.147:45726] by server-2.bemta-14.messagelabs.com id 3E/EB-14115-FC050415; Wed, 13 Mar 2013 10:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1363169464!6253265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5051 invoked from network); 13 Mar 2013 10:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieG-0005oV-3n for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFieF-00062O-Na for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:03 +0000 Date: Wed, 13 Mar 2013 10:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] vmx: fix handling of NMI VMEXIT. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0058d3973c3f699b09c45ae20c93156e28192c9 Author: Tim Deegan AuthorDate: Tue Mar 12 16:10:23 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:10:23 2013 +0100 vmx: fix handling of NMI VMEXIT. Call do_nmi() directly and explicitly re-enable NMIs rather than raising an NMI through the APIC. Since NMIs are disabled after the VMEXIT, the raised NMI would be blocked until the next IRET instruction (i.e. the next real interrupt, or after scheduling a PV guest) and in the meantime the guest will spin taking NMI VMEXITS. Also, handle NMIs before re-enabling interrupts, since if we handle an interrupt (and therefore IRET) before calling do_nmi(), we may end up running the NMI handler with NMIs enabled. Signed-off-by: Tim Deegan Acked-by: Andrew Cooper Acked-by: Jan Beulich master changeset: 7dd3b06ff031c9a8c727df16c5def2afb382101c master date: 2013-02-28 14:00:18 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++++++- xen/arch/x86/x86_32/entry.S | 10 +++++++++- xen/arch/x86/x86_64/entry.S | 16 ++++++++++++++++ xen/include/asm-x86/processor.h | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index ca92b86..de6340d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2311,6 +2311,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + if ( vector == TRAP_nmi + && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8)) ) + { + do_nmi(regs); + enable_nmis(); + } break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2484,7 +2491,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + /* Already handled above. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index 2982679..ae7a1b2 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -621,6 +621,14 @@ ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce +/* Enable NMIs. No special register assumptions. All registers are preserved. */ +ENTRY(enable_nmis) + /* Set up stack frame */ + pushf # EFLAGS + push %cs # CS + push $.Lret # EIP + iret # Disable the hardware NMI latch + ENTRY(setup_vm86_frame) mov %ecx,%ds mov %ecx,%es @@ -634,7 +642,7 @@ ENTRY(setup_vm86_frame) .endm copy_vm86_words addl $16,%esp - ret +.Lret: ret .section .rodata, "a", @progbits diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 997bc94..abc5037 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -643,6 +643,22 @@ ENTRY(machine_check) movl $TRAP_machine_check,4(%rsp) jmp handle_ist_exception +/* Enable NMIs. No special register assumptions. Only %rax is not preserved. */ +ENTRY(enable_nmis) + movq %rsp, %rax /* Grab RSP before pushing */ + + /* Set up stack frame */ + pushq $0 /* SS */ + pushq %rax /* RSP */ + pushfq /* RFLAGS */ + pushq $__HYPERVISOR_CS /* CS */ + leaq 1f(%rip),%rax + pushq %rax /* RIP */ + + iretq /* Disable the hardware NMI latch */ +1: + retq + .section .rodata, "a", @progbits ENTRY(exception_table) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 7164a50..4ce47eb 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -584,6 +584,8 @@ DECLARE_TRAP_HANDLER(alignment_check); DECLARE_TRAP_HANDLER(spurious_interrupt_bug); #undef DECLARE_TRAP_HANDLER +void enable_nmis(void); + void syscall_enter(void); void sysenter_entry(void); void sysenter_eflags_saved(void); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFief-0008Sj-G5; Wed, 13 Mar 2013 10:11:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFied-0008SR-Qj for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:28 +0000 Received: from [193.109.254.147:45726] by server-2.bemta-14.messagelabs.com id 3E/EB-14115-FC050415; Wed, 13 Mar 2013 10:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1363169464!6253265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5051 invoked from network); 13 Mar 2013 10:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieG-0005oV-3n for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFieF-00062O-Na for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:03 +0000 Date: Wed, 13 Mar 2013 10:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] vmx: fix handling of NMI VMEXIT. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0058d3973c3f699b09c45ae20c93156e28192c9 Author: Tim Deegan AuthorDate: Tue Mar 12 16:10:23 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:10:23 2013 +0100 vmx: fix handling of NMI VMEXIT. Call do_nmi() directly and explicitly re-enable NMIs rather than raising an NMI through the APIC. Since NMIs are disabled after the VMEXIT, the raised NMI would be blocked until the next IRET instruction (i.e. the next real interrupt, or after scheduling a PV guest) and in the meantime the guest will spin taking NMI VMEXITS. Also, handle NMIs before re-enabling interrupts, since if we handle an interrupt (and therefore IRET) before calling do_nmi(), we may end up running the NMI handler with NMIs enabled. Signed-off-by: Tim Deegan Acked-by: Andrew Cooper Acked-by: Jan Beulich master changeset: 7dd3b06ff031c9a8c727df16c5def2afb382101c master date: 2013-02-28 14:00:18 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++++++- xen/arch/x86/x86_32/entry.S | 10 +++++++++- xen/arch/x86/x86_64/entry.S | 16 ++++++++++++++++ xen/include/asm-x86/processor.h | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index ca92b86..de6340d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2311,6 +2311,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + if ( vector == TRAP_nmi + && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8)) ) + { + do_nmi(regs); + enable_nmis(); + } break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2484,7 +2491,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + /* Already handled above. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index 2982679..ae7a1b2 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -621,6 +621,14 @@ ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce +/* Enable NMIs. No special register assumptions. All registers are preserved. */ +ENTRY(enable_nmis) + /* Set up stack frame */ + pushf # EFLAGS + push %cs # CS + push $.Lret # EIP + iret # Disable the hardware NMI latch + ENTRY(setup_vm86_frame) mov %ecx,%ds mov %ecx,%es @@ -634,7 +642,7 @@ ENTRY(setup_vm86_frame) .endm copy_vm86_words addl $16,%esp - ret +.Lret: ret .section .rodata, "a", @progbits diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 997bc94..abc5037 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -643,6 +643,22 @@ ENTRY(machine_check) movl $TRAP_machine_check,4(%rsp) jmp handle_ist_exception +/* Enable NMIs. No special register assumptions. Only %rax is not preserved. */ +ENTRY(enable_nmis) + movq %rsp, %rax /* Grab RSP before pushing */ + + /* Set up stack frame */ + pushq $0 /* SS */ + pushq %rax /* RSP */ + pushfq /* RFLAGS */ + pushq $__HYPERVISOR_CS /* CS */ + leaq 1f(%rip),%rax + pushq %rax /* RIP */ + + iretq /* Disable the hardware NMI latch */ +1: + retq + .section .rodata, "a", @progbits ENTRY(exception_table) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 7164a50..4ce47eb 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -584,6 +584,8 @@ DECLARE_TRAP_HANDLER(alignment_check); DECLARE_TRAP_HANDLER(spurious_interrupt_bug); #undef DECLARE_TRAP_HANDLER +void enable_nmis(void); + void syscall_enter(void); void sysenter_entry(void); void sysenter_eflags_saved(void); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieg-0008TC-It; Wed, 13 Mar 2013 10:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFief-0008Sd-Cr for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:29 +0000 Received: from [85.158.139.83:46437] by server-2.bemta-5.messagelabs.com id 37/F4-23989-0D050415; Wed, 13 Mar 2013 10:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1363169485!24349639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2603 invoked from network); 13 Mar 2013 10:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieb-0005ok-31 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFiea-00063s-QV for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:24 +0000 Date: Wed, 13 Mar 2013 10:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] fix compat memory exchange op splitting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79f0ba3e7dc6176fc44dad5093f981f9a230ac9e Author: Jan Beulich AuthorDate: Tue Mar 12 16:12:52 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:12:52 2013 +0100 fix compat memory exchange op splitting A shift with a negative count was erroneously used here, yielding undefined behavior. Reported-by: Xi Wang Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: 53decd322157e922cac2988e07da6d39538c8033 master date: 2013-03-01 16:59:49 +0100 --- xen/common/compat/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 308017a..1f94d4f 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -172,7 +172,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) if ( order_delta >= 0 ) nat.xchg->out.nr_extents = end_extent >> order_delta; else - nat.xchg->out.nr_extents = end_extent << order_delta; + nat.xchg->out.nr_extents = end_extent << -order_delta; ++split; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieg-0008TC-It; Wed, 13 Mar 2013 10:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFief-0008Sd-Cr for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:29 +0000 Received: from [85.158.139.83:46437] by server-2.bemta-5.messagelabs.com id 37/F4-23989-0D050415; Wed, 13 Mar 2013 10:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1363169485!24349639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2603 invoked from network); 13 Mar 2013 10:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFieb-0005ok-31 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFiea-00063s-QV for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:24 +0000 Date: Wed, 13 Mar 2013 10:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] fix compat memory exchange op splitting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79f0ba3e7dc6176fc44dad5093f981f9a230ac9e Author: Jan Beulich AuthorDate: Tue Mar 12 16:12:52 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:12:52 2013 +0100 fix compat memory exchange op splitting A shift with a negative count was erroneously used here, yielding undefined behavior. Reported-by: Xi Wang Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: 53decd322157e922cac2988e07da6d39538c8033 master date: 2013-03-01 16:59:49 +0100 --- xen/common/compat/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 308017a..1f94d4f 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -172,7 +172,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) if ( order_delta >= 0 ) nat.xchg->out.nr_extents = end_extent >> order_delta; else - nat.xchg->out.nr_extents = end_extent << order_delta; + nat.xchg->out.nr_extents = end_extent << -order_delta; ++split; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11: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 1UFif3-00005o-MY; Wed, 13 Mar 2013 10:11:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFif3-00005e-6m for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:53 +0000 Received: from [85.158.137.99:23855] by server-8.bemta-3.messagelabs.com id 72/AF-20604-8E050415; Wed, 13 Mar 2013 10:11:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1363169506!13084307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13884 invoked from network); 13 Mar 2013 10:11:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiev-0005ov-Sh for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFiev-00064h-Hp for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:45 +0000 Date: Wed, 13 Mar 2013 10:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] SEDF: avoid gathering vCPU-s on pCPU0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 69a5f4dc9357b4693c471c50f429211c8c00bc7b Author: Jan Beulich AuthorDate: Tue Mar 12 16:15:18 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:15:18 2013 +0100 SEDF: avoid gathering vCPU-s on pCPU0 The introduction of vcpu_force_reschedule() in 14320:215b799fa181 was incompatible with the SEDF scheduler: Any vCPU using VCPUOP_stop_periodic_timer (e.g. any vCPU of half way modern PV Linux guests) ends up on pCPU0 after that call. Obviously, running all PV guests' (and namely Dom0's) vCPU-s on pCPU0 causes problems for those guests rather sooner than later. So the main thing that was clearly wrong (and bogus from the beginning) was the use of cpumask_first() in sedf_pick_cpu(). It is being replaced by a construct that prefers to put back the vCPU on the pCPU that it got launched on. However, there's one more glitch: When reducing the affinity of a vCPU temporarily, and then widening it again to a set that includes the pCPU that the vCPU was last running on, the generic scheduler code would not force a migration of that vCPU, and hence it would forever stay on the pCPU it last ran on. Since that can again create a load imbalance, the SEDF scheduler wants a migration to happen regardless of it being apparently unnecessary. Of course, an alternative to checking for SEDF explicitly in vcpu_set_affinity() would be to introduce a flags field in struct scheduler, and have SEDF set a "always-migrate-on-affinity-change" flag. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/sched_sedf.c | 3 ++- xen/common/schedule.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 644787b..92ba36a 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -396,7 +396,8 @@ static int sedf_pick_cpu(const struct scheduler *ops, struct vcpu *v) online = cpupool_scheduler_cpumask(v->domain->cpupool); cpumask_and(&online_affinity, v->cpu_affinity, online); - return cpumask_first(&online_affinity); + return cpumask_cycle(v->vcpu_id % cpumask_weight(&online_affinity) - 1, + &online_affinity); } /* diff --git a/xen/common/schedule.c b/xen/common/schedule.c index b82b4fe..c2cd9d5 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -611,7 +611,8 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); - if ( !cpumask_test_cpu(v->processor, v->cpu_affinity) ) + if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || + !cpumask_test_cpu(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:11:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:11: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 1UFif3-00005o-MY; Wed, 13 Mar 2013 10:11:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFif3-00005e-6m for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:53 +0000 Received: from [85.158.137.99:23855] by server-8.bemta-3.messagelabs.com id 72/AF-20604-8E050415; Wed, 13 Mar 2013 10:11:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1363169506!13084307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13884 invoked from network); 13 Mar 2013 10:11:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiev-0005ov-Sh for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFiev-00064h-Hp for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:45 +0000 Date: Wed, 13 Mar 2013 10:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] SEDF: avoid gathering vCPU-s on pCPU0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 69a5f4dc9357b4693c471c50f429211c8c00bc7b Author: Jan Beulich AuthorDate: Tue Mar 12 16:15:18 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:15:18 2013 +0100 SEDF: avoid gathering vCPU-s on pCPU0 The introduction of vcpu_force_reschedule() in 14320:215b799fa181 was incompatible with the SEDF scheduler: Any vCPU using VCPUOP_stop_periodic_timer (e.g. any vCPU of half way modern PV Linux guests) ends up on pCPU0 after that call. Obviously, running all PV guests' (and namely Dom0's) vCPU-s on pCPU0 causes problems for those guests rather sooner than later. So the main thing that was clearly wrong (and bogus from the beginning) was the use of cpumask_first() in sedf_pick_cpu(). It is being replaced by a construct that prefers to put back the vCPU on the pCPU that it got launched on. However, there's one more glitch: When reducing the affinity of a vCPU temporarily, and then widening it again to a set that includes the pCPU that the vCPU was last running on, the generic scheduler code would not force a migration of that vCPU, and hence it would forever stay on the pCPU it last ran on. Since that can again create a load imbalance, the SEDF scheduler wants a migration to happen regardless of it being apparently unnecessary. Of course, an alternative to checking for SEDF explicitly in vcpu_set_affinity() would be to introduce a flags field in struct scheduler, and have SEDF set a "always-migrate-on-affinity-change" flag. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/sched_sedf.c | 3 ++- xen/common/schedule.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 644787b..92ba36a 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -396,7 +396,8 @@ static int sedf_pick_cpu(const struct scheduler *ops, struct vcpu *v) online = cpupool_scheduler_cpumask(v->domain->cpupool); cpumask_and(&online_affinity, v->cpu_affinity, online); - return cpumask_first(&online_affinity); + return cpumask_cycle(v->vcpu_id % cpumask_weight(&online_affinity) - 1, + &online_affinity); } /* diff --git a/xen/common/schedule.c b/xen/common/schedule.c index b82b4fe..c2cd9d5 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -611,7 +611,8 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); - if ( !cpumask_test_cpu(v->processor, v->cpu_affinity) ) + if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || + !cpumask_test_cpu(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10: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 1UFifJ-00009A-R2; Wed, 13 Mar 2013 10:12:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifJ-00008r-4q for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:09 +0000 Received: from [85.158.143.99:64106] by server-1.bemta-4.messagelabs.com id C3/BB-06203-8F050415; Wed, 13 Mar 2013 10:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1363169526!17067723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27799 invoked from network); 13 Mar 2013 10:12:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifG-0005pa-GL for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifG-00065a-6w for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:06 +0000 Date: Wed, 13 Mar 2013 10:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] credit1: Use atomic bit operations for the flags structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48892d024a219e8a8bcc09f82046c454169bae96 Author: George Dunlap AuthorDate: Tue Mar 12 16:17:23 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:17:23 2013 +0100 credit1: Use atomic bit operations for the flags structure The flags structure is not protected by locks (or more precisely, it is protected using an inconsistent set of locks); we therefore need to make sure that all accesses are atomic-safe. This is particulary important in the case of the PARKED flag, which if clobbered while changing the YIELD bit will leave a vcpu wedged in an offline state. Using the atomic bitops also requires us to change the size of the "flags" element. Spotted-by: Igor Pavlikevich Signed-off-by: George Dunlap master changeset: be6507509454adf3bb5a50b9406c88504e996d5a master date: 2013-03-04 13:37:39 +0100 --- xen/common/sched_credit.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7df2699..68dc80b 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -58,8 +58,8 @@ /* * Flags */ -#define CSCHED_FLAG_VCPU_PARKED 0x0001 /* VCPU over capped credits */ -#define CSCHED_FLAG_VCPU_YIELD 0x0002 /* VCPU yielding */ +#define CSCHED_FLAG_VCPU_PARKED 0x0 /* VCPU over capped credits */ +#define CSCHED_FLAG_VCPU_YIELD 0x1 /* VCPU yielding */ /* @@ -132,7 +132,7 @@ struct csched_vcpu { struct vcpu *vcpu; atomic_t credit; s_time_t start_time; /* When we were scheduled (used for credit) */ - uint16_t flags; + unsigned flags; int16_t pri; #ifdef CSCHED_STATS struct { @@ -214,7 +214,7 @@ __runq_insert(unsigned int cpu, struct csched_vcpu *svc) /* If the vcpu yielded, try to put it behind one lower-priority * runnable vcpu if we can. The next runq_sort will bring it forward * within 30ms if the queue too long. */ - if ( svc->flags & CSCHED_FLAG_VCPU_YIELD + if ( test_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags) && __runq_elem(iter)->pri > CSCHED_PRI_IDLE ) { iter=iter->next; @@ -776,7 +776,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) * those. */ if ( svc->pri == CSCHED_PRI_TS_UNDER && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { svc->pri = CSCHED_PRI_TS_BOOST; } @@ -789,12 +789,12 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) static void csched_vcpu_yield(const struct scheduler *ops, struct vcpu *vc) { - struct csched_vcpu * const sv = CSCHED_VCPU(vc); + struct csched_vcpu * const svc = CSCHED_VCPU(vc); if ( !sched_credit_default_yield ) { /* Let the scheduler know that this vcpu is trying to yield */ - sv->flags |= CSCHED_FLAG_VCPU_YIELD; + set_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags); } } @@ -1122,11 +1122,10 @@ csched_acct(void* dummy) /* Park running VCPUs of capped-out domains */ if ( sdom->cap != 0U && credit < -credit_cap && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_and_set_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { CSCHED_STAT_CRANK(vcpu_park); vcpu_pause_nosync(svc->vcpu); - svc->flags |= CSCHED_FLAG_VCPU_PARKED; } /* Lower bound on credits */ @@ -1142,7 +1141,7 @@ csched_acct(void* dummy) svc->pri = CSCHED_PRI_TS_UNDER; /* Unpark any capped domains whose credits go positive */ - if ( svc->flags & CSCHED_FLAG_VCPU_PARKED) + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { /* * It's important to unset the flag AFTER the unpause() @@ -1151,7 +1150,6 @@ csched_acct(void* dummy) */ CSCHED_STAT_CRANK(vcpu_unpark); vcpu_unpause(svc->vcpu); - svc->flags &= ~CSCHED_FLAG_VCPU_PARKED; } /* Upper bound on credits means VCPU stops earning */ @@ -1410,8 +1408,7 @@ csched_schedule( /* * Clear YIELD flag before scheduling out */ - if ( scurr->flags & CSCHED_FLAG_VCPU_YIELD ) - scurr->flags &= ~(CSCHED_FLAG_VCPU_YIELD); + clear_bit(CSCHED_FLAG_VCPU_YIELD, &scurr->flags); /* * SMP Load balance: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10: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 1UFifJ-00009A-R2; Wed, 13 Mar 2013 10:12:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifJ-00008r-4q for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:09 +0000 Received: from [85.158.143.99:64106] by server-1.bemta-4.messagelabs.com id C3/BB-06203-8F050415; Wed, 13 Mar 2013 10:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1363169526!17067723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27799 invoked from network); 13 Mar 2013 10:12:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifG-0005pa-GL for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifG-00065a-6w for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:06 +0000 Date: Wed, 13 Mar 2013 10:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] credit1: Use atomic bit operations for the flags structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48892d024a219e8a8bcc09f82046c454169bae96 Author: George Dunlap AuthorDate: Tue Mar 12 16:17:23 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:17:23 2013 +0100 credit1: Use atomic bit operations for the flags structure The flags structure is not protected by locks (or more precisely, it is protected using an inconsistent set of locks); we therefore need to make sure that all accesses are atomic-safe. This is particulary important in the case of the PARKED flag, which if clobbered while changing the YIELD bit will leave a vcpu wedged in an offline state. Using the atomic bitops also requires us to change the size of the "flags" element. Spotted-by: Igor Pavlikevich Signed-off-by: George Dunlap master changeset: be6507509454adf3bb5a50b9406c88504e996d5a master date: 2013-03-04 13:37:39 +0100 --- xen/common/sched_credit.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7df2699..68dc80b 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -58,8 +58,8 @@ /* * Flags */ -#define CSCHED_FLAG_VCPU_PARKED 0x0001 /* VCPU over capped credits */ -#define CSCHED_FLAG_VCPU_YIELD 0x0002 /* VCPU yielding */ +#define CSCHED_FLAG_VCPU_PARKED 0x0 /* VCPU over capped credits */ +#define CSCHED_FLAG_VCPU_YIELD 0x1 /* VCPU yielding */ /* @@ -132,7 +132,7 @@ struct csched_vcpu { struct vcpu *vcpu; atomic_t credit; s_time_t start_time; /* When we were scheduled (used for credit) */ - uint16_t flags; + unsigned flags; int16_t pri; #ifdef CSCHED_STATS struct { @@ -214,7 +214,7 @@ __runq_insert(unsigned int cpu, struct csched_vcpu *svc) /* If the vcpu yielded, try to put it behind one lower-priority * runnable vcpu if we can. The next runq_sort will bring it forward * within 30ms if the queue too long. */ - if ( svc->flags & CSCHED_FLAG_VCPU_YIELD + if ( test_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags) && __runq_elem(iter)->pri > CSCHED_PRI_IDLE ) { iter=iter->next; @@ -776,7 +776,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) * those. */ if ( svc->pri == CSCHED_PRI_TS_UNDER && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { svc->pri = CSCHED_PRI_TS_BOOST; } @@ -789,12 +789,12 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) static void csched_vcpu_yield(const struct scheduler *ops, struct vcpu *vc) { - struct csched_vcpu * const sv = CSCHED_VCPU(vc); + struct csched_vcpu * const svc = CSCHED_VCPU(vc); if ( !sched_credit_default_yield ) { /* Let the scheduler know that this vcpu is trying to yield */ - sv->flags |= CSCHED_FLAG_VCPU_YIELD; + set_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags); } } @@ -1122,11 +1122,10 @@ csched_acct(void* dummy) /* Park running VCPUs of capped-out domains */ if ( sdom->cap != 0U && credit < -credit_cap && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_and_set_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { CSCHED_STAT_CRANK(vcpu_park); vcpu_pause_nosync(svc->vcpu); - svc->flags |= CSCHED_FLAG_VCPU_PARKED; } /* Lower bound on credits */ @@ -1142,7 +1141,7 @@ csched_acct(void* dummy) svc->pri = CSCHED_PRI_TS_UNDER; /* Unpark any capped domains whose credits go positive */ - if ( svc->flags & CSCHED_FLAG_VCPU_PARKED) + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { /* * It's important to unset the flag AFTER the unpause() @@ -1151,7 +1150,6 @@ csched_acct(void* dummy) */ CSCHED_STAT_CRANK(vcpu_unpark); vcpu_unpause(svc->vcpu); - svc->flags &= ~CSCHED_FLAG_VCPU_PARKED; } /* Upper bound on credits means VCPU stops earning */ @@ -1410,8 +1408,7 @@ csched_schedule( /* * Clear YIELD flag before scheduling out */ - if ( scurr->flags & CSCHED_FLAG_VCPU_YIELD ) - scurr->flags &= ~(CSCHED_FLAG_VCPU_YIELD); + clear_bit(CSCHED_FLAG_VCPU_YIELD, &scurr->flags); /* * SMP Load balance: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifK-00009k-WF; Wed, 13 Mar 2013 10: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 1UFifJ-00008z-Nj for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:09 +0000 Received: from [85.158.139.211:3953] by server-11.bemta-5.messagelabs.com id D1/2B-27486-9F050415; Wed, 13 Mar 2013 10:12:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1363169495!18002882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20564 invoked from network); 13 Mar 2013 10:11:44 -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; 13 Mar 2013 10:11:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiel-0005oq-Cp for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFiel-00064I-7y for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:35 +0000 Date: Wed, 13 Mar 2013 10:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: make certain memory sub-ops return valid values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 957c5525c67c392bf529aff680f9a166389749ee Author: Jan Beulich AuthorDate: Tue Mar 12 16:13:54 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:13:54 2013 +0100 x86: make certain memory sub-ops return valid values When a domain's shared info field "max_pfn" is zero, domain_get_maximum_gpfn() so far returned ULONG_MAX, which do_memory_op() in turn converted to -1 (i.e. -EPERM). Make the former always return a sensible number (i.e. zero if the field was zero) and have the latter no longer truncate return values. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master changeset: 7ffc9779aa5120c5098d938cb88f69a1dda9a0fe master date: 2013-03-04 10:16:04 +0100 --- xen/arch/x86/mm.c | 2 +- xen/common/compat/memory.c | 11 +++++++++-- xen/common/memory.c | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index fb0798f..1aeacbd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -433,7 +433,7 @@ unsigned long domain_get_maximum_gpfn(struct domain *d) if ( is_hvm_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ - return arch_get_max_pfn(d) - 1; + return (arch_get_max_pfn(d) ?: 1) - 1; } void share_xen_page_with_guest( diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 1f94d4f..2355cb9 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -15,7 +15,8 @@ CHECK_TYPE(domid); int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) { - int rc, split, op = cmd & MEMOP_CMD_MASK; + int split, op = cmd & MEMOP_CMD_MASK; + long rc; unsigned int start_extent = cmd >> MEMOP_EXTENT_SHIFT; do @@ -204,7 +205,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) rc = do_memory_op(cmd, nat.hnd); if ( rc < 0 ) - return rc; + break; cmd = 0; if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) @@ -318,5 +319,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) __HYPERVISOR_memory_op, "ih", cmd, compat); } while ( split > 0 ); + if ( unlikely(rc > INT_MAX) ) + return INT_MAX; + + if ( unlikely(rc < INT_MIN) ) + return INT_MIN; + return rc; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 0cb65ae..a515d1d 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -532,14 +532,13 @@ static long memory_exchange(XEN_GUEST_HANDLE(xen_memory_exchange_t) arg) long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg) { struct domain *d; - int rc, op; + long rc; unsigned int address_bits; unsigned long start_extent; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; - - op = cmd & MEMOP_CMD_MASK; + int op = cmd & MEMOP_CMD_MASK; switch ( op ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifK-00009k-WF; Wed, 13 Mar 2013 10: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 1UFifJ-00008z-Nj for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:09 +0000 Received: from [85.158.139.211:3953] by server-11.bemta-5.messagelabs.com id D1/2B-27486-9F050415; Wed, 13 Mar 2013 10:12:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1363169495!18002882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20564 invoked from network); 13 Mar 2013 10:11:44 -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; 13 Mar 2013 10:11:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFiel-0005oq-Cp for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFiel-00064I-7y for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:35 +0000 Date: Wed, 13 Mar 2013 10:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: make certain memory sub-ops return valid values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 957c5525c67c392bf529aff680f9a166389749ee Author: Jan Beulich AuthorDate: Tue Mar 12 16:13:54 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:13:54 2013 +0100 x86: make certain memory sub-ops return valid values When a domain's shared info field "max_pfn" is zero, domain_get_maximum_gpfn() so far returned ULONG_MAX, which do_memory_op() in turn converted to -1 (i.e. -EPERM). Make the former always return a sensible number (i.e. zero if the field was zero) and have the latter no longer truncate return values. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master changeset: 7ffc9779aa5120c5098d938cb88f69a1dda9a0fe master date: 2013-03-04 10:16:04 +0100 --- xen/arch/x86/mm.c | 2 +- xen/common/compat/memory.c | 11 +++++++++-- xen/common/memory.c | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index fb0798f..1aeacbd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -433,7 +433,7 @@ unsigned long domain_get_maximum_gpfn(struct domain *d) if ( is_hvm_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ - return arch_get_max_pfn(d) - 1; + return (arch_get_max_pfn(d) ?: 1) - 1; } void share_xen_page_with_guest( diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 1f94d4f..2355cb9 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -15,7 +15,8 @@ CHECK_TYPE(domid); int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) { - int rc, split, op = cmd & MEMOP_CMD_MASK; + int split, op = cmd & MEMOP_CMD_MASK; + long rc; unsigned int start_extent = cmd >> MEMOP_EXTENT_SHIFT; do @@ -204,7 +205,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) rc = do_memory_op(cmd, nat.hnd); if ( rc < 0 ) - return rc; + break; cmd = 0; if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) @@ -318,5 +319,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) __HYPERVISOR_memory_op, "ih", cmd, compat); } while ( split > 0 ); + if ( unlikely(rc > INT_MAX) ) + return INT_MAX; + + if ( unlikely(rc < INT_MIN) ) + return INT_MIN; + return rc; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 0cb65ae..a515d1d 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -532,14 +532,13 @@ static long memory_exchange(XEN_GUEST_HANDLE(xen_memory_exchange_t) arg) long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg) { struct domain *d; - int rc, op; + long rc; unsigned int address_bits; unsigned long start_extent; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; - - op = cmd & MEMOP_CMD_MASK; + int op = cmd & MEMOP_CMD_MASK; switch ( op ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifa-0000DS-39; Wed, 13 Mar 2013 10:12:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifY-0000Cy-Fm for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:24 +0000 Received: from [85.158.143.99:2337] by server-2.bemta-4.messagelabs.com id 70/F9-12656-70150415; Wed, 13 Mar 2013 10:12:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1363169536!18457853!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22406 invoked from network); 13 Mar 2013 10:12:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifQ-0005pn-N9 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifQ-00065z-KZ for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:16 +0000 Date: Wed, 13 Mar 2013 10:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xentrace: fix off-by-one in calculate_tbuf_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 16c5ea879748ea07d62aa9592d8f25f5850ea8f4 Author: Olaf Hering AuthorDate: Tue Mar 12 16:18:02 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:18:02 2013 +0100 xentrace: fix off-by-one in calculate_tbuf_size Commit "xentrace: reduce trace buffer size to something mfn_offset can reach" contains an off-by-one bug. max_mfn_offset needs to be reduced by exactly the value of t_info_first_offset. If the system has two cpus and the number of requested trace pages is very large, the final number of trace pages + the offset will not fit into a short. As a result the variable offset in alloc_trace_bufs() will wrap while allocating buffers for the second cpu. Later share_xen_page_with_privileged_guests() will be called with a wrong page and the ASSERT in this function triggers. If the ASSERT is ignored by running a non-dbg hypervisor the asserts in xentrace itself trigger because "cons" is not aligned because the very last trace page for the second cpu is a random mfn. Thanks to Jan for the quick analysis. Signed-off-by: Olaf Hering Acked-by: George Dunlap master changeset: d9fb28ae6d41c8201482948660e52889481830dd master date: 2013-03-04 13:42:17 +0100 --- xen/common/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/trace.c b/xen/common/trace.c index cacaeb2..cc0b2e0 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -133,7 +133,7 @@ static int calculate_tbuf_size(unsigned int pages, uint16_t t_info_first_offset) * The array of mfns for the highest cpu can start at the maximum value * mfn_offset can hold. So reduce the number of cpus and also the mfn_offset. */ - max_mfn_offset -= t_info_first_offset - 1; + max_mfn_offset -= t_info_first_offset; max_cpus--; if ( max_cpus ) max_mfn_offset /= max_cpus; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifa-0000DS-39; Wed, 13 Mar 2013 10:12:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifY-0000Cy-Fm for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:24 +0000 Received: from [85.158.143.99:2337] by server-2.bemta-4.messagelabs.com id 70/F9-12656-70150415; Wed, 13 Mar 2013 10:12:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1363169536!18457853!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22406 invoked from network); 13 Mar 2013 10:12:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifQ-0005pn-N9 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifQ-00065z-KZ for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:16 +0000 Date: Wed, 13 Mar 2013 10:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xentrace: fix off-by-one in calculate_tbuf_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 16c5ea879748ea07d62aa9592d8f25f5850ea8f4 Author: Olaf Hering AuthorDate: Tue Mar 12 16:18:02 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:18:02 2013 +0100 xentrace: fix off-by-one in calculate_tbuf_size Commit "xentrace: reduce trace buffer size to something mfn_offset can reach" contains an off-by-one bug. max_mfn_offset needs to be reduced by exactly the value of t_info_first_offset. If the system has two cpus and the number of requested trace pages is very large, the final number of trace pages + the offset will not fit into a short. As a result the variable offset in alloc_trace_bufs() will wrap while allocating buffers for the second cpu. Later share_xen_page_with_privileged_guests() will be called with a wrong page and the ASSERT in this function triggers. If the ASSERT is ignored by running a non-dbg hypervisor the asserts in xentrace itself trigger because "cons" is not aligned because the very last trace page for the second cpu is a random mfn. Thanks to Jan for the quick analysis. Signed-off-by: Olaf Hering Acked-by: George Dunlap master changeset: d9fb28ae6d41c8201482948660e52889481830dd master date: 2013-03-04 13:42:17 +0100 --- xen/common/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/trace.c b/xen/common/trace.c index cacaeb2..cc0b2e0 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -133,7 +133,7 @@ static int calculate_tbuf_size(unsigned int pages, uint16_t t_info_first_offset) * The array of mfns for the highest cpu can start at the maximum value * mfn_offset can hold. So reduce the number of cpus and also the mfn_offset. */ - max_mfn_offset -= t_info_first_offset - 1; + max_mfn_offset -= t_info_first_offset; max_cpus--; if ( max_cpus ) max_mfn_offset /= max_cpus; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifr-0000Gp-6e; Wed, 13 Mar 2013 10:12:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifq-0000GR-CS for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:42 +0000 Received: from [193.109.254.147:13119] by server-6.bemta-14.messagelabs.com id 4A/5F-31180-91150415; Wed, 13 Mar 2013 10:12:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1363169547!8646542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20063 invoked from network); 13 Mar 2013 10:12:28 -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; 13 Mar 2013 10:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifa-0005ps-WF for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifa-00066z-Qx for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:26 +0000 Date: Wed, 13 Mar 2013 10:12:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] fix domain unlocking in some xsm error paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56c501682d9664106bd933d2082d15f80d4eecbc Author: Matthew Daley AuthorDate: Tue Mar 12 16:18:45 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:18:45 2013 +0100 fix domain unlocking in some xsm error paths A couple of xsm error/access-denied code paths in hypercalls neglect to unlock a previously locked domain. Fix by ensuring the domains are unlocked correctly. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Acked-by: Keir Fraser master changeset: 9581c4f9a55372a21e759cd449cb676d0e8feddb master date: 2013-03-06 17:10:26 +0100 --- xen/common/grant_table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 6fb2be9..0e349cc 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2262,7 +2262,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE(gnttab_get_status_frames_t) uop, rc = xsm_grant_setup(current->domain, d); if ( rc ) { op.status = GNTST_permission_denied; - goto out1; + goto out2; } gt = d->grant_table; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifr-0000Gp-6e; Wed, 13 Mar 2013 10:12:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifq-0000GR-CS for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:42 +0000 Received: from [193.109.254.147:13119] by server-6.bemta-14.messagelabs.com id 4A/5F-31180-91150415; Wed, 13 Mar 2013 10:12:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1363169547!8646542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20063 invoked from network); 13 Mar 2013 10:12:28 -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; 13 Mar 2013 10:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifa-0005ps-WF for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifa-00066z-Qx for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:26 +0000 Date: Wed, 13 Mar 2013 10:12:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] fix domain unlocking in some xsm error paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56c501682d9664106bd933d2082d15f80d4eecbc Author: Matthew Daley AuthorDate: Tue Mar 12 16:18:45 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:18:45 2013 +0100 fix domain unlocking in some xsm error paths A couple of xsm error/access-denied code paths in hypercalls neglect to unlock a previously locked domain. Fix by ensuring the domains are unlocked correctly. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Acked-by: Keir Fraser master changeset: 9581c4f9a55372a21e759cd449cb676d0e8feddb master date: 2013-03-06 17:10:26 +0100 --- xen/common/grant_table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 6fb2be9..0e349cc 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2262,7 +2262,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE(gnttab_get_status_frames_t) uop, rc = xsm_grant_setup(current->domain, d); if ( rc ) { op.status = GNTST_permission_denied; - goto out1; + goto out2; } gt = d->grant_table; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifs-0000HL-AA; Wed, 13 Mar 2013 10:12:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifq-0000GV-IA for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:43 +0000 Received: from [85.158.139.83:8021] by server-4.bemta-5.messagelabs.com id BB/BA-01980-91150415; Wed, 13 Mar 2013 10:12:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1363169557!27687247!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15512 invoked from network); 13 Mar 2013 10:12:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:12:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifl-0005px-6n for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifl-00067S-4M for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:37 +0000 Date: Wed, 13 Mar 2013 10:12:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc0cd6a23c6189667ab774edfebaae42544f4566 Author: Jan Beulich AuthorDate: Tue Mar 12 16:19:30 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:19:30 2013 +0100 x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses This adds two new physdev operations for Dom0 to invoke when resource allocation for devices is known to be complete, so that the hypervisor can arrange for the respective MMIO ranges to be marked read-only before an eventual guest getting such a device assigned even gets started, such that it won't be able to set up writable mappings for these MMIO ranges before Xen has a chance to protect them. This also addresses another issue with the code being modified here, in that so far write protection for the address ranges in question got set up only once during the lifetime of a device (i.e. until either system shutdown or device hot removal), while teardown happened when the last interrupt was disposed of by the guest (which at least allowed the tables to be writable when the device got assigned to a second guest [instance] after the first terminated). Signed-off-by: Jan Beulich master changeset: 4245d331e0e75de8d1bddbbb518f3a8ce6d0bb7e master date: 2013-03-08 14:05:34 +0100 --- xen/arch/x86/msi.c | 202 +++++++++++++++++++++++++++-------------- xen/arch/x86/physdev.c | 12 +++ xen/include/asm-x86/msi.h | 1 + xen/include/public/physdev.h | 6 ++ xen/include/xen/pci.h | 1 + 5 files changed, 153 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 7730641..54ec8e7 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -649,8 +649,8 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) * @entries: pointer to an array of struct msix_entry entries * @nvec: number of @entries * - * Setup the MSI-X capability structure of device function with a - * single MSI-X irq. A return of zero indicates the successful setup of + * Setup the MSI-X capability structure of device function with the requested + * number MSI-X irqs. A return of zero indicates the successful setup of * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, @@ -658,86 +658,69 @@ static int msix_capability_init(struct pci_dev *dev, struct msi_desc **desc, unsigned int nr_entries) { - struct msi_desc *entry; - int pos; + struct msi_desc *entry = NULL; + int pos, vf; u16 control; - u64 table_paddr, entry_paddr; - u32 table_offset, entry_offset; - u8 bir; - void __iomem *base; - int idx; + u64 table_paddr; + u32 table_offset; + u8 bir, pbus, pslot, pfunc; u16 seg = dev->seg; u8 bus = dev->bus; u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); ASSERT(spin_is_locked(&pcidevs_lock)); - ASSERT(desc); 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 */ - /* MSI-X Table Initialization */ - entry = alloc_msi_entry(); - if ( !entry ) - return -ENOMEM; + if ( desc ) + { + entry = alloc_msi_entry(); + if ( !entry ) + return -ENOMEM; + ASSERT(msi); + } - /* Request & Map MSI-X table region */ + /* Locate MSI-X table region */ table_offset = pci_conf_read32(seg, bus, slot, func, msix_table_offset_reg(pos)); bir = (u8)(table_offset & PCI_MSIX_BIRMASK); table_offset &= ~PCI_MSIX_BIRMASK; - entry_offset = msi->entry_nr * PCI_MSIX_ENTRY_SIZE; - table_paddr = msi->table_base + table_offset; - entry_paddr = table_paddr + entry_offset; - idx = msix_get_fixmap(dev, table_paddr, entry_paddr); - if ( idx < 0 ) + if ( !dev->info.is_virtfn ) { - xfree(entry); - return idx; + pbus = bus; + pslot = slot; + pfunc = func; + vf = -1; } - base = (void *)(fix_to_virt(idx) + - ((unsigned long)entry_paddr & ((1UL << PAGE_SHIFT) - 1))); - - entry->msi_attrib.type = PCI_CAP_ID_MSIX; - 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.pos = pos; - entry->irq = msi->irq; - entry->dev = dev; - entry->mask_base = base; - - list_add_tail(&entry->list, &dev->msi_list); - - if ( !dev->msix_nr_entries ) + else { - u8 pbus, pslot, pfunc; - int vf; - u64 pba_paddr; - u32 pba_offset; + pbus = dev->info.physfn.bus; + pslot = PCI_SLOT(dev->info.physfn.devfn); + pfunc = PCI_FUNC(dev->info.physfn.devfn); + vf = PCI_BDF2(dev->bus, dev->devfn); + } - if ( !dev->info.is_virtfn ) - { - pbus = bus; - pslot = slot; - pfunc = func; - vf = -1; - } - else + table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf); + WARN_ON(msi && msi->table_base != table_paddr); + if ( !table_paddr ) + { + if ( !msi || !msi->table_base ) { - pbus = dev->info.physfn.bus; - pslot = PCI_SLOT(dev->info.physfn.devfn); - pfunc = PCI_FUNC(dev->info.physfn.devfn); - vf = PCI_BDF2(dev->bus, dev->devfn); + xfree(entry); + return -ENXIO; } + table_paddr = msi->table_base; + } + table_paddr += table_offset; - ASSERT(!dev->msix_used_entries); - WARN_ON(msi->table_base != - read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf)); + if ( !dev->msix_used_entries ) + { + u64 pba_paddr; + u32 pba_offset; dev->msix_nr_entries = nr_entries; dev->msix_table.first = PFN_DOWN(table_paddr); @@ -758,7 +741,42 @@ static int msix_capability_init(struct pci_dev *dev, BITS_TO_LONGS(nr_entries) - 1); WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, dev->msix_pba.first, dev->msix_pba.last)); + } + if ( entry ) + { + /* Map MSI-X table region */ + u64 entry_paddr = table_paddr + msi->entry_nr * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(dev, table_paddr, entry_paddr); + void __iomem *base; + + if ( idx < 0 ) + { + xfree(entry); + return idx; + } + base = (void *)(fix_to_virt(idx) + + ((unsigned long)entry_paddr & (PAGE_SIZE - 1))); + + /* Mask interrupt here */ + writel(1, base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); + + entry->msi_attrib.type = PCI_CAP_ID_MSIX; + 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.pos = pos; + entry->irq = msi->irq; + entry->dev = dev; + entry->mask_base = base; + + list_add_tail(&entry->list, &dev->msi_list); + *desc = entry; + } + + if ( !dev->msix_used_entries ) + { if ( rangeset_add_range(mmio_ro_ranges, dev->msix_table.first, dev->msix_table.last) ) WARN(); @@ -769,7 +787,7 @@ static int msix_capability_init(struct pci_dev *dev, if ( dev->domain ) p2m_change_entry_type_global(dev->domain, p2m_mmio_direct, p2m_mmio_direct); - if ( !dev->domain || !paging_mode_translate(dev->domain) ) + if ( desc && (!dev->domain || !paging_mode_translate(dev->domain)) ) { struct domain *d = dev->domain; @@ -783,6 +801,13 @@ static int msix_capability_init(struct pci_dev *dev, break; if ( d ) { + if ( !IS_PRIV(d) && dev->msix_warned != d->domain_id ) + { + dev->msix_warned = d->domain_id; + printk(XENLOG_ERR + "Potentially insecure use of MSI-X on %04x:%02x:%02x.%u by Dom%d\n", + seg, bus, slot, func, d->domain_id); + } /* XXX How to deal with existing mappings? */ } } @@ -791,10 +816,6 @@ static int msix_capability_init(struct pci_dev *dev, WARN_ON(dev->msix_table.first != (table_paddr >> PAGE_SHIFT)); ++dev->msix_used_entries; - /* Mask interrupt here */ - writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); - - *desc = entry; /* Restore MSI-X enabled bits */ pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); @@ -919,6 +940,19 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) return status; } +static void _pci_cleanup_msix(struct pci_dev *dev) +{ + if ( !--dev->msix_used_entries ) + { + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, + dev->msix_table.last) ) + WARN(); + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, + dev->msix_pba.last) ) + WARN(); + } +} + static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev; @@ -942,15 +976,45 @@ static void __pci_disable_msix(struct msi_desc *entry) pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); - if ( !--dev->msix_used_entries ) + _pci_cleanup_msix(dev); +} + +int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off) +{ + int rc; + struct pci_dev *pdev; + u8 slot = PCI_SLOT(devfn), func = PCI_FUNC(devfn); + unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, + PCI_CAP_ID_MSIX); + + if ( !use_msi ) + return 0; + + if ( !pos ) + return -ENODEV; + + spin_lock(&pcidevs_lock); + pdev = pci_get_pdev(seg, bus, devfn); + if ( !pdev ) + rc = -ENODEV; + else if ( pdev->msix_used_entries != !!off ) + rc = -EBUSY; + else if ( off ) { - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, - dev->msix_table.last) ) - WARN(); - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, - dev->msix_pba.last) ) - WARN(); + _pci_cleanup_msix(pdev); + rc = 0; } + else + { + u16 control = pci_conf_read16(seg, bus, slot, func, + msix_control_reg(pos)); + + rc = msix_capability_init(pdev, NULL, NULL, + multi_msix_capable(control)); + } + spin_unlock(&pcidevs_lock); + + return rc; } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index ce55ee1..0c3ada1 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -608,6 +608,18 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg) break; } + case PHYSDEVOP_prepare_msix: + case PHYSDEVOP_release_msix: { + struct physdev_pci_device dev; + + if ( copy_from_guest(&dev, arg, 1) ) + ret = -EFAULT; + else + ret = pci_prepare_msix(dev.seg, dev.bus, dev.devfn, + cmd != PHYSDEVOP_prepare_msix); + break; + } + #ifdef __x86_64__ case PHYSDEVOP_pci_mmcfg_reserved: { struct physdev_pci_mmcfg_reserved info; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 4778420..a213fc5 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -80,6 +80,7 @@ struct msi_desc; /* Helper functions */ extern int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc); extern void pci_disable_msi(struct msi_desc *desc); +extern int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off); extern void pci_cleanup_msi(struct pci_dev *pdev); extern void setup_msi_handler(struct irq_desc *, struct msi_desc *); extern void setup_msi_irq(struct irq_desc *); diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index b78eeba..9356571 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -303,6 +303,12 @@ DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_add_t); #define PHYSDEVOP_pci_device_remove 26 #define PHYSDEVOP_restore_msi_ext 27 +/* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 struct physdev_pci_device { /* IN */ uint16_t seg; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index d302034..b4cd8fc 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -57,6 +57,7 @@ struct pci_dev { int msix_table_refcnt[MAX_MSIX_TABLE_PAGES]; int msix_table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t msix_table_lock; + domid_t msix_warned; struct domain *domain; const u16 seg; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:12:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:12: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 1UFifs-0000HL-AA; Wed, 13 Mar 2013 10:12:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifq-0000GV-IA for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:43 +0000 Received: from [85.158.139.83:8021] by server-4.bemta-5.messagelabs.com id BB/BA-01980-91150415; Wed, 13 Mar 2013 10:12:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1363169557!27687247!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15512 invoked from network); 13 Mar 2013 10:12:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:12:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFifl-0005px-6n for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFifl-00067S-4M for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:12:37 +0000 Date: Wed, 13 Mar 2013 10:12:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc0cd6a23c6189667ab774edfebaae42544f4566 Author: Jan Beulich AuthorDate: Tue Mar 12 16:19:30 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:19:30 2013 +0100 x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses This adds two new physdev operations for Dom0 to invoke when resource allocation for devices is known to be complete, so that the hypervisor can arrange for the respective MMIO ranges to be marked read-only before an eventual guest getting such a device assigned even gets started, such that it won't be able to set up writable mappings for these MMIO ranges before Xen has a chance to protect them. This also addresses another issue with the code being modified here, in that so far write protection for the address ranges in question got set up only once during the lifetime of a device (i.e. until either system shutdown or device hot removal), while teardown happened when the last interrupt was disposed of by the guest (which at least allowed the tables to be writable when the device got assigned to a second guest [instance] after the first terminated). Signed-off-by: Jan Beulich master changeset: 4245d331e0e75de8d1bddbbb518f3a8ce6d0bb7e master date: 2013-03-08 14:05:34 +0100 --- xen/arch/x86/msi.c | 202 +++++++++++++++++++++++++++-------------- xen/arch/x86/physdev.c | 12 +++ xen/include/asm-x86/msi.h | 1 + xen/include/public/physdev.h | 6 ++ xen/include/xen/pci.h | 1 + 5 files changed, 153 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 7730641..54ec8e7 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -649,8 +649,8 @@ static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) * @entries: pointer to an array of struct msix_entry entries * @nvec: number of @entries * - * Setup the MSI-X capability structure of device function with a - * single MSI-X irq. A return of zero indicates the successful setup of + * Setup the MSI-X capability structure of device function with the requested + * number MSI-X irqs. A return of zero indicates the successful setup of * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, @@ -658,86 +658,69 @@ static int msix_capability_init(struct pci_dev *dev, struct msi_desc **desc, unsigned int nr_entries) { - struct msi_desc *entry; - int pos; + struct msi_desc *entry = NULL; + int pos, vf; u16 control; - u64 table_paddr, entry_paddr; - u32 table_offset, entry_offset; - u8 bir; - void __iomem *base; - int idx; + u64 table_paddr; + u32 table_offset; + u8 bir, pbus, pslot, pfunc; u16 seg = dev->seg; u8 bus = dev->bus; u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); ASSERT(spin_is_locked(&pcidevs_lock)); - ASSERT(desc); 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 */ - /* MSI-X Table Initialization */ - entry = alloc_msi_entry(); - if ( !entry ) - return -ENOMEM; + if ( desc ) + { + entry = alloc_msi_entry(); + if ( !entry ) + return -ENOMEM; + ASSERT(msi); + } - /* Request & Map MSI-X table region */ + /* Locate MSI-X table region */ table_offset = pci_conf_read32(seg, bus, slot, func, msix_table_offset_reg(pos)); bir = (u8)(table_offset & PCI_MSIX_BIRMASK); table_offset &= ~PCI_MSIX_BIRMASK; - entry_offset = msi->entry_nr * PCI_MSIX_ENTRY_SIZE; - table_paddr = msi->table_base + table_offset; - entry_paddr = table_paddr + entry_offset; - idx = msix_get_fixmap(dev, table_paddr, entry_paddr); - if ( idx < 0 ) + if ( !dev->info.is_virtfn ) { - xfree(entry); - return idx; + pbus = bus; + pslot = slot; + pfunc = func; + vf = -1; } - base = (void *)(fix_to_virt(idx) + - ((unsigned long)entry_paddr & ((1UL << PAGE_SHIFT) - 1))); - - entry->msi_attrib.type = PCI_CAP_ID_MSIX; - 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.pos = pos; - entry->irq = msi->irq; - entry->dev = dev; - entry->mask_base = base; - - list_add_tail(&entry->list, &dev->msi_list); - - if ( !dev->msix_nr_entries ) + else { - u8 pbus, pslot, pfunc; - int vf; - u64 pba_paddr; - u32 pba_offset; + pbus = dev->info.physfn.bus; + pslot = PCI_SLOT(dev->info.physfn.devfn); + pfunc = PCI_FUNC(dev->info.physfn.devfn); + vf = PCI_BDF2(dev->bus, dev->devfn); + } - if ( !dev->info.is_virtfn ) - { - pbus = bus; - pslot = slot; - pfunc = func; - vf = -1; - } - else + table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf); + WARN_ON(msi && msi->table_base != table_paddr); + if ( !table_paddr ) + { + if ( !msi || !msi->table_base ) { - pbus = dev->info.physfn.bus; - pslot = PCI_SLOT(dev->info.physfn.devfn); - pfunc = PCI_FUNC(dev->info.physfn.devfn); - vf = PCI_BDF2(dev->bus, dev->devfn); + xfree(entry); + return -ENXIO; } + table_paddr = msi->table_base; + } + table_paddr += table_offset; - ASSERT(!dev->msix_used_entries); - WARN_ON(msi->table_base != - read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf)); + if ( !dev->msix_used_entries ) + { + u64 pba_paddr; + u32 pba_offset; dev->msix_nr_entries = nr_entries; dev->msix_table.first = PFN_DOWN(table_paddr); @@ -758,7 +741,42 @@ static int msix_capability_init(struct pci_dev *dev, BITS_TO_LONGS(nr_entries) - 1); WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, dev->msix_pba.first, dev->msix_pba.last)); + } + if ( entry ) + { + /* Map MSI-X table region */ + u64 entry_paddr = table_paddr + msi->entry_nr * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(dev, table_paddr, entry_paddr); + void __iomem *base; + + if ( idx < 0 ) + { + xfree(entry); + return idx; + } + base = (void *)(fix_to_virt(idx) + + ((unsigned long)entry_paddr & (PAGE_SIZE - 1))); + + /* Mask interrupt here */ + writel(1, base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); + + entry->msi_attrib.type = PCI_CAP_ID_MSIX; + 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.pos = pos; + entry->irq = msi->irq; + entry->dev = dev; + entry->mask_base = base; + + list_add_tail(&entry->list, &dev->msi_list); + *desc = entry; + } + + if ( !dev->msix_used_entries ) + { if ( rangeset_add_range(mmio_ro_ranges, dev->msix_table.first, dev->msix_table.last) ) WARN(); @@ -769,7 +787,7 @@ static int msix_capability_init(struct pci_dev *dev, if ( dev->domain ) p2m_change_entry_type_global(dev->domain, p2m_mmio_direct, p2m_mmio_direct); - if ( !dev->domain || !paging_mode_translate(dev->domain) ) + if ( desc && (!dev->domain || !paging_mode_translate(dev->domain)) ) { struct domain *d = dev->domain; @@ -783,6 +801,13 @@ static int msix_capability_init(struct pci_dev *dev, break; if ( d ) { + if ( !IS_PRIV(d) && dev->msix_warned != d->domain_id ) + { + dev->msix_warned = d->domain_id; + printk(XENLOG_ERR + "Potentially insecure use of MSI-X on %04x:%02x:%02x.%u by Dom%d\n", + seg, bus, slot, func, d->domain_id); + } /* XXX How to deal with existing mappings? */ } } @@ -791,10 +816,6 @@ static int msix_capability_init(struct pci_dev *dev, WARN_ON(dev->msix_table.first != (table_paddr >> PAGE_SHIFT)); ++dev->msix_used_entries; - /* Mask interrupt here */ - writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); - - *desc = entry; /* Restore MSI-X enabled bits */ pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); @@ -919,6 +940,19 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) return status; } +static void _pci_cleanup_msix(struct pci_dev *dev) +{ + if ( !--dev->msix_used_entries ) + { + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, + dev->msix_table.last) ) + WARN(); + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, + dev->msix_pba.last) ) + WARN(); + } +} + static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev; @@ -942,15 +976,45 @@ static void __pci_disable_msix(struct msi_desc *entry) pci_conf_write16(seg, bus, slot, func, msix_control_reg(pos), control); - if ( !--dev->msix_used_entries ) + _pci_cleanup_msix(dev); +} + +int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off) +{ + int rc; + struct pci_dev *pdev; + u8 slot = PCI_SLOT(devfn), func = PCI_FUNC(devfn); + unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, + PCI_CAP_ID_MSIX); + + if ( !use_msi ) + return 0; + + if ( !pos ) + return -ENODEV; + + spin_lock(&pcidevs_lock); + pdev = pci_get_pdev(seg, bus, devfn); + if ( !pdev ) + rc = -ENODEV; + else if ( pdev->msix_used_entries != !!off ) + rc = -EBUSY; + else if ( off ) { - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, - dev->msix_table.last) ) - WARN(); - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, - dev->msix_pba.last) ) - WARN(); + _pci_cleanup_msix(pdev); + rc = 0; } + else + { + u16 control = pci_conf_read16(seg, bus, slot, func, + msix_control_reg(pos)); + + rc = msix_capability_init(pdev, NULL, NULL, + multi_msix_capable(control)); + } + spin_unlock(&pcidevs_lock); + + return rc; } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index ce55ee1..0c3ada1 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -608,6 +608,18 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg) break; } + case PHYSDEVOP_prepare_msix: + case PHYSDEVOP_release_msix: { + struct physdev_pci_device dev; + + if ( copy_from_guest(&dev, arg, 1) ) + ret = -EFAULT; + else + ret = pci_prepare_msix(dev.seg, dev.bus, dev.devfn, + cmd != PHYSDEVOP_prepare_msix); + break; + } + #ifdef __x86_64__ case PHYSDEVOP_pci_mmcfg_reserved: { struct physdev_pci_mmcfg_reserved info; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 4778420..a213fc5 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -80,6 +80,7 @@ struct msi_desc; /* Helper functions */ extern int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc); extern void pci_disable_msi(struct msi_desc *desc); +extern int pci_prepare_msix(u16 seg, u8 bus, u8 devfn, bool_t off); extern void pci_cleanup_msi(struct pci_dev *pdev); extern void setup_msi_handler(struct irq_desc *, struct msi_desc *); extern void setup_msi_irq(struct irq_desc *); diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index b78eeba..9356571 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -303,6 +303,12 @@ DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_add_t); #define PHYSDEVOP_pci_device_remove 26 #define PHYSDEVOP_restore_msi_ext 27 +/* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 struct physdev_pci_device { /* IN */ uint16_t seg; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index d302034..b4cd8fc 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -57,6 +57,7 @@ struct pci_dev { int msix_table_refcnt[MAX_MSIX_TABLE_PAGES]; int msix_table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t msix_table_lock; + domid_t msix_warned; struct domain *domain; const u16 seg; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:13:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:13: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 1UFigD-0000Ky-Dr; Wed, 13 Mar 2013 10:13:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFigB-0000Kd-O4 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:13:03 +0000 Received: from [85.158.137.99:7072] by server-11.bemta-3.messagelabs.com id 1C/6E-01263-A2150415; Wed, 13 Mar 2013 10:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-217.messagelabs.com!1363169516!18139399!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12266 invoked from network); 13 Mar 2013 10:11:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFif6-0005p4-3M for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFif6-000653-0w for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:56 +0000 Date: Wed, 13 Mar 2013 10:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: defer processing events on the NMI exit 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 ac28c0921d7f972ef62b09987c5ee400a7a01052 Author: Jan Beulich AuthorDate: Tue Mar 12 16:16:41 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:16:41 2013 +0100 x86: defer processing events on the NMI exit path Otherwise, we may end up in the scheduler, keeping NMIs masked for a possibly unbounded period of time (until whenever the next IRET gets executed). Enforce timely event processing by sending a self IPI. Of course it's open for discussion whether to always use the straight exit path from handle_ist_exception. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: d463b005bbd6475ed930a302821efe239e1b2cf9 master date: 2013-03-04 10:19:34 +0100 --- xen/arch/x86/x86_32/entry.S | 26 +++++++++++++++++++++----- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 27 ++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index ae7a1b2..b460966 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -60,6 +60,7 @@ #include #include #include +#include ALIGN restore_all_guest: @@ -561,6 +562,8 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushl $TRAP_nmi<<16 handle_nmi_mce: #ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL # NMI/MCE entry protocol is incompatible with guest kernel in ring 0. @@ -581,7 +584,24 @@ handle_nmi_mce: * cases we have put guest DS/ES on the guest stack frame, which will * be detected by SAVE_ALL(), or we have rolled back restore_guest. */ - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%esp) + jne ret_from_intr + /* We want to get straight to the IRET on the NMI exit path. */ + GET_CURRENT(%ebx) + movl UREGS_eflags(%esp),%eax + movb UREGS_cs(%esp),%al + testl $(3|X86_EFLAGS_VM),%eax + jz restore_all_xen + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%ebx),%eax + shll $IRQSTAT_shift,%eax + cmpl $0,irq_stat(%eax) + je restore_all_guest + pushl $EVENT_CHECK_VECTOR + call send_IPI_self + addl $4,%esp + jmp restore_all_guest + .Lnmi_mce_xen: /* Check the outer (guest) context for %ds/%es state validity. */ GET_CPUINFO_FIELD(CPUINFO_guest_cpu_user_regs,%ebx) @@ -613,10 +633,6 @@ handle_nmi_mce: jmp .Lnmi_mce_common #endif /* !CONFIG_X86_SUPERVISOR_MODE_KERNEL */ -ENTRY(nmi) - pushl $TRAP_nmi<<16 - jmp handle_nmi_mce - ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index f49ff2d..4482f6e 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -171,7 +171,7 @@ compat_bad_hypercall: jmp compat_test_all_events /* %rbx: struct vcpu, interrupts disabled */ -compat_restore_all_guest: +ENTRY(compat_restore_all_guest) ASSERT_INTERRUPTS_DISABLED RESTORE_ALL addq $8,%rsp diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index abc5037..8390db2 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -11,6 +11,7 @@ #include #include #include +#include ALIGN /* %rbx: struct vcpu */ @@ -617,6 +618,9 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushq $0 + movl $TRAP_nmi,4(%rsp) handle_ist_exception: SAVE_ALL testb $3,UREGS_cs(%rsp) @@ -631,12 +635,25 @@ handle_ist_exception: movl UREGS_entry_vector(%rsp),%eax leaq exception_table(%rip),%rdx callq *(%rdx,%rax,8) - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) + jne ret_from_intr -ENTRY(nmi) - pushq $0 - movl $TRAP_nmi,4(%rsp) - jmp handle_ist_exception + /* We want to get straight to the IRET on the NMI exit path. */ + testb $3,UREGS_cs(%rsp) + jz restore_all_xen + GET_CURRENT(%rbx) + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%rbx),%eax + shll $IRQSTAT_shift,%eax + leaq irq_stat(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + je 1f + movl $EVENT_CHECK_VECTOR,%edi + call send_IPI_self +1: movq VCPU_domain(%rbx),%rax + cmpb $0,DOMAIN_is_32bit_pv(%rax) + je restore_all_guest + jmp compat_restore_all_guest ENTRY(machine_check) pushq $0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 13 10:13:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Mar 2013 10:13: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 1UFigD-0000Ky-Dr; Wed, 13 Mar 2013 10:13:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFigB-0000Kd-O4 for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:13:03 +0000 Received: from [85.158.137.99:7072] by server-11.bemta-3.messagelabs.com id 1C/6E-01263-A2150415; Wed, 13 Mar 2013 10:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-217.messagelabs.com!1363169516!18139399!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12266 invoked from network); 13 Mar 2013 10:11:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2013 10:11:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UFif6-0005p4-3M for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UFif6-000653-0w for xen-changelog@lists.xensource.com; Wed, 13 Mar 2013 10:11:56 +0000 Date: Wed, 13 Mar 2013 10:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: defer processing events on the NMI exit 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 ac28c0921d7f972ef62b09987c5ee400a7a01052 Author: Jan Beulich AuthorDate: Tue Mar 12 16:16:41 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:16:41 2013 +0100 x86: defer processing events on the NMI exit path Otherwise, we may end up in the scheduler, keeping NMIs masked for a possibly unbounded period of time (until whenever the next IRET gets executed). Enforce timely event processing by sending a self IPI. Of course it's open for discussion whether to always use the straight exit path from handle_ist_exception. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: d463b005bbd6475ed930a302821efe239e1b2cf9 master date: 2013-03-04 10:19:34 +0100 --- xen/arch/x86/x86_32/entry.S | 26 +++++++++++++++++++++----- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 27 ++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index ae7a1b2..b460966 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -60,6 +60,7 @@ #include #include #include +#include ALIGN restore_all_guest: @@ -561,6 +562,8 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushl $TRAP_nmi<<16 handle_nmi_mce: #ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL # NMI/MCE entry protocol is incompatible with guest kernel in ring 0. @@ -581,7 +584,24 @@ handle_nmi_mce: * cases we have put guest DS/ES on the guest stack frame, which will * be detected by SAVE_ALL(), or we have rolled back restore_guest. */ - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%esp) + jne ret_from_intr + /* We want to get straight to the IRET on the NMI exit path. */ + GET_CURRENT(%ebx) + movl UREGS_eflags(%esp),%eax + movb UREGS_cs(%esp),%al + testl $(3|X86_EFLAGS_VM),%eax + jz restore_all_xen + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%ebx),%eax + shll $IRQSTAT_shift,%eax + cmpl $0,irq_stat(%eax) + je restore_all_guest + pushl $EVENT_CHECK_VECTOR + call send_IPI_self + addl $4,%esp + jmp restore_all_guest + .Lnmi_mce_xen: /* Check the outer (guest) context for %ds/%es state validity. */ GET_CPUINFO_FIELD(CPUINFO_guest_cpu_user_regs,%ebx) @@ -613,10 +633,6 @@ handle_nmi_mce: jmp .Lnmi_mce_common #endif /* !CONFIG_X86_SUPERVISOR_MODE_KERNEL */ -ENTRY(nmi) - pushl $TRAP_nmi<<16 - jmp handle_nmi_mce - ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index f49ff2d..4482f6e 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -171,7 +171,7 @@ compat_bad_hypercall: jmp compat_test_all_events /* %rbx: struct vcpu, interrupts disabled */ -compat_restore_all_guest: +ENTRY(compat_restore_all_guest) ASSERT_INTERRUPTS_DISABLED RESTORE_ALL addq $8,%rsp diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index abc5037..8390db2 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -11,6 +11,7 @@ #include #include #include +#include ALIGN /* %rbx: struct vcpu */ @@ -617,6 +618,9 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushq $0 + movl $TRAP_nmi,4(%rsp) handle_ist_exception: SAVE_ALL testb $3,UREGS_cs(%rsp) @@ -631,12 +635,25 @@ handle_ist_exception: movl UREGS_entry_vector(%rsp),%eax leaq exception_table(%rip),%rdx callq *(%rdx,%rax,8) - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) + jne ret_from_intr -ENTRY(nmi) - pushq $0 - movl $TRAP_nmi,4(%rsp) - jmp handle_ist_exception + /* We want to get straight to the IRET on the NMI exit path. */ + testb $3,UREGS_cs(%rsp) + jz restore_all_xen + GET_CURRENT(%rbx) + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%rbx),%eax + shll $IRQSTAT_shift,%eax + leaq irq_stat(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + je 1f + movl $EVENT_CHECK_VECTOR,%edi + call send_IPI_self +1: movq VCPU_domain(%rbx),%rax + cmpb $0,DOMAIN_is_32bit_pv(%rax) + je restore_all_guest + jmp compat_restore_all_guest ENTRY(machine_check) pushq $0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20: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 1UGF0R-0001vc-St; Thu, 14 Mar 2013 20:44:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0Q-0001vX-KU for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:06 +0000 Received: from [85.158.143.99:35326] by server-3.bemta-4.messagelabs.com id 7D/9F-02186-59632415; Thu, 14 Mar 2013 20:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1363293844!23325068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12393 invoked from network); 14 Mar 2013 20:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0N-0003kk-LI for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0N-0004Fc-4G for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:03 +0000 Date: Thu, 14 Mar 2013 20:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] powernow: add fixups for AMD P-state figures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d80765b504b34b63a42a63aff4291e07e29f0c5 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Mar 12 15:34:22 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 15:34:22 2013 +0100 powernow: add fixups for AMD P-state figures In the Linux kernel, these two git commits: - f594065faf4f9067c2283a34619fc0714e79a98d ACPI: Add fixups for AMD P-state figures - 9855d8ce41a7801548a05d844db2f46c3e810166 ACPI: Check MSR valid bit before using P-state frequencies Try to fix the the issue that "some AMD systems may round the frequencies in ACPI tables to 100MHz boundaries. We can obtain the real frequencies from MSRs, so add a quirk to fix these frequencies up on AMD systems." (from f594065..) In discussion (around 9855d8..) "it turned out that indeed real HW/BIOSes may choose to not set the valid bit and thus mark the P-state as invalid. So this could be considered a fix for broken BIOSes." (from 9855d8..) which is great for Linux. Unfortunatly the Linux kernel, when it tries to do the RDMSR under Xen it fails to get the right value (it gets zero) as Xen traps it and returns zero. Hence when dom0 uploads the P-states they will be unmodified and we should take care of updating the frequencies with the right values. I've tested it under Dell Inc. PowerEdge T105 /0RR825, BIOS 1.3.2 08/20/2008 where this quirk can be observed (x86 == 0x10, model == 2). Also on other AMD (x86 == 0x12, A8-3850; x86 = 0x14, AMD E-350) to make sure the quirk is not applied there. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: stefan.bader@canonical.com Do the MSR access here (and while at it, also the one reading MSR_PSTATE_CUR_LIMIT) on the target CPU, and bound the loop over amd_fixup_frequency() by max_hw_pstate (matching the one in powernow_cpufreq_cpu_init()). Signed-off-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/powernow.c | 56 ++++++++++++++++++++++++++++++---- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index a9b7792..2c9fea2 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -147,6 +147,51 @@ static int powernow_cpufreq_target(struct cpufreq_policy *policy, return 0; } +static void amd_fixup_frequency(struct xen_processor_px *px) +{ + u32 hi, lo, fid, did; + int index = px->control & 0x00000007; + const struct cpuinfo_x86 *c = ¤t_cpu_data; + + if ((c->x86 != 0x10 || c->x86_model >= 10) && c->x86 != 0x11) + return; + + rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi); + /* + * MSR C001_0064+: + * Bit 63: PstateEn. Read-write. If set, the P-state is valid. + */ + if (!(hi & (1U << 31))) + return; + + fid = lo & 0x3f; + did = (lo >> 6) & 7; + if (c->x86 == 0x10) + px->core_frequency = (100 * (fid + 16)) >> did; + else + px->core_frequency = (100 * (fid + 8)) >> did; +} + +struct amd_cpu_data { + struct processor_performance *perf; + u32 max_hw_pstate; +}; + +static void get_cpu_data(void *arg) +{ + struct amd_cpu_data *data = arg; + struct processor_performance *perf = data->perf; + uint64_t msr_content; + unsigned int i; + + rdmsrl(MSR_PSTATE_CUR_LIMIT, msr_content); + data->max_hw_pstate = (msr_content & HW_PSTATE_MAX_MASK) >> + HW_PSTATE_MAX_SHIFT; + + for (i = 0; i < perf->state_count && i <= data->max_hw_pstate; i++) + amd_fixup_frequency(&perf->states[i]); +} + static int powernow_cpufreq_verify(struct cpufreq_policy *policy) { struct acpi_cpufreq_data *data; @@ -193,8 +238,7 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) struct acpi_cpufreq_data *data; unsigned int result = 0; struct processor_performance *perf; - u32 max_hw_pstate; - uint64_t msr_content; + struct amd_cpu_data info; struct cpuinfo_x86 *c = &cpu_data[policy->cpu]; data = xzalloc(struct acpi_cpufreq_data); @@ -205,7 +249,7 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) data->acpi_data = &processor_pminfo[cpu]->perf; - perf = data->acpi_data; + info.perf = perf = data->acpi_data; policy->shared_type = perf->shared_type; if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL || @@ -227,8 +271,6 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) result = -ENODEV; goto err_unreg; } - rdmsrl(MSR_PSTATE_CUR_LIMIT, msr_content); - max_hw_pstate = (msr_content & HW_PSTATE_MAX_MASK) >> HW_PSTATE_MAX_SHIFT; if (perf->control_register.space_id != perf->status_register.space_id) { result = -ENODEV; @@ -253,8 +295,10 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->governor = cpufreq_opt_governor ? : CPUFREQ_DEFAULT_GOVERNOR; + on_selected_cpus(cpumask_of(cpu), get_cpu_data, &info, 1); + /* table init */ - for (i = 0; i < perf->state_count && i <= max_hw_pstate; i++) { + for (i = 0; i < perf->state_count && i <= info.max_hw_pstate; i++) { if (i > 0 && perf->states[i].core_frequency >= data->freq_table[valid_states-1].frequency / 1000) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20: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 1UGF0R-0001vc-St; Thu, 14 Mar 2013 20:44:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0Q-0001vX-KU for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:06 +0000 Received: from [85.158.143.99:35326] by server-3.bemta-4.messagelabs.com id 7D/9F-02186-59632415; Thu, 14 Mar 2013 20:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1363293844!23325068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12393 invoked from network); 14 Mar 2013 20:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0N-0003kk-LI for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0N-0004Fc-4G for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:03 +0000 Date: Thu, 14 Mar 2013 20:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] powernow: add fixups for AMD P-state figures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d80765b504b34b63a42a63aff4291e07e29f0c5 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Mar 12 15:34:22 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 15:34:22 2013 +0100 powernow: add fixups for AMD P-state figures In the Linux kernel, these two git commits: - f594065faf4f9067c2283a34619fc0714e79a98d ACPI: Add fixups for AMD P-state figures - 9855d8ce41a7801548a05d844db2f46c3e810166 ACPI: Check MSR valid bit before using P-state frequencies Try to fix the the issue that "some AMD systems may round the frequencies in ACPI tables to 100MHz boundaries. We can obtain the real frequencies from MSRs, so add a quirk to fix these frequencies up on AMD systems." (from f594065..) In discussion (around 9855d8..) "it turned out that indeed real HW/BIOSes may choose to not set the valid bit and thus mark the P-state as invalid. So this could be considered a fix for broken BIOSes." (from 9855d8..) which is great for Linux. Unfortunatly the Linux kernel, when it tries to do the RDMSR under Xen it fails to get the right value (it gets zero) as Xen traps it and returns zero. Hence when dom0 uploads the P-states they will be unmodified and we should take care of updating the frequencies with the right values. I've tested it under Dell Inc. PowerEdge T105 /0RR825, BIOS 1.3.2 08/20/2008 where this quirk can be observed (x86 == 0x10, model == 2). Also on other AMD (x86 == 0x12, A8-3850; x86 = 0x14, AMD E-350) to make sure the quirk is not applied there. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: stefan.bader@canonical.com Do the MSR access here (and while at it, also the one reading MSR_PSTATE_CUR_LIMIT) on the target CPU, and bound the loop over amd_fixup_frequency() by max_hw_pstate (matching the one in powernow_cpufreq_cpu_init()). Signed-off-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/powernow.c | 56 ++++++++++++++++++++++++++++++---- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index a9b7792..2c9fea2 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -147,6 +147,51 @@ static int powernow_cpufreq_target(struct cpufreq_policy *policy, return 0; } +static void amd_fixup_frequency(struct xen_processor_px *px) +{ + u32 hi, lo, fid, did; + int index = px->control & 0x00000007; + const struct cpuinfo_x86 *c = ¤t_cpu_data; + + if ((c->x86 != 0x10 || c->x86_model >= 10) && c->x86 != 0x11) + return; + + rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi); + /* + * MSR C001_0064+: + * Bit 63: PstateEn. Read-write. If set, the P-state is valid. + */ + if (!(hi & (1U << 31))) + return; + + fid = lo & 0x3f; + did = (lo >> 6) & 7; + if (c->x86 == 0x10) + px->core_frequency = (100 * (fid + 16)) >> did; + else + px->core_frequency = (100 * (fid + 8)) >> did; +} + +struct amd_cpu_data { + struct processor_performance *perf; + u32 max_hw_pstate; +}; + +static void get_cpu_data(void *arg) +{ + struct amd_cpu_data *data = arg; + struct processor_performance *perf = data->perf; + uint64_t msr_content; + unsigned int i; + + rdmsrl(MSR_PSTATE_CUR_LIMIT, msr_content); + data->max_hw_pstate = (msr_content & HW_PSTATE_MAX_MASK) >> + HW_PSTATE_MAX_SHIFT; + + for (i = 0; i < perf->state_count && i <= data->max_hw_pstate; i++) + amd_fixup_frequency(&perf->states[i]); +} + static int powernow_cpufreq_verify(struct cpufreq_policy *policy) { struct acpi_cpufreq_data *data; @@ -193,8 +238,7 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) struct acpi_cpufreq_data *data; unsigned int result = 0; struct processor_performance *perf; - u32 max_hw_pstate; - uint64_t msr_content; + struct amd_cpu_data info; struct cpuinfo_x86 *c = &cpu_data[policy->cpu]; data = xzalloc(struct acpi_cpufreq_data); @@ -205,7 +249,7 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) data->acpi_data = &processor_pminfo[cpu]->perf; - perf = data->acpi_data; + info.perf = perf = data->acpi_data; policy->shared_type = perf->shared_type; if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL || @@ -227,8 +271,6 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) result = -ENODEV; goto err_unreg; } - rdmsrl(MSR_PSTATE_CUR_LIMIT, msr_content); - max_hw_pstate = (msr_content & HW_PSTATE_MAX_MASK) >> HW_PSTATE_MAX_SHIFT; if (perf->control_register.space_id != perf->status_register.space_id) { result = -ENODEV; @@ -253,8 +295,10 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->governor = cpufreq_opt_governor ? : CPUFREQ_DEFAULT_GOVERNOR; + on_selected_cpus(cpumask_of(cpu), get_cpu_data, &info, 1); + /* table init */ - for (i = 0; i < perf->state_count && i <= max_hw_pstate; i++) { + for (i = 0; i < perf->state_count && i <= info.max_hw_pstate; i++) { if (i > 0 && perf->states[i].core_frequency >= data->freq_table[valid_states-1].frequency / 1000) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0c-0001wF-WA; Thu, 14 Mar 2013 20: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 1UGF0a-0001w9-UZ for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:17 +0000 Received: from [85.158.139.211:15700] by server-8.bemta-5.messagelabs.com id 72/49-05790-0A632415; Thu, 14 Mar 2013 20:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1363293854!17883419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4234 invoked from network); 14 Mar 2013 20:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0Y-0003kn-8d for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0X-0004G0-Re for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:13 +0000 Date: Thu, 14 Mar 2013 20:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vpmu intel: pass through cpuid bits when BTS is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 647597124fe28ee88f3baf499f5afdfed8de341f Author: Dietmar Hahn AuthorDate: Tue Mar 12 15:37:45 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 15:37:45 2013 +0100 vpmu intel: pass through cpuid bits when BTS is enabled This patch passes the orginal cpuid bits for X86_FEATURE_DTES64 (64-bit DS Area) and X86_FEATURE_DSCPL (CPL Qualified Debug Store) to the guest when the BTS feature is switched on. I forgot this when I did this BTS emulation. Signed-off-by: Dietmar Hahn --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 2af8966..afad35b 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -607,6 +607,10 @@ static void core2_vpmu_do_cpuid(unsigned int input, { /* Switch on the 'Debug Store' feature in CPUID.EAX[1]:EDX[21] */ *edx |= cpufeat_mask(X86_FEATURE_DS); + if ( cpu_has(¤t_cpu_data, X86_FEATURE_DTES64) ) + *ecx |= cpufeat_mask(X86_FEATURE_DTES64); + if ( cpu_has(¤t_cpu_data, X86_FEATURE_DSCPL) ) + *ecx |= cpufeat_mask(X86_FEATURE_DSCPL); } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0c-0001wF-WA; Thu, 14 Mar 2013 20: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 1UGF0a-0001w9-UZ for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:17 +0000 Received: from [85.158.139.211:15700] by server-8.bemta-5.messagelabs.com id 72/49-05790-0A632415; Thu, 14 Mar 2013 20:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1363293854!17883419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4234 invoked from network); 14 Mar 2013 20:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0Y-0003kn-8d for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0X-0004G0-Re for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:13 +0000 Date: Thu, 14 Mar 2013 20:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vpmu intel: pass through cpuid bits when BTS is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 647597124fe28ee88f3baf499f5afdfed8de341f Author: Dietmar Hahn AuthorDate: Tue Mar 12 15:37:45 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 15:37:45 2013 +0100 vpmu intel: pass through cpuid bits when BTS is enabled This patch passes the orginal cpuid bits for X86_FEATURE_DTES64 (64-bit DS Area) and X86_FEATURE_DSCPL (CPL Qualified Debug Store) to the guest when the BTS feature is switched on. I forgot this when I did this BTS emulation. Signed-off-by: Dietmar Hahn --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 2af8966..afad35b 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -607,6 +607,10 @@ static void core2_vpmu_do_cpuid(unsigned int input, { /* Switch on the 'Debug Store' feature in CPUID.EAX[1]:EDX[21] */ *edx |= cpufeat_mask(X86_FEATURE_DS); + if ( cpu_has(¤t_cpu_data, X86_FEATURE_DTES64) ) + *ecx |= cpufeat_mask(X86_FEATURE_DTES64); + if ( cpu_has(¤t_cpu_data, X86_FEATURE_DSCPL) ) + *ecx |= cpufeat_mask(X86_FEATURE_DSCPL); } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44: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 1UGF0o-0001xB-38; Thu, 14 Mar 2013 20:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0m-0001wv-2Y for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:28 +0000 Received: from [85.158.137.99:3765] by server-2.bemta-3.messagelabs.com id A0/F5-05208-BA632415; Thu, 14 Mar 2013 20:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1363293864!167310!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26375 invoked from network); 14 Mar 2013 20:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0i-0003kt-Kv for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0i-0004GN-Cv for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:24 +0000 Date: Thu, 14 Mar 2013 20:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCA: suppress bank clearing for certain injected 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 b0583c0e64cc8bb6229c95c3304fdac2051f79b3 Author: Jan Beulich AuthorDate: Tue Mar 12 15:53:30 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 15:53:30 2013 +0100 x86/MCA: suppress bank clearing for certain injected events As the bits indicating validity of the ADDR and MISC bank MSRs may be injected in a way that isn't consistent with what the underlying hardware implements (while the bank must be valid for injection to work, the auxiliary MSRs may not be implemented - and hence cause #GP upon access - if the hardware never sets the corresponding valid bits. Consequently we need to do the clearing writes only if no value was interposed for the respective MSR (which also makes sense the other way around: there's no point in clearing a hardware register when all data read came from software). Of course this all requires the injection tool to do things in a consistent way (but that had been a requirement before already). Signed-off-by: Jan Beulich Tested-by: Ren Yongjie Acked-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/mce.c | 12 +++++++----- xen/arch/x86/cpu/mcheck/mce.h | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index ced1a89..fa87982 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1065,13 +1065,15 @@ static void intpose_add(unsigned int cpu_nr, uint64_t msr, uint64_t val) printk("intpose_add: interpose array full - request dropped\n"); } -void intpose_inval(unsigned int cpu_nr, uint64_t msr) +bool_t intpose_inval(unsigned int cpu_nr, uint64_t msr) { - struct intpose_ent *ent; + struct intpose_ent *ent = intpose_lookup(cpu_nr, msr, NULL); - if ((ent = intpose_lookup(cpu_nr, msr, NULL)) != NULL) { - ent->cpu_nr = -1; - } + if ( !ent ) + return 0; + + ent->cpu_nr = -1; + return 1; } #define IS_MCA_BANKREG(r) \ diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 6006fb4..cbd123d 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -77,7 +77,7 @@ extern void mce_recoverable_register(mce_recoverable_t); /* Read an MSR, checking for an interposed value first */ extern struct intpose_ent *intpose_lookup(unsigned int, uint64_t, uint64_t *); -extern void intpose_inval(unsigned int, uint64_t); +extern bool_t intpose_inval(unsigned int, uint64_t); static inline uint64_t mca_rdmsr(unsigned int msr) { @@ -89,9 +89,9 @@ static inline uint64_t mca_rdmsr(unsigned int msr) /* Write an MSR, invalidating any interposed value */ #define mca_wrmsr(msr, val) do { \ - intpose_inval(smp_processor_id(), msr); \ - wrmsrl(msr, val); \ -} while (0) + if ( !intpose_inval(smp_processor_id(), msr) ) \ + wrmsrl(msr, val); \ +} while ( 0 ) /* Utility function to "logout" all architectural MCA telemetry from the MCA -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44: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 1UGF0o-0001xB-38; Thu, 14 Mar 2013 20:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0m-0001wv-2Y for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:28 +0000 Received: from [85.158.137.99:3765] by server-2.bemta-3.messagelabs.com id A0/F5-05208-BA632415; Thu, 14 Mar 2013 20:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1363293864!167310!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26375 invoked from network); 14 Mar 2013 20:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0i-0003kt-Kv for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0i-0004GN-Cv for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:24 +0000 Date: Thu, 14 Mar 2013 20:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCA: suppress bank clearing for certain injected 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 b0583c0e64cc8bb6229c95c3304fdac2051f79b3 Author: Jan Beulich AuthorDate: Tue Mar 12 15:53:30 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 15:53:30 2013 +0100 x86/MCA: suppress bank clearing for certain injected events As the bits indicating validity of the ADDR and MISC bank MSRs may be injected in a way that isn't consistent with what the underlying hardware implements (while the bank must be valid for injection to work, the auxiliary MSRs may not be implemented - and hence cause #GP upon access - if the hardware never sets the corresponding valid bits. Consequently we need to do the clearing writes only if no value was interposed for the respective MSR (which also makes sense the other way around: there's no point in clearing a hardware register when all data read came from software). Of course this all requires the injection tool to do things in a consistent way (but that had been a requirement before already). Signed-off-by: Jan Beulich Tested-by: Ren Yongjie Acked-by: Liu Jinsong --- xen/arch/x86/cpu/mcheck/mce.c | 12 +++++++----- xen/arch/x86/cpu/mcheck/mce.h | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index ced1a89..fa87982 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1065,13 +1065,15 @@ static void intpose_add(unsigned int cpu_nr, uint64_t msr, uint64_t val) printk("intpose_add: interpose array full - request dropped\n"); } -void intpose_inval(unsigned int cpu_nr, uint64_t msr) +bool_t intpose_inval(unsigned int cpu_nr, uint64_t msr) { - struct intpose_ent *ent; + struct intpose_ent *ent = intpose_lookup(cpu_nr, msr, NULL); - if ((ent = intpose_lookup(cpu_nr, msr, NULL)) != NULL) { - ent->cpu_nr = -1; - } + if ( !ent ) + return 0; + + ent->cpu_nr = -1; + return 1; } #define IS_MCA_BANKREG(r) \ diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 6006fb4..cbd123d 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -77,7 +77,7 @@ extern void mce_recoverable_register(mce_recoverable_t); /* Read an MSR, checking for an interposed value first */ extern struct intpose_ent *intpose_lookup(unsigned int, uint64_t, uint64_t *); -extern void intpose_inval(unsigned int, uint64_t); +extern bool_t intpose_inval(unsigned int, uint64_t); static inline uint64_t mca_rdmsr(unsigned int msr) { @@ -89,9 +89,9 @@ static inline uint64_t mca_rdmsr(unsigned int msr) /* Write an MSR, invalidating any interposed value */ #define mca_wrmsr(msr, val) do { \ - intpose_inval(smp_processor_id(), msr); \ - wrmsrl(msr, val); \ -} while (0) + if ( !intpose_inval(smp_processor_id(), msr) ) \ + wrmsrl(msr, val); \ +} while ( 0 ) /* Utility function to "logout" all architectural MCA telemetry from the MCA -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44: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 1UGF0y-0001yM-6F; Thu, 14 Mar 2013 20:44:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0w-0001y6-7s for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:38 +0000 Received: from [85.158.137.99:20740] by server-11.bemta-3.messagelabs.com id 38/A4-01263-5B632415; Thu, 14 Mar 2013 20:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1363293875!13966314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24624 invoked from network); 14 Mar 2013 20:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0t-0003l1-26 for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0s-0004Gn-P4 for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:34 +0000 Date: Thu, 14 Mar 2013 20:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] coverage: fix on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49cc1f0431b7ff62780fc84975302eb444edbe05 Author: Ian Campbell AuthorDate: Fri Feb 22 10:57:40 2013 +0000 Commit: Ian Campbell CommitDate: Tue Mar 12 15:46:50 2013 +0000 coverage: fix on ARM Use a list of pointers to simplify the handling of 32- vs 64-bit. Also on ARM the section name is ".init_array" and not ".ctors". Signed-off-by: Ian Campbell Acked-by: Keir Fraser [ ijc -- tweak whitespace per Frediano's comment ] --- xen/arch/arm/xen.lds.S | 10 ++++------ xen/arch/x86/xen.lds.S | 6 ++---- xen/common/lib.c | 13 +++++-------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 9043994..fd755d7 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -91,12 +91,10 @@ SECTIONS *(.init.data.rel) *(.init.data.rel.*) - . = ALIGN(4); - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; + . = ALIGN(8); + __ctors_start = .; + *(.init_array) + __ctors_end = .; } :text . = ALIGN(32); .init.setup : { diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 5570389..d959941 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -110,11 +110,9 @@ SECTIONS __trampoline_seg_stop = .; . = ALIGN(8); - __CTOR_LIST__ = .; - QUAD((__CTOR_END__ - __CTOR_LIST__) / 8 - 2) + __ctors_start = .; *(.ctors) - QUAD(0) - __CTOR_END__ = .; + __ctors_end = .; } :text . = ALIGN(32); .init.setup : { diff --git a/xen/common/lib.c b/xen/common/lib.c index e0c65cf..e3cb3f4 100644 --- a/xen/common/lib.c +++ b/xen/common/lib.c @@ -479,17 +479,14 @@ unsigned long long parse_size_and_unit(const char *s, const char **ps) return ret; } -extern const struct -{ - unsigned long count; - void (*funcs[1])(void); -} __CTOR_LIST__; +typedef void (*ctor_func_t)(void); +extern const ctor_func_t __ctors_start[], __ctors_end[]; void __init init_constructors(void) { - unsigned long n; - for ( n = 0; n < __CTOR_LIST__.count; ++n ) - __CTOR_LIST__.funcs[n](); + const ctor_func_t *f; + for ( f = __ctors_start; f < __ctors_end; ++f ) + (*f)(); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44: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 1UGF0y-0001yM-6F; Thu, 14 Mar 2013 20:44:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0w-0001y6-7s for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:38 +0000 Received: from [85.158.137.99:20740] by server-11.bemta-3.messagelabs.com id 38/A4-01263-5B632415; Thu, 14 Mar 2013 20:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1363293875!13966314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24624 invoked from network); 14 Mar 2013 20:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF0t-0003l1-26 for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF0s-0004Gn-P4 for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:34 +0000 Date: Thu, 14 Mar 2013 20:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] coverage: fix on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49cc1f0431b7ff62780fc84975302eb444edbe05 Author: Ian Campbell AuthorDate: Fri Feb 22 10:57:40 2013 +0000 Commit: Ian Campbell CommitDate: Tue Mar 12 15:46:50 2013 +0000 coverage: fix on ARM Use a list of pointers to simplify the handling of 32- vs 64-bit. Also on ARM the section name is ".init_array" and not ".ctors". Signed-off-by: Ian Campbell Acked-by: Keir Fraser [ ijc -- tweak whitespace per Frediano's comment ] --- xen/arch/arm/xen.lds.S | 10 ++++------ xen/arch/x86/xen.lds.S | 6 ++---- xen/common/lib.c | 13 +++++-------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 9043994..fd755d7 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -91,12 +91,10 @@ SECTIONS *(.init.data.rel) *(.init.data.rel.*) - . = ALIGN(4); - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; + . = ALIGN(8); + __ctors_start = .; + *(.init_array) + __ctors_end = .; } :text . = ALIGN(32); .init.setup : { diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 5570389..d959941 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -110,11 +110,9 @@ SECTIONS __trampoline_seg_stop = .; . = ALIGN(8); - __CTOR_LIST__ = .; - QUAD((__CTOR_END__ - __CTOR_LIST__) / 8 - 2) + __ctors_start = .; *(.ctors) - QUAD(0) - __CTOR_END__ = .; + __ctors_end = .; } :text . = ALIGN(32); .init.setup : { diff --git a/xen/common/lib.c b/xen/common/lib.c index e0c65cf..e3cb3f4 100644 --- a/xen/common/lib.c +++ b/xen/common/lib.c @@ -479,17 +479,14 @@ unsigned long long parse_size_and_unit(const char *s, const char **ps) return ret; } -extern const struct -{ - unsigned long count; - void (*funcs[1])(void); -} __CTOR_LIST__; +typedef void (*ctor_func_t)(void); +extern const ctor_func_t __ctors_start[], __ctors_end[]; void __init init_constructors(void) { - unsigned long n; - for ( n = 0; n < __CTOR_LIST__.count; ++n ) - __CTOR_LIST__.funcs[n](); + const ctor_func_t *f; + for ( f = __ctors_start; f < __ctors_end; ++f ) + (*f)(); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44: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 1UGF17-0001zl-9B; Thu, 14 Mar 2013 20:44:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF16-0001zX-92 for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:48 +0000 Received: from [85.158.139.83:26448] by server-3.bemta-5.messagelabs.com id 47/20-17256-FB632415; Thu, 14 Mar 2013 20:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1363293885!26875169!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3727 invoked from network); 14 Mar 2013 20:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF13-0003lA-Iv for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF13-0004H9-7K for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:45 +0000 Date: Thu, 14 Mar 2013 20:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: correct BITS_PER_EVTCHN_WORD on arm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fde3412217a1e84e2601e591ca92e82a208d9688 Author: Ian Campbell AuthorDate: Wed Feb 27 13:14:54 2013 +0000 Commit: Ian Campbell CommitDate: Tue Mar 12 15:46:50 2013 +0000 xen: correct BITS_PER_EVTCHN_WORD on arm This is always 64-bit on ARM, not BITS_PER_LONG Signed-off-by: Ian Campbell Acked-by: Keir Fraser --- xen/include/asm-arm/config.h | 3 +++ xen/include/asm-x86/config.h | 2 ++ xen/include/xen/sched.h | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 3910dd2..8be8563 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -22,6 +22,9 @@ #define BYTES_PER_LONG (1 << LONG_BYTEORDER) #define BITS_PER_LONG (BYTES_PER_LONG << 3) +/* xen_ulong_t is always 64 bits */ +#define BITS_PER_XEN_ULONG 64 + #define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_PAGING_LEVELS 3 diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 0a5f031..cf93bd5 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -14,6 +14,8 @@ #define BITS_PER_LONG (BYTES_PER_LONG << 3) #define BITS_PER_BYTE 8 +#define BITS_PER_XEN_ULONG BITS_PER_LONG + #define CONFIG_X86 1 #define CONFIG_X86_HT 1 #define CONFIG_PAGING_ASSISTANCE 1 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 569e76e..cabaf27 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -46,9 +46,9 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_runstate_info_compat_t); extern struct domain *dom0; #ifndef CONFIG_COMPAT -#define BITS_PER_EVTCHN_WORD(d) BITS_PER_LONG +#define BITS_PER_EVTCHN_WORD(d) BITS_PER_XEN_ULONG #else -#define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_LONG) +#define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_XEN_ULONG) #endif #define MAX_EVTCHNS(d) (BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d)) #define EVTCHNS_PER_BUCKET 128 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 20:44:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 20:44: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 1UGF17-0001zl-9B; Thu, 14 Mar 2013 20:44:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF16-0001zX-92 for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:48 +0000 Received: from [85.158.139.83:26448] by server-3.bemta-5.messagelabs.com id 47/20-17256-FB632415; Thu, 14 Mar 2013 20:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1363293885!26875169!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3727 invoked from network); 14 Mar 2013 20:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 20:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGF13-0003lA-Iv for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGF13-0004H9-7K for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 20:44:45 +0000 Date: Thu, 14 Mar 2013 20:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: correct BITS_PER_EVTCHN_WORD on arm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fde3412217a1e84e2601e591ca92e82a208d9688 Author: Ian Campbell AuthorDate: Wed Feb 27 13:14:54 2013 +0000 Commit: Ian Campbell CommitDate: Tue Mar 12 15:46:50 2013 +0000 xen: correct BITS_PER_EVTCHN_WORD on arm This is always 64-bit on ARM, not BITS_PER_LONG Signed-off-by: Ian Campbell Acked-by: Keir Fraser --- xen/include/asm-arm/config.h | 3 +++ xen/include/asm-x86/config.h | 2 ++ xen/include/xen/sched.h | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 3910dd2..8be8563 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -22,6 +22,9 @@ #define BYTES_PER_LONG (1 << LONG_BYTEORDER) #define BITS_PER_LONG (BYTES_PER_LONG << 3) +/* xen_ulong_t is always 64 bits */ +#define BITS_PER_XEN_ULONG 64 + #define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_PAGING_LEVELS 3 diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 0a5f031..cf93bd5 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -14,6 +14,8 @@ #define BITS_PER_LONG (BYTES_PER_LONG << 3) #define BITS_PER_BYTE 8 +#define BITS_PER_XEN_ULONG BITS_PER_LONG + #define CONFIG_X86 1 #define CONFIG_X86_HT 1 #define CONFIG_PAGING_ASSISTANCE 1 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 569e76e..cabaf27 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -46,9 +46,9 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_runstate_info_compat_t); extern struct domain *dom0; #ifndef CONFIG_COMPAT -#define BITS_PER_EVTCHN_WORD(d) BITS_PER_LONG +#define BITS_PER_EVTCHN_WORD(d) BITS_PER_XEN_ULONG #else -#define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_LONG) +#define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_XEN_ULONG) #endif #define MAX_EVTCHNS(d) (BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d)) #define EVTCHNS_PER_BUCKET 128 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 14 22:55:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 22:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGH3F-0004mw-0A; Thu, 14 Mar 2013 22:55:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGH3D-0004mn-JD for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 22:55:07 +0000 Received: from [85.158.139.211:32546] by server-7.bemta-5.messagelabs.com id 42/1D-12441-A4552415; Thu, 14 Mar 2013 22:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1363301704!18359305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29439 invoked from network); 14 Mar 2013 22:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 22:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGH39-00057j-BL for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGH38-0007Pf-Vw for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 22:55:03 +0000 Date: Thu, 14 Mar 2013 22:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Disable use of O_DIRECT by default as it results in crashes. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3903bbac78a81fcbce1350cdce860764a62783a Author: Alex Bligh AuthorDate: Mon Mar 11 14:02:49 2013 +0000 Commit: Ian Jackson CommitDate: Thu Mar 14 19:28:53 2013 +0000 xen: Disable use of O_DIRECT by default as it results in crashes. Due to what is almost certainly a kernel bug, writes with O_DIRECT may continue to reference the page after the write has been marked as completed, particularly in the case of TCP retransmit. In other scenarios, this "merely" risks data corruption on the write, but with Xen pages from domU are only transiently mapped into dom0's memory, resulting in kernel panics when they are subsequently accessed. This brings PV devices in line with emulated devices. Removing O_DIRECT is safe as barrier operations are now correctly passed through. See: http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html for more details. Signed-off-by: Alex Bligh Acked-by: Stefano Stabellini --- hw/xen_disk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 69e1d9d..357f9c1 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -744,7 +744,7 @@ static int blk_init(struct XenDevice *xendev) } /* read-only ? */ - qflags = BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_NATIVE_AIO; + qflags = BDRV_O_CACHE_WB | BDRV_O_NATIVE_AIO; if (strcmp(blkdev->mode, "w") == 0) { qflags |= BDRV_O_RDWR; } else { -- 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 Thu Mar 14 22:55:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Mar 2013 22:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGH3F-0004mw-0A; Thu, 14 Mar 2013 22:55:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGH3D-0004mn-JD for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 22:55:07 +0000 Received: from [85.158.139.211:32546] by server-7.bemta-5.messagelabs.com id 42/1D-12441-A4552415; Thu, 14 Mar 2013 22:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1363301704!18359305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29439 invoked from network); 14 Mar 2013 22:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Mar 2013 22:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGH39-00057j-BL for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGH38-0007Pf-Vw for xen-changelog@lists.xensource.com; Thu, 14 Mar 2013 22:55:03 +0000 Date: Thu, 14 Mar 2013 22:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Disable use of O_DIRECT by default as it results in crashes. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3903bbac78a81fcbce1350cdce860764a62783a Author: Alex Bligh AuthorDate: Mon Mar 11 14:02:49 2013 +0000 Commit: Ian Jackson CommitDate: Thu Mar 14 19:28:53 2013 +0000 xen: Disable use of O_DIRECT by default as it results in crashes. Due to what is almost certainly a kernel bug, writes with O_DIRECT may continue to reference the page after the write has been marked as completed, particularly in the case of TCP retransmit. In other scenarios, this "merely" risks data corruption on the write, but with Xen pages from domU are only transiently mapped into dom0's memory, resulting in kernel panics when they are subsequently accessed. This brings PV devices in line with emulated devices. Removing O_DIRECT is safe as barrier operations are now correctly passed through. See: http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html for more details. Signed-off-by: Alex Bligh Acked-by: Stefano Stabellini --- hw/xen_disk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 69e1d9d..357f9c1 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -744,7 +744,7 @@ static int blk_init(struct XenDevice *xendev) } /* read-only ? */ - qflags = BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_NATIVE_AIO; + qflags = BDRV_O_CACHE_WB | BDRV_O_NATIVE_AIO; if (strcmp(blkdev->mode, "w") == 0) { qflags |= BDRV_O_RDWR; } else { -- 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 Mar 15 03:44:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLYv-0005pJ-LH; Fri, 15 Mar 2013 03:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLYu-0005pA-7M for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:08 +0000 Received: from [85.158.137.99:28132] by server-11.bemta-3.messagelabs.com id 9F/97-01263-70992415; Fri, 15 Mar 2013 03:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1363319045!197334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19932 invoked from network); 15 Mar 2013 03:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLYp-0006tg-SK for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLYp-00061k-Cp for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:03 +0000 Date: Fri, 15 Mar 2013 03:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dtb: correct handling of #address-cells and #size-cells. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c46b4ce85516e208f587fe518dad24156d84ac2 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:33 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:49 2013 +0000 dtb: correct handling of #address-cells and #size-cells. If a node does not have #*-cells then the parent's value should be used. Currently we were asssuming zero which is useless. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 9 +++++++-- xen/common/device_tree.c | 12 ++++++++---- xen/include/xen/device_tree.h | 3 ++- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 13dc049..9ed5bbc 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -195,11 +195,16 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, continue; } + /* We cannot handle descending more than one level at a time */ + ASSERT( depth <= last_depth + 1 ); + while ( last_depth-- >= depth ) fdt_end_node(kinfo->fdt); - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); fdt_begin_node(kinfo->fdt, name); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9af0cd4..19c000e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -120,13 +120,14 @@ void device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, set_val(cell, size_cells, size); } -u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name) +u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, + u32 dflt) { const struct fdt_property *prop; prop = fdt_get_property(fdt, node, prop_name, NULL); if ( !prop || prop->len < sizeof(u32) ) - return 0; /* default to 0 */ + return dflt; return fdt32_to_cpu(*(uint32_t*)prop->data); } @@ -164,8 +165,11 @@ int device_tree_for_each_node(const void *fdt, continue; } - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); + ret = func(fdt, node, name, depth, address_cells[depth-1], size_cells[depth-1], data); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 1d04e4f..19bda98 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -66,7 +66,8 @@ void device_tree_get_reg(const u32 **cell, u32 address_cells, u32 size_cells, u64 *start, u64 *size); void device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, u64 start, u64 size); -u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name); +u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, + u32 dflt); bool_t device_tree_node_matches(const void *fdt, int node, const char *match); bool_t device_tree_node_compatible(const void *fdt, int node, const char *match); int find_compatible_node(const char *compatible, int *node, int *depth, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLYv-0005pJ-LH; Fri, 15 Mar 2013 03:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLYu-0005pA-7M for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:08 +0000 Received: from [85.158.137.99:28132] by server-11.bemta-3.messagelabs.com id 9F/97-01263-70992415; Fri, 15 Mar 2013 03:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1363319045!197334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19932 invoked from network); 15 Mar 2013 03:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLYp-0006tg-SK for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLYp-00061k-Cp for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:03 +0000 Date: Fri, 15 Mar 2013 03:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dtb: correct handling of #address-cells and #size-cells. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c46b4ce85516e208f587fe518dad24156d84ac2 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:33 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:49 2013 +0000 dtb: correct handling of #address-cells and #size-cells. If a node does not have #*-cells then the parent's value should be used. Currently we were asssuming zero which is useless. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 9 +++++++-- xen/common/device_tree.c | 12 ++++++++---- xen/include/xen/device_tree.h | 3 ++- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 13dc049..9ed5bbc 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -195,11 +195,16 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, continue; } + /* We cannot handle descending more than one level at a time */ + ASSERT( depth <= last_depth + 1 ); + while ( last_depth-- >= depth ) fdt_end_node(kinfo->fdt); - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); fdt_begin_node(kinfo->fdt, name); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9af0cd4..19c000e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -120,13 +120,14 @@ void device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, set_val(cell, size_cells, size); } -u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name) +u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, + u32 dflt) { const struct fdt_property *prop; prop = fdt_get_property(fdt, node, prop_name, NULL); if ( !prop || prop->len < sizeof(u32) ) - return 0; /* default to 0 */ + return dflt; return fdt32_to_cpu(*(uint32_t*)prop->data); } @@ -164,8 +165,11 @@ int device_tree_for_each_node(const void *fdt, continue; } - address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); - size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells", + depth > 0 ? address_cells[depth-1] : 0); + size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells", + depth > 0 ? size_cells[depth-1] : 0); + ret = func(fdt, node, name, depth, address_cells[depth-1], size_cells[depth-1], data); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 1d04e4f..19bda98 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -66,7 +66,8 @@ void device_tree_get_reg(const u32 **cell, u32 address_cells, u32 size_cells, u64 *start, u64 *size); void device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, u64 start, u64 size); -u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name); +u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, + u32 dflt); bool_t device_tree_node_matches(const void *fdt, int node, const char *match); bool_t device_tree_node_compatible(const void *fdt, int node, const char *match); int find_compatible_node(const char *compatible, int *node, int *depth, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZ4-0005q9-QQ; Fri, 15 Mar 2013 03:44:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZ4-0005q3-65 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:18 +0000 Received: from [85.158.143.99:47949] by server-1.bemta-4.messagelabs.com id 49/49-06203-11992415; Fri, 15 Mar 2013 03:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363319055!28010293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19622 invoked from network); 15 Mar 2013 03:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 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 1UGLZ1-0006tq-IR for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZ1-000629-8J for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:15 +0000 Date: Fri, 15 Mar 2013 03:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: parse modules from DT during early 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 c8bcb5723355772ca8e20382c559c6b19f639245 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:34 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:56 2013 +0000 xen: arm: parse modules from DT during early boot. The bootloader should populate /chosen/modules/module@/ for each module it wishes to pass to the hypervisor. The content of these nodes is described in docs/misc/arm/device-tree/booting.txt Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 25 +++++++++++++++ xen/common/device_tree.c | 54 ++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt new file mode 100644 index 0000000..94cd3f1 --- /dev/null +++ b/docs/misc/arm/device-tree/booting.txt @@ -0,0 +1,25 @@ +Xen is passed the dom0 kernel and initrd via a reference in the /chosen +node of the device tree. + +Each node has the form /chosen/modules/module@ and contains the following +properties: + +- compatible + + Must be: + + "xen,", "xen,multiboot-module" + + where must be one of: + + - "linux-zimage" -- the dom0 kernel + - "linux-initrd" -- the dom0 ramdisk + +- reg + + Specifies the physical address of the module in RAM and the + length of the module. + +- bootargs (optional) + + Command line associated with this module diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 19c000e..7997f41 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -393,6 +393,48 @@ static void __init process_gic_node(const void *fdt, int node, early_info.gic.gic_vcpu_addr = start; } +static void __init process_multiboot_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + const u32 *cell; + int nr; + struct dt_mb_module *mod; + int len; + + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) + nr = 1; + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) + nr = 2; + else + early_panic("%s not a known xen multiboot type\n", name); + + mod = &early_info.modules.module[nr]; + + prop = fdt_get_property(fdt, node, "reg", NULL); + if ( !prop ) + early_panic("node %s missing `reg' property\n", name); + + cell = (const u32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->start, &mod->size); + + prop = fdt_get_property(fdt, node, "bootargs", &len); + if ( prop ) + { + if ( len > sizeof(mod->cmdline) ) + early_panic("module %d command line too long\n", nr); + + safe_strcpy(mod->cmdline, prop->data); + } + else + mod->cmdline[0] = 0; + + if ( nr > early_info.modules.nr_mods ) + early_info.modules.nr_mods = nr; +} + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -404,6 +446,8 @@ static int __init early_scan_node(const void *fdt, process_cpu_node(fdt, node, name, address_cells, size_cells); else if ( device_tree_node_compatible(fdt, node, "arm,cortex-a15-gic") ) process_gic_node(fdt, node, name, address_cells, size_cells); + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ) + process_multiboot_node(fdt, node, name, address_cells, size_cells); return 0; } @@ -411,12 +455,20 @@ static int __init early_scan_node(const void *fdt, static void __init early_print_info(void) { struct dt_mem_info *mi = &early_info.mem; + struct dt_module_info *mods = &early_info.modules; int i; for ( i = 0; i < mi->nr_banks; i++ ) - early_printk("RAM: %016llx - %016llx\n", + early_printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", mi->bank[i].start, mi->bank[i].start + mi->bank[i].size - 1); + early_printk("\n"); + for ( i = 1 ; i < mods->nr_mods + 1; i++ ) + early_printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", + i, + mods->module[i].start, + mods->module[i].start + mods->module[i].size, + mods->module[i].cmdline); } /** -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZ4-0005q9-QQ; Fri, 15 Mar 2013 03:44:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZ4-0005q3-65 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:18 +0000 Received: from [85.158.143.99:47949] by server-1.bemta-4.messagelabs.com id 49/49-06203-11992415; Fri, 15 Mar 2013 03:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363319055!28010293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19622 invoked from network); 15 Mar 2013 03:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 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 1UGLZ1-0006tq-IR for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZ1-000629-8J for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:15 +0000 Date: Fri, 15 Mar 2013 03:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: parse modules from DT during early 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 c8bcb5723355772ca8e20382c559c6b19f639245 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:34 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:56 2013 +0000 xen: arm: parse modules from DT during early boot. The bootloader should populate /chosen/modules/module@/ for each module it wishes to pass to the hypervisor. The content of these nodes is described in docs/misc/arm/device-tree/booting.txt Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 25 +++++++++++++++ xen/common/device_tree.c | 54 ++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt new file mode 100644 index 0000000..94cd3f1 --- /dev/null +++ b/docs/misc/arm/device-tree/booting.txt @@ -0,0 +1,25 @@ +Xen is passed the dom0 kernel and initrd via a reference in the /chosen +node of the device tree. + +Each node has the form /chosen/modules/module@ and contains the following +properties: + +- compatible + + Must be: + + "xen,", "xen,multiboot-module" + + where must be one of: + + - "linux-zimage" -- the dom0 kernel + - "linux-initrd" -- the dom0 ramdisk + +- reg + + Specifies the physical address of the module in RAM and the + length of the module. + +- bootargs (optional) + + Command line associated with this module diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 19c000e..7997f41 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -393,6 +393,48 @@ static void __init process_gic_node(const void *fdt, int node, early_info.gic.gic_vcpu_addr = start; } +static void __init process_multiboot_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + const u32 *cell; + int nr; + struct dt_mb_module *mod; + int len; + + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) + nr = 1; + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) + nr = 2; + else + early_panic("%s not a known xen multiboot type\n", name); + + mod = &early_info.modules.module[nr]; + + prop = fdt_get_property(fdt, node, "reg", NULL); + if ( !prop ) + early_panic("node %s missing `reg' property\n", name); + + cell = (const u32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->start, &mod->size); + + prop = fdt_get_property(fdt, node, "bootargs", &len); + if ( prop ) + { + if ( len > sizeof(mod->cmdline) ) + early_panic("module %d command line too long\n", nr); + + safe_strcpy(mod->cmdline, prop->data); + } + else + mod->cmdline[0] = 0; + + if ( nr > early_info.modules.nr_mods ) + early_info.modules.nr_mods = nr; +} + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -404,6 +446,8 @@ static int __init early_scan_node(const void *fdt, process_cpu_node(fdt, node, name, address_cells, size_cells); else if ( device_tree_node_compatible(fdt, node, "arm,cortex-a15-gic") ) process_gic_node(fdt, node, name, address_cells, size_cells); + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ) + process_multiboot_node(fdt, node, name, address_cells, size_cells); return 0; } @@ -411,12 +455,20 @@ static int __init early_scan_node(const void *fdt, static void __init early_print_info(void) { struct dt_mem_info *mi = &early_info.mem; + struct dt_module_info *mods = &early_info.modules; int i; for ( i = 0; i < mi->nr_banks; i++ ) - early_printk("RAM: %016llx - %016llx\n", + early_printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", mi->bank[i].start, mi->bank[i].start + mi->bank[i].size - 1); + early_printk("\n"); + for ( i = 1 ; i < mods->nr_mods + 1; i++ ) + early_printk("MODULE[%d]: %"PRIpaddr" - %"PRIpaddr" %s\n", + i, + mods->module[i].start, + mods->module[i].start + mods->module[i].size, + mods->module[i].cmdline); } /** -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLZG-0005rJ-Tx; Fri, 15 Mar 2013 03:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZF-0005r7-Tt for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:30 +0000 Received: from [85.158.139.83:25150] by server-11.bemta-5.messagelabs.com id 66/8B-27486-D1992415; Fri, 15 Mar 2013 03:44:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1363319066!23635133!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5779 invoked from network); 15 Mar 2013 03:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZC-0006tw-34 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZB-00062V-Mx for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:25 +0000 Date: Fri, 15 Mar 2013 03:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: strip xen, multiboot-module nodes from dom0 device tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f0d955632f5b5fe1a8b74e686ea2d80936b3928 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:35 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:58 2013 +0000 xen: strip xen, multiboot-module nodes from dom0 device tree These nodes are used by Xen to find the initial modules. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9ed5bbc..48f8a65 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -172,6 +172,33 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, return prop; } +/* Returns the next node in fdt (starting from offset) which should be + * passed through to dom0. + */ +static int fdt_next_dom0_node(const void *fdt, int node, + int *depth_out) +{ + int depth = *depth_out; + + while ( (node = fdt_next_node(fdt, node, &depth)) && + node >= 0 && depth >= 0 ) + { + if ( depth >= DEVICE_TREE_MAX_DEPTH ) + break; + + /* Skip multiboot subnodes */ + if ( fdt_node_check_compatible(fdt, node, + "xen,multiboot-module" ) == 0 ) + continue; + + /* We've arrived at a node which dom0 is interested in. */ + break; + } + + *depth_out = depth; + return node; +} + static int write_nodes(struct domain *d, struct kernel_info *kinfo, const void *fdt) { @@ -183,7 +210,7 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, for ( node = 0, depth = 0; node >= 0 && depth >= 0; - node = fdt_next_node(fdt, node, &depth) ) + node = fdt_next_dom0_node(fdt, node, &depth) ) { const char *name; @@ -191,7 +218,8 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, if ( depth >= DEVICE_TREE_MAX_DEPTH ) { - printk("warning: node `%s' is nested too deep\n", name); + printk("warning: node `%s' is nested too deep (%d)\n", + name, depth); continue; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLZG-0005rJ-Tx; Fri, 15 Mar 2013 03:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZF-0005r7-Tt for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:30 +0000 Received: from [85.158.139.83:25150] by server-11.bemta-5.messagelabs.com id 66/8B-27486-D1992415; Fri, 15 Mar 2013 03:44:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1363319066!23635133!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5779 invoked from network); 15 Mar 2013 03:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZC-0006tw-34 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZB-00062V-Mx for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:25 +0000 Date: Fri, 15 Mar 2013 03:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: strip xen, multiboot-module nodes from dom0 device tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f0d955632f5b5fe1a8b74e686ea2d80936b3928 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:35 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:58 2013 +0000 xen: strip xen, multiboot-module nodes from dom0 device tree These nodes are used by Xen to find the initial modules. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9ed5bbc..48f8a65 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -172,6 +172,33 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, return prop; } +/* Returns the next node in fdt (starting from offset) which should be + * passed through to dom0. + */ +static int fdt_next_dom0_node(const void *fdt, int node, + int *depth_out) +{ + int depth = *depth_out; + + while ( (node = fdt_next_node(fdt, node, &depth)) && + node >= 0 && depth >= 0 ) + { + if ( depth >= DEVICE_TREE_MAX_DEPTH ) + break; + + /* Skip multiboot subnodes */ + if ( fdt_node_check_compatible(fdt, node, + "xen,multiboot-module" ) == 0 ) + continue; + + /* We've arrived at a node which dom0 is interested in. */ + break; + } + + *depth_out = depth; + return node; +} + static int write_nodes(struct domain *d, struct kernel_info *kinfo, const void *fdt) { @@ -183,7 +210,7 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, for ( node = 0, depth = 0; node >= 0 && depth >= 0; - node = fdt_next_node(fdt, node, &depth) ) + node = fdt_next_dom0_node(fdt, node, &depth) ) { const char *name; @@ -191,7 +218,8 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, if ( depth >= DEVICE_TREE_MAX_DEPTH ) { - printk("warning: node `%s' is nested too deep\n", name); + printk("warning: node `%s' is nested too deep (%d)\n", + name, depth); continue; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLZR-0005sq-1C; Fri, 15 Mar 2013 03:44:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZP-0005sa-CX for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:39 +0000 Received: from [85.158.139.211:48970] by server-8.bemta-5.messagelabs.com id 38/EA-05790-62992415; Fri, 15 Mar 2013 03:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1363319076!18357381!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16413 invoked from network); 15 Mar 2013 03:44: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; 15 Mar 2013 03:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZM-0006u1-Hx for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZM-00063e-6g for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:36 +0000 Date: Fri, 15 Mar 2013 03:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: create dom0 DTB /hypervisor/ node dynamically. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1c231b12aae6de7521bed69b41dcb07c8349cc7 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:36 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:59 2013 +0000 xen: arm: create dom0 DTB /hypervisor/ node dynamically. I initially added hypervisor-new and confirmed via /proc/device-model that the content is the same before changing it to drop and replace an existing node. NB: There is an ambiguity in the compatibility property. linux/arch/arm/boot/dts/xenvm-4.2.dts says "xen,xen-4.2" while Documentation/devicetree/bindings/arm/xen.txt says "xen,xen-4.3". I have used the actual hypervisor version as discussed in http://marc.info/?l=xen-devel&m=135963416631423 Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 57 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 48f8a65..e9c84c7 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -34,7 +35,7 @@ custom_param("dom0_mem", parse_dom0_mem); * are added (yet) but one terminating reserve map entry (16 bytes) is * added. */ -#define DOM0_FDT_EXTRA_SIZE (sizeof(struct fdt_reserve_entry)) +#define DOM0_FDT_EXTRA_SIZE (128 + sizeof(struct fdt_reserve_entry)) struct vcpu *__init alloc_dom0_vcpu0(void) { @@ -186,6 +187,13 @@ static int fdt_next_dom0_node(const void *fdt, int node, if ( depth >= DEVICE_TREE_MAX_DEPTH ) break; + /* Skip /hypervisor/ node. We will inject our own. */ + if ( fdt_node_check_compatible(fdt, node, "xen,xen" ) == 0 ) + { + printk("Device-tree contains \"xen,xen\" node. Ignoring.\n"); + continue; + } + /* Skip multiboot subnodes */ if ( fdt_node_check_compatible(fdt, node, "xen,multiboot-module" ) == 0 ) @@ -199,6 +207,48 @@ static int fdt_next_dom0_node(const void *fdt, int node, return node; } +static void make_hypervisor_node(void *fdt, int addrcells, int sizecells) +{ + const char compat[] = + "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" + "xen,xen"; + u32 reg[4]; + u32 intr[3]; + u32 *cell; + + /* + * Sanity-check address sizes, since addresses and sizes which do + * not take up exactly 4 or 8 bytes are not supported. + */ + if ((addrcells != 1 && addrcells != 2) || + (sizecells != 1 && sizecells != 2)) + panic("Cannot cope with this size"); + + /* See linux Documentation/devicetree/bindings/arm/xen.txt */ + fdt_begin_node(fdt, "hypervisor"); + + /* Cannot use fdt_property_string due to embedded nulls */ + fdt_property(fdt, "compatible", compat, sizeof(compat) + 1); + + /* reg 0 is grant table space */ + cell = ®[0]; + device_tree_set_reg(&cell, addrcells, sizecells, 0xb0000000, 0x20000); + fdt_property(fdt, "reg", reg, + sizeof(reg[0]) * (addrcells + sizecells)); + + /* + * interrupts is evtchn upcall <1 15 0xf08> + * See linux Documentation/devicetree/bindings/arm/gic.txt + */ + intr[0] = cpu_to_fdt32(1); /* is a PPI */ + intr[1] = cpu_to_fdt32(VGIC_IRQ_EVTCHN_CALLBACK - 16); /* PPIs start at 16 */ + intr[2] = cpu_to_fdt32(0xf08); /* Active-low level-sensitive */ + + fdt_property(fdt, "interrupts", intr, sizeof(intr[0]) * 3); + + fdt_end_node(fdt); +} + static int write_nodes(struct domain *d, struct kernel_info *kinfo, const void *fdt) { @@ -244,9 +294,12 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, last_depth = depth; } - while ( last_depth-- >= 0 ) + while ( last_depth-- >= 1 ) fdt_end_node(kinfo->fdt); + make_hypervisor_node(kinfo->fdt, address_cells[0], size_cells[0]); + + fdt_end_node(kinfo->fdt); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLZR-0005sq-1C; Fri, 15 Mar 2013 03:44:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZP-0005sa-CX for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:39 +0000 Received: from [85.158.139.211:48970] by server-8.bemta-5.messagelabs.com id 38/EA-05790-62992415; Fri, 15 Mar 2013 03:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1363319076!18357381!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16413 invoked from network); 15 Mar 2013 03:44: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; 15 Mar 2013 03:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZM-0006u1-Hx for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZM-00063e-6g for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:36 +0000 Date: Fri, 15 Mar 2013 03:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: create dom0 DTB /hypervisor/ node dynamically. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1c231b12aae6de7521bed69b41dcb07c8349cc7 Author: Ian Campbell AuthorDate: Mon Feb 18 15:20:36 2013 +0000 Commit: Ian Campbell CommitDate: Wed Mar 13 10:56:59 2013 +0000 xen: arm: create dom0 DTB /hypervisor/ node dynamically. I initially added hypervisor-new and confirmed via /proc/device-model that the content is the same before changing it to drop and replace an existing node. NB: There is an ambiguity in the compatibility property. linux/arch/arm/boot/dts/xenvm-4.2.dts says "xen,xen-4.2" while Documentation/devicetree/bindings/arm/xen.txt says "xen,xen-4.3". I have used the actual hypervisor version as discussed in http://marc.info/?l=xen-devel&m=135963416631423 Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 57 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 48f8a65..e9c84c7 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -34,7 +35,7 @@ custom_param("dom0_mem", parse_dom0_mem); * are added (yet) but one terminating reserve map entry (16 bytes) is * added. */ -#define DOM0_FDT_EXTRA_SIZE (sizeof(struct fdt_reserve_entry)) +#define DOM0_FDT_EXTRA_SIZE (128 + sizeof(struct fdt_reserve_entry)) struct vcpu *__init alloc_dom0_vcpu0(void) { @@ -186,6 +187,13 @@ static int fdt_next_dom0_node(const void *fdt, int node, if ( depth >= DEVICE_TREE_MAX_DEPTH ) break; + /* Skip /hypervisor/ node. We will inject our own. */ + if ( fdt_node_check_compatible(fdt, node, "xen,xen" ) == 0 ) + { + printk("Device-tree contains \"xen,xen\" node. Ignoring.\n"); + continue; + } + /* Skip multiboot subnodes */ if ( fdt_node_check_compatible(fdt, node, "xen,multiboot-module" ) == 0 ) @@ -199,6 +207,48 @@ static int fdt_next_dom0_node(const void *fdt, int node, return node; } +static void make_hypervisor_node(void *fdt, int addrcells, int sizecells) +{ + const char compat[] = + "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" + "xen,xen"; + u32 reg[4]; + u32 intr[3]; + u32 *cell; + + /* + * Sanity-check address sizes, since addresses and sizes which do + * not take up exactly 4 or 8 bytes are not supported. + */ + if ((addrcells != 1 && addrcells != 2) || + (sizecells != 1 && sizecells != 2)) + panic("Cannot cope with this size"); + + /* See linux Documentation/devicetree/bindings/arm/xen.txt */ + fdt_begin_node(fdt, "hypervisor"); + + /* Cannot use fdt_property_string due to embedded nulls */ + fdt_property(fdt, "compatible", compat, sizeof(compat) + 1); + + /* reg 0 is grant table space */ + cell = ®[0]; + device_tree_set_reg(&cell, addrcells, sizecells, 0xb0000000, 0x20000); + fdt_property(fdt, "reg", reg, + sizeof(reg[0]) * (addrcells + sizecells)); + + /* + * interrupts is evtchn upcall <1 15 0xf08> + * See linux Documentation/devicetree/bindings/arm/gic.txt + */ + intr[0] = cpu_to_fdt32(1); /* is a PPI */ + intr[1] = cpu_to_fdt32(VGIC_IRQ_EVTCHN_CALLBACK - 16); /* PPIs start at 16 */ + intr[2] = cpu_to_fdt32(0xf08); /* Active-low level-sensitive */ + + fdt_property(fdt, "interrupts", intr, sizeof(intr[0]) * 3); + + fdt_end_node(fdt); +} + static int write_nodes(struct domain *d, struct kernel_info *kinfo, const void *fdt) { @@ -244,9 +294,12 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, last_depth = depth; } - while ( last_depth-- >= 0 ) + while ( last_depth-- >= 1 ) fdt_end_node(kinfo->fdt); + make_hypervisor_node(kinfo->fdt, address_cells[0], size_cells[0]); + + fdt_end_node(kinfo->fdt); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLZb-0005up-4V; Fri, 15 Mar 2013 03:44:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZZ-0005uN-B5 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:49 +0000 Received: from [193.109.254.147:61950] by server-2.bemta-14.messagelabs.com id FB/00-14115-03992415; Fri, 15 Mar 2013 03:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1363319087!1694818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21144 invoked from network); 15 Mar 2013 03:44:47 -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; 15 Mar 2013 03:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZW-0006uA-Ps for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZW-000640-MW for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:46 +0000 Date: Fri, 15 Mar 2013 03:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't launch more than one tapdisk process for each disk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec398660e89ca18bb8d061d5047d682bd383778a Author: Roger Pau Monne AuthorDate: Tue Mar 5 17:06:29 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 14:40:23 2013 +0000 libxl: don't launch more than one tapdisk process for each disk When adding a disk don't launch multiple tapdisk instances for the same disk, if transaction fails in device_disk_add reuse the same tapdisk for further tries instead of creating a new instance each time a transaction fails. Reported-by: Darren Shepherd Signed-off-by: Roger Pau Monne Tested-by: Darren Shepherd --- tools/libxl/libxl.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 73e0dc3..345d88b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2032,7 +2032,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, STATE_AO_GC(aodev->ao); flexarray_t *front = NULL; flexarray_t *back = NULL; - char *dev, *script; + char *dev = NULL, *script; libxl__device *device; int rc; libxl_ctx *ctx = gc->owner; @@ -2095,12 +2095,15 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, break; case LIBXL_DISK_BACKEND_TAP: - dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); - if (!dev) { - LOG(ERROR, "failed to get blktap devpath for %p\n", - disk->pdev_path); - rc = ERROR_FAIL; - goto out; + if (dev == NULL) { + dev = libxl__blktap_devpath(gc, disk->pdev_path, + disk->format); + if (!dev) { + LOG(ERROR, "failed to get blktap devpath for %p\n", + disk->pdev_path); + rc = ERROR_FAIL; + goto out; + } } flexarray_append(back, "tapdisk-params"); flexarray_append(back, libxl__sprintf(gc, "%s:%s", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:44:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:44: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 1UGLZb-0005up-4V; Fri, 15 Mar 2013 03:44:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZZ-0005uN-B5 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:49 +0000 Received: from [193.109.254.147:61950] by server-2.bemta-14.messagelabs.com id FB/00-14115-03992415; Fri, 15 Mar 2013 03:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1363319087!1694818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21144 invoked from network); 15 Mar 2013 03:44:47 -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; 15 Mar 2013 03:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZW-0006uA-Ps for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZW-000640-MW for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:46 +0000 Date: Fri, 15 Mar 2013 03:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't launch more than one tapdisk process for each disk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec398660e89ca18bb8d061d5047d682bd383778a Author: Roger Pau Monne AuthorDate: Tue Mar 5 17:06:29 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 14:40:23 2013 +0000 libxl: don't launch more than one tapdisk process for each disk When adding a disk don't launch multiple tapdisk instances for the same disk, if transaction fails in device_disk_add reuse the same tapdisk for further tries instead of creating a new instance each time a transaction fails. Reported-by: Darren Shepherd Signed-off-by: Roger Pau Monne Tested-by: Darren Shepherd --- tools/libxl/libxl.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 73e0dc3..345d88b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2032,7 +2032,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, STATE_AO_GC(aodev->ao); flexarray_t *front = NULL; flexarray_t *back = NULL; - char *dev, *script; + char *dev = NULL, *script; libxl__device *device; int rc; libxl_ctx *ctx = gc->owner; @@ -2095,12 +2095,15 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, break; case LIBXL_DISK_BACKEND_TAP: - dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); - if (!dev) { - LOG(ERROR, "failed to get blktap devpath for %p\n", - disk->pdev_path); - rc = ERROR_FAIL; - goto out; + if (dev == NULL) { + dev = libxl__blktap_devpath(gc, disk->pdev_path, + disk->format); + if (!dev) { + LOG(ERROR, "failed to get blktap devpath for %p\n", + disk->pdev_path); + rc = ERROR_FAIL; + goto out; + } } flexarray_append(back, "tapdisk-params"); flexarray_append(back, libxl__sprintf(gc, "%s:%s", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45: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 1UGLZk-0005wb-7a; Fri, 15 Mar 2013 03:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZj-0005wL-Du for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:59 +0000 Received: from [193.109.254.147:26269] by server-10.bemta-14.messagelabs.com id C4/D5-11798-A3992415; Fri, 15 Mar 2013 03:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1363319097!6519242!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14193 invoked from network); 15 Mar 2013 03:44:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZh-0006uJ-4x for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZg-00064M-TI for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:56 +0000 Date: Fri, 15 Mar 2013 03:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove double check in NetBSD hotplug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7064090338459385466==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7064090338459385466== Content-Type: text/plain commit f493a3228f7c3c6937f2798fea1f4ed44fb3a425 Author: Roger Pau Monne AuthorDate: Wed Jan 23 17:55:44 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 14:45:05 2013 +0000 libxl: remove double check in NetBSD hotplug Remove a duplicated check performed in libxl__get_hotplug_script_info for NetBSD Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_netbsd.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 9587833..36662c0 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -76,10 +76,6 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, switch (dev->backend_kind) { case LIBXL__DEVICE_KIND_VBD: case LIBXL__DEVICE_KIND_VIF: - if (num_exec != 0) { - rc = 0; - goto out; - } rc = libxl__hotplug(gc, dev, args, action); if (!rc) rc = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7064090338459385466== 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 --===============7064090338459385466==-- From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45: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 1UGLZk-0005wb-7a; Fri, 15 Mar 2013 03:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZj-0005wL-Du for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:59 +0000 Received: from [193.109.254.147:26269] by server-10.bemta-14.messagelabs.com id C4/D5-11798-A3992415; Fri, 15 Mar 2013 03:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1363319097!6519242!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14193 invoked from network); 15 Mar 2013 03:44:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZh-0006uJ-4x for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZg-00064M-TI for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:44:56 +0000 Date: Fri, 15 Mar 2013 03:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove double check in NetBSD hotplug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7064090338459385466==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7064090338459385466== Content-Type: text/plain commit f493a3228f7c3c6937f2798fea1f4ed44fb3a425 Author: Roger Pau Monne AuthorDate: Wed Jan 23 17:55:44 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 14:45:05 2013 +0000 libxl: remove double check in NetBSD hotplug Remove a duplicated check performed in libxl__get_hotplug_script_info for NetBSD Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_netbsd.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 9587833..36662c0 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -76,10 +76,6 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, switch (dev->backend_kind) { case LIBXL__DEVICE_KIND_VBD: case LIBXL__DEVICE_KIND_VIF: - if (num_exec != 0) { - rc = 0; - goto out; - } rc = libxl__hotplug(gc, dev, args, action); if (!rc) rc = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7064090338459385466== 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 --===============7064090338459385466==-- From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa2-0005zn-BA; Fri, 15 Mar 2013 03:45:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa0-0005zT-Pg for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:17 +0000 Received: from [85.158.138.51:7560] by server-10.bemta-3.messagelabs.com id 0B/10-19664-74992415; Fri, 15 Mar 2013 03:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1363319108!9018922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3093 invoked from network); 15 Mar 2013 03:45:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZr-0006vL-Dh for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZr-00064q-8q for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:07 +0000 Date: Fri, 15 Mar 2013 03:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: move libxl_device_action to idl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0553598333629515107==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0553598333629515107== Content-Type: text/plain commit d46d13606e5533d63a83c6541942d7d66f217896 Author: Roger Pau Monne AuthorDate: Wed Jan 23 17:55:39 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 14:48:00 2013 +0000 libxl: move libxl_device_action to idl Move to idl for ease of expansion and auto-generated functions. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 18 +++++++++--------- tools/libxl/libxl_device.c | 11 ++++++----- tools/libxl/libxl_internal.h | 6 ------ tools/libxl/libxl_linux.c | 7 ++++--- tools/libxl/libxl_netbsd.c | 2 +- tools/libxl/libxl_types_internal.idl | 5 +++++ 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 345d88b..a09c0fa 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1695,12 +1695,12 @@ static void device_addrm_aocomplete(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->rc) { if (aodev->dev) { LOG(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); } else { LOG(ERROR, "unable to %s device", - aodev->action == DEVICE_CONNECT ? "add" : "remove"); + libxl__device_action_to_string(aodev->action)); } goto out; } @@ -1806,7 +1806,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, libxl__xs_kvs_of_flexarray(gc, front, front->count)); aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -2166,7 +2166,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, } aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -2631,7 +2631,7 @@ static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev) rc = aodev->rc; if (rc) { LOGE(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); goto out; @@ -2685,7 +2685,7 @@ void libxl__device_disk_local_initiate_detach(libxl__egc *egc, disk, device); if (rc != 0) goto out; - aodev->action = DEVICE_DISCONNECT; + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; aodev->dev = device; aodev->callback = local_device_detach_cb; aodev->force = 0; @@ -2716,7 +2716,7 @@ static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->rc) { LOGE(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); goto out; @@ -2895,7 +2895,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl__xs_kvs_of_flexarray(gc, front, front->count)); aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -3373,7 +3373,7 @@ out: \ GCNEW(aodev); \ libxl__prepare_ao_device(ao, aodev); \ - aodev->action = DEVICE_DISCONNECT; \ + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; \ aodev->dev = device; \ aodev->callback = device_addrm_aocomplete; \ aodev->force = f; \ diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 58d3f35..eeea9d9 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -614,7 +614,7 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) continue; } aodev = libxl__multidev_prepare(multidev); - aodev->action = DEVICE_DISCONNECT; + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; aodev->dev = dev; aodev->force = drs->force; libxl__initiate_device_remove(egc, aodev); @@ -849,7 +849,8 @@ static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, device_backend_cleanup(gc, aodev); - if (rc == ERROR_TIMEDOUT && aodev->action == DEVICE_DISCONNECT && + if (rc == ERROR_TIMEDOUT && + aodev->action == LIBXL__DEVICE_ACTION_REMOVE && !aodev->force) { aodev->force = 1; libxl__initiate_device_remove(egc, aodev); @@ -858,7 +859,7 @@ static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, if (rc) { LOG(ERROR, "unable to %s device with path %s", - aodev->action == DEVICE_CONNECT ? "connect" : "disconnect", + libxl__device_action_to_string(aodev->action), libxl__device_backend_path(gc, aodev->dev)); goto out; } @@ -981,7 +982,7 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, if (hotplug_error) LOG(ERROR, "script: %s", hotplug_error); aodev->rc = ERROR_FAIL; - if (aodev->action == DEVICE_CONNECT) + if (aodev->action == LIBXL__DEVICE_ACTION_ADD) /* * Only fail on device connection, on disconnection * ignore error, and continue with the remove process @@ -1011,7 +1012,7 @@ static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) device_hotplug_clean(gc, aodev); /* Clean xenstore if it's a disconnection */ - if (aodev->action == DEVICE_DISCONNECT) { + if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) { rc = libxl__device_destroy(gc, aodev->dev); if (!aodev->rc) aodev->rc = rc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1567b4b..12b6a6c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1833,12 +1833,6 @@ _hidden const char *libxl__run_dir_path(void); /*----- device addition/removal -----*/ -/* Action to perform (either connect or disconnect) */ -typedef enum { - DEVICE_CONNECT, - DEVICE_DISCONNECT -} libxl__device_action; - typedef struct libxl__ao_device libxl__ao_device; typedef struct libxl__multidev libxl__multidev; typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 1fed3cd..1ef13c0 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -173,11 +173,12 @@ static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev, (*args)[nr++] = script; if (nictype == LIBXL_NIC_TYPE_VIF_IOEMU && num_exec) { - (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = (char *) libxl__device_action_to_string(action); (*args)[nr++] = "type_if=tap"; (*args)[nr++] = NULL; } else { - (*args)[nr++] = action == DEVICE_CONNECT ? "online" : "offline"; + (*args)[nr++] = action == LIBXL__DEVICE_ACTION_ADD ? "online" : + "offline"; (*args)[nr++] = "type_if=vif"; (*args)[nr++] = NULL; } @@ -213,7 +214,7 @@ static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, const int arraysize = 3; GCNEW_ARRAY(*args, arraysize); (*args)[nr++] = script; - (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = (char *) libxl__device_action_to_string(action); (*args)[nr++] = NULL; assert(nr == arraysize); diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 36662c0..0ad69af 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -50,7 +50,7 @@ static int libxl__hotplug(libxl__gc *gc, libxl__device *dev, char ***args, GCNEW_ARRAY(*args, arraysize); (*args)[nr++] = script; (*args)[nr++] = be_path; - (*args)[nr++] = GCSPRINTF("%d", action == DEVICE_CONNECT ? + (*args)[nr++] = GCSPRINTF("%d", action == LIBXL__DEVICE_ACTION_ADD ? XenbusStateInitWait : XenbusStateClosed); (*args)[nr++] = NULL; assert(nr == arraysize); diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index c40120e..cb9444f 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -33,3 +33,8 @@ libxl__device_console = Struct("device_console", [ ("consback", libxl__console_backend), ("output", string), ]) + +libxl__device_action = Enumeration("device_action", [ + (1, "ADD"), + (2, "REMOVE"), + ]) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0553598333629515107== 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 --===============0553598333629515107==-- From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa2-0005zn-BA; Fri, 15 Mar 2013 03:45:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa0-0005zT-Pg for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:17 +0000 Received: from [85.158.138.51:7560] by server-10.bemta-3.messagelabs.com id 0B/10-19664-74992415; Fri, 15 Mar 2013 03:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1363319108!9018922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3093 invoked from network); 15 Mar 2013 03:45:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLZr-0006vL-Dh for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLZr-00064q-8q for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:07 +0000 Date: Fri, 15 Mar 2013 03:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: move libxl_device_action to idl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0553598333629515107==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0553598333629515107== Content-Type: text/plain commit d46d13606e5533d63a83c6541942d7d66f217896 Author: Roger Pau Monne AuthorDate: Wed Jan 23 17:55:39 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 14:48:00 2013 +0000 libxl: move libxl_device_action to idl Move to idl for ease of expansion and auto-generated functions. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 18 +++++++++--------- tools/libxl/libxl_device.c | 11 ++++++----- tools/libxl/libxl_internal.h | 6 ------ tools/libxl/libxl_linux.c | 7 ++++--- tools/libxl/libxl_netbsd.c | 2 +- tools/libxl/libxl_types_internal.idl | 5 +++++ 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 345d88b..a09c0fa 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1695,12 +1695,12 @@ static void device_addrm_aocomplete(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->rc) { if (aodev->dev) { LOG(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); } else { LOG(ERROR, "unable to %s device", - aodev->action == DEVICE_CONNECT ? "add" : "remove"); + libxl__device_action_to_string(aodev->action)); } goto out; } @@ -1806,7 +1806,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, libxl__xs_kvs_of_flexarray(gc, front, front->count)); aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -2166,7 +2166,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, } aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -2631,7 +2631,7 @@ static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev) rc = aodev->rc; if (rc) { LOGE(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); goto out; @@ -2685,7 +2685,7 @@ void libxl__device_disk_local_initiate_detach(libxl__egc *egc, disk, device); if (rc != 0) goto out; - aodev->action = DEVICE_DISCONNECT; + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; aodev->dev = device; aodev->callback = local_device_detach_cb; aodev->force = 0; @@ -2716,7 +2716,7 @@ static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev) if (aodev->rc) { LOGE(ERROR, "unable to %s %s with id %u", - aodev->action == DEVICE_CONNECT ? "add" : "remove", + libxl__device_action_to_string(aodev->action), libxl__device_kind_to_string(aodev->dev->kind), aodev->dev->devid); goto out; @@ -2895,7 +2895,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl__xs_kvs_of_flexarray(gc, front, front->count)); aodev->dev = device; - aodev->action = DEVICE_CONNECT; + aodev->action = LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); rc = 0; @@ -3373,7 +3373,7 @@ out: \ GCNEW(aodev); \ libxl__prepare_ao_device(ao, aodev); \ - aodev->action = DEVICE_DISCONNECT; \ + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; \ aodev->dev = device; \ aodev->callback = device_addrm_aocomplete; \ aodev->force = f; \ diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 58d3f35..eeea9d9 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -614,7 +614,7 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) continue; } aodev = libxl__multidev_prepare(multidev); - aodev->action = DEVICE_DISCONNECT; + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; aodev->dev = dev; aodev->force = drs->force; libxl__initiate_device_remove(egc, aodev); @@ -849,7 +849,8 @@ static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, device_backend_cleanup(gc, aodev); - if (rc == ERROR_TIMEDOUT && aodev->action == DEVICE_DISCONNECT && + if (rc == ERROR_TIMEDOUT && + aodev->action == LIBXL__DEVICE_ACTION_REMOVE && !aodev->force) { aodev->force = 1; libxl__initiate_device_remove(egc, aodev); @@ -858,7 +859,7 @@ static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, if (rc) { LOG(ERROR, "unable to %s device with path %s", - aodev->action == DEVICE_CONNECT ? "connect" : "disconnect", + libxl__device_action_to_string(aodev->action), libxl__device_backend_path(gc, aodev->dev)); goto out; } @@ -981,7 +982,7 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, if (hotplug_error) LOG(ERROR, "script: %s", hotplug_error); aodev->rc = ERROR_FAIL; - if (aodev->action == DEVICE_CONNECT) + if (aodev->action == LIBXL__DEVICE_ACTION_ADD) /* * Only fail on device connection, on disconnection * ignore error, and continue with the remove process @@ -1011,7 +1012,7 @@ static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) device_hotplug_clean(gc, aodev); /* Clean xenstore if it's a disconnection */ - if (aodev->action == DEVICE_DISCONNECT) { + if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) { rc = libxl__device_destroy(gc, aodev->dev); if (!aodev->rc) aodev->rc = rc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1567b4b..12b6a6c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1833,12 +1833,6 @@ _hidden const char *libxl__run_dir_path(void); /*----- device addition/removal -----*/ -/* Action to perform (either connect or disconnect) */ -typedef enum { - DEVICE_CONNECT, - DEVICE_DISCONNECT -} libxl__device_action; - typedef struct libxl__ao_device libxl__ao_device; typedef struct libxl__multidev libxl__multidev; typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 1fed3cd..1ef13c0 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -173,11 +173,12 @@ static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev, (*args)[nr++] = script; if (nictype == LIBXL_NIC_TYPE_VIF_IOEMU && num_exec) { - (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = (char *) libxl__device_action_to_string(action); (*args)[nr++] = "type_if=tap"; (*args)[nr++] = NULL; } else { - (*args)[nr++] = action == DEVICE_CONNECT ? "online" : "offline"; + (*args)[nr++] = action == LIBXL__DEVICE_ACTION_ADD ? "online" : + "offline"; (*args)[nr++] = "type_if=vif"; (*args)[nr++] = NULL; } @@ -213,7 +214,7 @@ static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, const int arraysize = 3; GCNEW_ARRAY(*args, arraysize); (*args)[nr++] = script; - (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; + (*args)[nr++] = (char *) libxl__device_action_to_string(action); (*args)[nr++] = NULL; assert(nr == arraysize); diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 36662c0..0ad69af 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -50,7 +50,7 @@ static int libxl__hotplug(libxl__gc *gc, libxl__device *dev, char ***args, GCNEW_ARRAY(*args, arraysize); (*args)[nr++] = script; (*args)[nr++] = be_path; - (*args)[nr++] = GCSPRINTF("%d", action == DEVICE_CONNECT ? + (*args)[nr++] = GCSPRINTF("%d", action == LIBXL__DEVICE_ACTION_ADD ? XenbusStateInitWait : XenbusStateClosed); (*args)[nr++] = NULL; assert(nr == arraysize); diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index c40120e..cb9444f 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -33,3 +33,8 @@ libxl__device_console = Struct("device_console", [ ("consback", libxl__console_backend), ("output", string), ]) + +libxl__device_action = Enumeration("device_action", [ + (1, "ADD"), + (2, "REMOVE"), + ]) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0553598333629515107== 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 --===============0553598333629515107==-- From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa7-00060s-G2; Fri, 15 Mar 2013 03:45:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa5-00060X-PL for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:21 +0000 Received: from [193.109.254.147:26689] by server-16.bemta-14.messagelabs.com id 36/ED-20064-15992415; Fri, 15 Mar 2013 03:45:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1363319118!2125327!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21788 invoked from network); 15 Mar 2013 03:45:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa2-0006vQ-OL for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLa2-00065F-Fa for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:18 +0000 Date: Fri, 15 Mar 2013 03:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: move check for existence of qemuu device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c966179ba4c1ee0461a2d84a1d667629cca21ec8 Author: Ian Jackson AuthorDate: Fri Mar 1 17:17:04 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 15:59:40 2013 +0000 libxl: move check for existence of qemuu device model The stat in libxl__domain_build_info_setdefault's default device model logic works to fall back to qemu-xen-traditional whenever the executable for qemu-xen is not found. We are going to use qemu-xen-traditional in more cases, so break this check out into its own if statement. Also add a pair of braces to make the if() statement symmetrical. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index efeebf2..04bf4a5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -105,22 +105,25 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - else { + } else { + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + } + if (b_info->device_model_version + == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { const char *dm; int rc; - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; dm = libxl__domain_device_model(gc, b_info); rc = access(dm, X_OK); if (rc < 0) { /* qemu-xen unavailable, use qemu-xen-traditional */ if (errno == ENOENT) { LIBXL__LOG_ERRNO(CTX, XTL_VERBOSE, "qemu-xen is unavailable" - ", use qemu-xen-traditional instead"); + ", use qemu-xen-traditional instead"); b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa7-00060s-G2; Fri, 15 Mar 2013 03:45:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa5-00060X-PL for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:21 +0000 Received: from [193.109.254.147:26689] by server-16.bemta-14.messagelabs.com id 36/ED-20064-15992415; Fri, 15 Mar 2013 03:45:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1363319118!2125327!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21788 invoked from network); 15 Mar 2013 03:45:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLa2-0006vQ-OL for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLa2-00065F-Fa for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:18 +0000 Date: Fri, 15 Mar 2013 03:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: move check for existence of qemuu device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c966179ba4c1ee0461a2d84a1d667629cca21ec8 Author: Ian Jackson AuthorDate: Fri Mar 1 17:17:04 2013 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 15:59:40 2013 +0000 libxl: move check for existence of qemuu device model The stat in libxl__domain_build_info_setdefault's default device model logic works to fall back to qemu-xen-traditional whenever the executable for qemu-xen is not found. We are going to use qemu-xen-traditional in more cases, so break this check out into its own if statement. Also add a pair of braces to make the if() statement symmetrical. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index efeebf2..04bf4a5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -105,22 +105,25 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - else { + } else { + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + } + if (b_info->device_model_version + == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { const char *dm; int rc; - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; dm = libxl__domain_device_model(gc, b_info); rc = access(dm, X_OK); if (rc < 0) { /* qemu-xen unavailable, use qemu-xen-traditional */ if (errno == ENOENT) { LIBXL__LOG_ERRNO(CTX, XTL_VERBOSE, "qemu-xen is unavailable" - ", use qemu-xen-traditional instead"); + ", use qemu-xen-traditional instead"); b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45: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 1UGLaN-00063O-JQ; Fri, 15 Mar 2013 03:45:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaL-00063B-KW for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:37 +0000 Received: from [85.158.139.211:21555] by server-3.bemta-5.messagelabs.com id 87/70-17256-06992415; Fri, 15 Mar 2013 03:45:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1363319129!18420034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26184 invoked from network); 15 Mar 2013 03:45:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaC-0006vb-UZ for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLaC-000667-SL for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:28 +0000 Date: Fri, 15 Mar 2013 03:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use qemu-xen (upstream QEMU) as device model 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 ec41430ef6a7385f73bd69facc1cb77443ccc6f3 Author: Stefano Stabellini AuthorDate: Tue Dec 4 13:06:35 2012 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 16:00:00 2013 +0000 libxl: use qemu-xen (upstream QEMU) as device model by default Signed-off-by: Stefano Stabellini Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 12 ++++++------ tools/libxl/libxl_create.c | 10 +++++++--- tools/libxl/libxl_internal.h | 2 ++ tools/libxl/libxl_linux.c | 5 +++++ tools/libxl/libxl_netbsd.c | 5 +++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 25523c9..8db24d7 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1176,15 +1176,15 @@ guest. Valid values are: =over 4 -=item B +=item B -Use the device-model based upon the historical Xen fork of Qemu. This -device-model is currently the default. +Use the device-model merged into the upstream QEMU project. +This device-model is the default for Linux dom0. -=item B +=item B -use the device-model merged into the upstream QEMU project. This -device-model will become the default in a future version of Xen. +Use the device-model based upon the historical Xen fork of Qemu. +This device-model is still the default for NetBSD dom0. =back diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 04bf4a5..7ec8c2b 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -105,9 +105,13 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) + if (libxl_defbool_val(info->device_model_stubdomain)) { + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + } else { + b_info->device_model_version = libxl__default_device_model(gc); + } } else { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 12b6a6c..8be086d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1561,6 +1561,8 @@ _hidden libxl__json_object *libxl__json_parse(libxl__gc *gc_opt, const char *s); /* Based on /local/domain/$domid/dm-version xenstore key * default is qemu xen traditional */ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); + /* Return the system-wide default device model */ +_hidden libxl_device_model_version libxl__default_device_model(libxl__gc *gc); /* Check how executes hotplug script currently */ int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 1ef13c0..d34fbb3 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -267,3 +267,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, out: return rc; } + +libxl_device_model_version libxl__default_device_model(libxl__gc *gc) +{ + return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; +} diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 0ad69af..898e160 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -90,3 +90,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, out: return rc; } + +libxl_device_model_version libxl__default_device_model(libxl__gc *gc) +{ + return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45: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 1UGLaN-00063O-JQ; Fri, 15 Mar 2013 03:45:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaL-00063B-KW for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:37 +0000 Received: from [85.158.139.211:21555] by server-3.bemta-5.messagelabs.com id 87/70-17256-06992415; Fri, 15 Mar 2013 03:45:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1363319129!18420034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26184 invoked from network); 15 Mar 2013 03:45:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaC-0006vb-UZ for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLaC-000667-SL for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:28 +0000 Date: Fri, 15 Mar 2013 03:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use qemu-xen (upstream QEMU) as device model 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 ec41430ef6a7385f73bd69facc1cb77443ccc6f3 Author: Stefano Stabellini AuthorDate: Tue Dec 4 13:06:35 2012 +0000 Commit: Ian Jackson CommitDate: Wed Mar 13 16:00:00 2013 +0000 libxl: use qemu-xen (upstream QEMU) as device model by default Signed-off-by: Stefano Stabellini Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 12 ++++++------ tools/libxl/libxl_create.c | 10 +++++++--- tools/libxl/libxl_internal.h | 2 ++ tools/libxl/libxl_linux.c | 5 +++++ tools/libxl/libxl_netbsd.c | 5 +++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 25523c9..8db24d7 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1176,15 +1176,15 @@ guest. Valid values are: =over 4 -=item B +=item B -Use the device-model based upon the historical Xen fork of Qemu. This -device-model is currently the default. +Use the device-model merged into the upstream QEMU project. +This device-model is the default for Linux dom0. -=item B +=item B -use the device-model merged into the upstream QEMU project. This -device-model will become the default in a future version of Xen. +Use the device-model based upon the historical Xen fork of Qemu. +This device-model is still the default for NetBSD dom0. =back diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 04bf4a5..7ec8c2b 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -105,9 +105,13 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) + if (libxl_defbool_val(info->device_model_stubdomain)) { + b_info->device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + } else { + b_info->device_model_version = libxl__default_device_model(gc); + } } else { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 12b6a6c..8be086d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1561,6 +1561,8 @@ _hidden libxl__json_object *libxl__json_parse(libxl__gc *gc_opt, const char *s); /* Based on /local/domain/$domid/dm-version xenstore key * default is qemu xen traditional */ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); + /* Return the system-wide default device model */ +_hidden libxl_device_model_version libxl__default_device_model(libxl__gc *gc); /* Check how executes hotplug script currently */ int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 1ef13c0..d34fbb3 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -267,3 +267,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, out: return rc; } + +libxl_device_model_version libxl__default_device_model(libxl__gc *gc) +{ + return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; +} diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 0ad69af..898e160 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -90,3 +90,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, out: return rc; } + +libxl_device_model_version libxl__default_device_model(libxl__gc *gc) +{ + return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaS-00064Z-M4; Fri, 15 Mar 2013 03:45:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaQ-000643-Us for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:43 +0000 Received: from [85.158.139.211:51565] by server-1.bemta-5.messagelabs.com id 22/35-14063-66992415; Fri, 15 Mar 2013 03:45:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1363319139!18420045!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26385 invoked from network); 15 Mar 2013 03:45:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaN-0006ve-A3 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLaN-00066X-28 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:39 +0000 Date: Fri, 15 Mar 2013 03:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: use bool_t for flags in shadow-pagetable structs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8c211d80c9d80d4eef09c5d1121f7ef17b61f73 Author: Tim Deegan AuthorDate: Thu Mar 7 12:37:12 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:33:46 2013 +0000 x86/mm: use bool_t for flags in shadow-pagetable structs and reshuffle the domain struct to pack a little better. Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/include/asm-x86/domain.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 97e09ca..fd9fa0f 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -98,23 +98,23 @@ struct shadow_domain { /* 1-to-1 map for use when HVM vcpus have paging disabled */ pagetable_t unpaged_pagetable; + /* reflect guest table dirty status, incremented by write + * emulation and remove write permission */ + atomic_t gtable_dirty_version; + /* Shadow hashtable */ struct page_info **hash_table; - int hash_walking; /* Some function is walking the hash table */ + bool_t hash_walking; /* Some function is walking the hash table */ /* Fast MMIO path heuristic */ - int has_fast_mmio_entries; - - /* reflect guest table dirty status, incremented by write - * emulation and remove write permission - */ - atomic_t gtable_dirty_version; + bool_t has_fast_mmio_entries; /* OOS */ - int oos_active; - int oos_off; + bool_t oos_active; + bool_t oos_off; - int pagetable_dying_op; + /* Has this domain ever used HVMOP_pagetable_dying? */ + bool_t pagetable_dying_op; }; struct shadow_vcpu { @@ -142,7 +142,7 @@ struct shadow_vcpu { unsigned long off[SHADOW_OOS_FIXUPS]; } oos_fixup[SHADOW_OOS_PAGES]; - int pagetable_dying; + bool_t pagetable_dying; }; /************************************************/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaS-00064Z-M4; Fri, 15 Mar 2013 03:45:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaQ-000643-Us for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:43 +0000 Received: from [85.158.139.211:51565] by server-1.bemta-5.messagelabs.com id 22/35-14063-66992415; Fri, 15 Mar 2013 03:45:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1363319139!18420045!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26385 invoked from network); 15 Mar 2013 03:45:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaN-0006ve-A3 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLaN-00066X-28 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:39 +0000 Date: Fri, 15 Mar 2013 03:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: use bool_t for flags in shadow-pagetable structs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8c211d80c9d80d4eef09c5d1121f7ef17b61f73 Author: Tim Deegan AuthorDate: Thu Mar 7 12:37:12 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:33:46 2013 +0000 x86/mm: use bool_t for flags in shadow-pagetable structs and reshuffle the domain struct to pack a little better. Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/include/asm-x86/domain.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 97e09ca..fd9fa0f 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -98,23 +98,23 @@ struct shadow_domain { /* 1-to-1 map for use when HVM vcpus have paging disabled */ pagetable_t unpaged_pagetable; + /* reflect guest table dirty status, incremented by write + * emulation and remove write permission */ + atomic_t gtable_dirty_version; + /* Shadow hashtable */ struct page_info **hash_table; - int hash_walking; /* Some function is walking the hash table */ + bool_t hash_walking; /* Some function is walking the hash table */ /* Fast MMIO path heuristic */ - int has_fast_mmio_entries; - - /* reflect guest table dirty status, incremented by write - * emulation and remove write permission - */ - atomic_t gtable_dirty_version; + bool_t has_fast_mmio_entries; /* OOS */ - int oos_active; - int oos_off; + bool_t oos_active; + bool_t oos_off; - int pagetable_dying_op; + /* Has this domain ever used HVMOP_pagetable_dying? */ + bool_t pagetable_dying_op; }; struct shadow_vcpu { @@ -142,7 +142,7 @@ struct shadow_vcpu { unsigned long off[SHADOW_OOS_FIXUPS]; } oos_fixup[SHADOW_OOS_PAGES]; - int pagetable_dying; + bool_t pagetable_dying; }; /************************************************/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLac-00066b-Oo; Fri, 15 Mar 2013 03:45:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaa-000668-5k for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:52 +0000 Received: from [85.158.139.83:29523] by server-3.bemta-5.messagelabs.com id 3F/80-17256-F6992415; Fri, 15 Mar 2013 03:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1363319149!23314637!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13727 invoked from network); 15 Mar 2013 03:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaX-0006vn-GV for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLaX-00066t-E5 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:49 +0000 Date: Fri, 15 Mar 2013 03:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: warn if we ever run out of shadow/hap pool for p2m/lgd 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 97724f16028522c07f8251d94b6cca4552391fe4 Author: Tim Deegan AuthorDate: Thu Mar 7 12:49:52 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:33:46 2013 +0000 x86/mm: warn if we ever run out of shadow/hap pool for p2m/lgd ops. Even if the error propagates up through the p2m ops to the caller, it'll look like ENOMEM, which won't be obviously a shadow-pool problem. Warn on the console, once per domain. Reported-by: Jan Beulich Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/mm/hap/hap.c | 6 ++++++ xen/arch/x86/mm/shadow/common.c | 8 +++++++- xen/include/asm-x86/domain.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 055833d..bff05d9 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -258,6 +258,12 @@ static struct page_info *hap_alloc_p2m_page(struct domain *d) page_set_owner(pg, d); pg->count_info |= 1; } + else if ( !d->arch.paging.p2m_alloc_failed ) + { + d->arch.paging.p2m_alloc_failed = 1; + dprintk(XENLOG_ERR, "d%i failed to allocate from HAP pool", + d->domain_id); + } paging_unlock(d); return pg; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 691776c..4b576ac 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1591,10 +1591,16 @@ shadow_alloc_p2m_page(struct domain *d) if ( d->arch.paging.shadow.total_pages < shadow_min_acceptable_pages(d) + 1 ) { + if ( !d->arch.paging.p2m_alloc_failed ) + { + d->arch.paging.p2m_alloc_failed = 1; + dprintk(XENLOG_ERR, "d%i failed to allocate from shadow pool", + d->domain_id); + } paging_unlock(d); return NULL; } - + shadow_prealloc(d, SH_type_p2m_table, 1); pg = mfn_to_page(shadow_alloc(d, SH_type_p2m_table, 0)); d->arch.paging.shadow.p2m_pages++; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index fd9fa0f..6f9744a 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -190,6 +190,8 @@ struct paging_domain { * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); void (*free_page)(struct domain *d, struct page_info *pg); + /* Has that pool ever run out of memory? */ + bool_t p2m_alloc_failed; }; struct paging_vcpu { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:45:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLac-00066b-Oo; Fri, 15 Mar 2013 03:45:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaa-000668-5k for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:52 +0000 Received: from [85.158.139.83:29523] by server-3.bemta-5.messagelabs.com id 3F/80-17256-F6992415; Fri, 15 Mar 2013 03:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1363319149!23314637!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13727 invoked from network); 15 Mar 2013 03:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLaX-0006vn-GV for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLaX-00066t-E5 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:49 +0000 Date: Fri, 15 Mar 2013 03:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: warn if we ever run out of shadow/hap pool for p2m/lgd 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 97724f16028522c07f8251d94b6cca4552391fe4 Author: Tim Deegan AuthorDate: Thu Mar 7 12:49:52 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:33:46 2013 +0000 x86/mm: warn if we ever run out of shadow/hap pool for p2m/lgd ops. Even if the error propagates up through the p2m ops to the caller, it'll look like ENOMEM, which won't be obviously a shadow-pool problem. Warn on the console, once per domain. Reported-by: Jan Beulich Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/mm/hap/hap.c | 6 ++++++ xen/arch/x86/mm/shadow/common.c | 8 +++++++- xen/include/asm-x86/domain.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 055833d..bff05d9 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -258,6 +258,12 @@ static struct page_info *hap_alloc_p2m_page(struct domain *d) page_set_owner(pg, d); pg->count_info |= 1; } + else if ( !d->arch.paging.p2m_alloc_failed ) + { + d->arch.paging.p2m_alloc_failed = 1; + dprintk(XENLOG_ERR, "d%i failed to allocate from HAP pool", + d->domain_id); + } paging_unlock(d); return pg; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 691776c..4b576ac 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1591,10 +1591,16 @@ shadow_alloc_p2m_page(struct domain *d) if ( d->arch.paging.shadow.total_pages < shadow_min_acceptable_pages(d) + 1 ) { + if ( !d->arch.paging.p2m_alloc_failed ) + { + d->arch.paging.p2m_alloc_failed = 1; + dprintk(XENLOG_ERR, "d%i failed to allocate from shadow pool", + d->domain_id); + } paging_unlock(d); return NULL; } - + shadow_prealloc(d, SH_type_p2m_table, 1); pg = mfn_to_page(shadow_alloc(d, SH_type_p2m_table, 0)); d->arch.paging.shadow.p2m_pages++; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index fd9fa0f..6f9744a 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -190,6 +190,8 @@ struct paging_domain { * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); void (*free_page)(struct domain *d, struct page_info *pg); + /* Has that pool ever run out of memory? */ + bool_t p2m_alloc_failed; }; struct paging_vcpu { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLal-00068S-SD; Fri, 15 Mar 2013 03:46:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLak-000681-6p for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:02 +0000 Received: from [85.158.139.211:22112] by server-6.bemta-5.messagelabs.com id 36/D3-21466-97992415; Fri, 15 Mar 2013 03:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1363319159!18359224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16349 invoked from network); 15 Mar 2013 03:46: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; 15 Mar 2013 03:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLah-0006vw-LI for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLah-00067F-K0 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:59 +0000 Date: Fri, 15 Mar 2013 03:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ept: check for errors in a few callers of ept_set_entry. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6524455339349779c553af949b81d3d46f051797 Author: Tim Deegan AuthorDate: Thu Mar 7 13:22:32 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:35:56 2013 +0000 x86/ept: check for errors in a few callers of ept_set_entry. AFAICT in all these cases we have the p2m lock and have just checked that the p2m trie is populated so the call should succeed. Make it explicit with ASSERT() rather than just ignoring the result. Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/mm/p2m-ept.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index a2d1591..595c6e7 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -401,8 +401,9 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* then move to the level we want to make real changes */ for ( ; i > target; i-- ) - ept_next_level(p2m, 0, &table, &gfn_remainder, i); - + if ( !ept_next_level(p2m, 0, &table, &gfn_remainder, i) ) + break; + /* We just installed the pages we need. */ ASSERT(i == target); index = gfn_remainder >> (i * EPT_TABLE_ORDER); @@ -704,6 +705,7 @@ void ept_change_entry_emt_with_range(struct domain *d, mfn_t mfn; int order = 0; struct p2m_domain *p2m = p2m_get_hostp2m(d); + int rc; p2m_lock(p2m); for ( gfn = start_gfn; gfn <= end_gfn; gfn++ ) @@ -732,7 +734,11 @@ void ept_change_entry_emt_with_range(struct domain *d, order = level * EPT_TABLE_ORDER; if ( need_modify_ept_entry(p2m, gfn, mfn, e.ipat, e.emt, e.sa_p2mt) ) - ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); + { + rc = ept_set_entry(p2m, gfn, mfn, order, + e.sa_p2mt, e.access); + ASSERT(rc); + } gfn += trunk; break; } @@ -741,8 +747,12 @@ void ept_change_entry_emt_with_range(struct domain *d, } else /* gfn assigned with 4k */ { - if ( need_modify_ept_entry(p2m, gfn, mfn, e.ipat, e.emt, e.sa_p2mt) ) - ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); + if ( need_modify_ept_entry(p2m, gfn, mfn, + e.ipat, e.emt, e.sa_p2mt) ) + { + rc = ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); + ASSERT(rc); + } } } p2m_unlock(p2m); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLal-00068S-SD; Fri, 15 Mar 2013 03:46:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLak-000681-6p for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:02 +0000 Received: from [85.158.139.211:22112] by server-6.bemta-5.messagelabs.com id 36/D3-21466-97992415; Fri, 15 Mar 2013 03:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1363319159!18359224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16349 invoked from network); 15 Mar 2013 03:46: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; 15 Mar 2013 03:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLah-0006vw-LI for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLah-00067F-K0 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:45:59 +0000 Date: Fri, 15 Mar 2013 03:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ept: check for errors in a few callers of ept_set_entry. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6524455339349779c553af949b81d3d46f051797 Author: Tim Deegan AuthorDate: Thu Mar 7 13:22:32 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:35:56 2013 +0000 x86/ept: check for errors in a few callers of ept_set_entry. AFAICT in all these cases we have the p2m lock and have just checked that the p2m trie is populated so the call should succeed. Make it explicit with ASSERT() rather than just ignoring the result. Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/mm/p2m-ept.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index a2d1591..595c6e7 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -401,8 +401,9 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* then move to the level we want to make real changes */ for ( ; i > target; i-- ) - ept_next_level(p2m, 0, &table, &gfn_remainder, i); - + if ( !ept_next_level(p2m, 0, &table, &gfn_remainder, i) ) + break; + /* We just installed the pages we need. */ ASSERT(i == target); index = gfn_remainder >> (i * EPT_TABLE_ORDER); @@ -704,6 +705,7 @@ void ept_change_entry_emt_with_range(struct domain *d, mfn_t mfn; int order = 0; struct p2m_domain *p2m = p2m_get_hostp2m(d); + int rc; p2m_lock(p2m); for ( gfn = start_gfn; gfn <= end_gfn; gfn++ ) @@ -732,7 +734,11 @@ void ept_change_entry_emt_with_range(struct domain *d, order = level * EPT_TABLE_ORDER; if ( need_modify_ept_entry(p2m, gfn, mfn, e.ipat, e.emt, e.sa_p2mt) ) - ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); + { + rc = ept_set_entry(p2m, gfn, mfn, order, + e.sa_p2mt, e.access); + ASSERT(rc); + } gfn += trunk; break; } @@ -741,8 +747,12 @@ void ept_change_entry_emt_with_range(struct domain *d, } else /* gfn assigned with 4k */ { - if ( need_modify_ept_entry(p2m, gfn, mfn, e.ipat, e.emt, e.sa_p2mt) ) - ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); + if ( need_modify_ept_entry(p2m, gfn, mfn, + e.ipat, e.emt, e.sa_p2mt) ) + { + rc = ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); + ASSERT(rc); + } } } p2m_unlock(p2m); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLav-0006Aa-VE; Fri, 15 Mar 2013 03:46:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLau-0006AH-N7 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:12 +0000 Received: from [85.158.138.51:62114] by server-3.bemta-3.messagelabs.com id B5/65-26934-38992415; Fri, 15 Mar 2013 03:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1363319170!19571530!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13590 invoked from network); 15 Mar 2013 03:46:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:46:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLar-0006wV-Ps for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLar-00067e-OK for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:09 +0000 Date: Fri, 15 Mar 2013 03:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_sharing: check for errors in p2m->set_entry(). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ab3eea9d8873cb0c60e59d55a89c2f1842a5063 Author: Tim Deegan AuthorDate: Thu Mar 7 14:08:24 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:36:01 2013 +0000 x86/mem_sharing: check for errors in p2m->set_entry(). This call ought always to succeed. Assert that it does rather than ignoring the return value. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla Acked-by: Jan Beulich --- xen/arch/x86/mm/mem_sharing.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 1caa900..0364bb0 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1273,6 +1273,8 @@ int relinquish_shared_pages(struct domain *d) p2m_access_t a; p2m_type_t t; mfn_t mfn; + int set_rc; + if ( atomic_read(&d->shr_pages) == 0 ) break; mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); @@ -1281,10 +1283,12 @@ int relinquish_shared_pages(struct domain *d) /* Does not fail with ENOMEM given the DESTROY flag */ BUG_ON(__mem_sharing_unshare_page(d, gfn, MEM_SHARING_DESTROY_GFN)); - /* Clear out the p2m entry so no one else may try to - * unshare */ - p2m->set_entry(p2m, gfn, _mfn(0), PAGE_ORDER_4K, - p2m_invalid, p2m_access_rwx); + /* Clear out the p2m entry so no one else may try to + * unshare. Must succeed: we just read the old entry and + * we hold the p2m lock. */ + set_rc = p2m->set_entry(p2m, gfn, _mfn(0), PAGE_ORDER_4K, + p2m_invalid, p2m_access_rwx); + ASSERT(set_rc != 0); count++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLav-0006Aa-VE; Fri, 15 Mar 2013 03:46:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLau-0006AH-N7 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:12 +0000 Received: from [85.158.138.51:62114] by server-3.bemta-3.messagelabs.com id B5/65-26934-38992415; Fri, 15 Mar 2013 03:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1363319170!19571530!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13590 invoked from network); 15 Mar 2013 03:46:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:46:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLar-0006wV-Ps for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLar-00067e-OK for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:09 +0000 Date: Fri, 15 Mar 2013 03:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_sharing: check for errors in p2m->set_entry(). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ab3eea9d8873cb0c60e59d55a89c2f1842a5063 Author: Tim Deegan AuthorDate: Thu Mar 7 14:08:24 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:36:01 2013 +0000 x86/mem_sharing: check for errors in p2m->set_entry(). This call ought always to succeed. Assert that it does rather than ignoring the return value. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla Acked-by: Jan Beulich --- xen/arch/x86/mm/mem_sharing.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 1caa900..0364bb0 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1273,6 +1273,8 @@ int relinquish_shared_pages(struct domain *d) p2m_access_t a; p2m_type_t t; mfn_t mfn; + int set_rc; + if ( atomic_read(&d->shr_pages) == 0 ) break; mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); @@ -1281,10 +1283,12 @@ int relinquish_shared_pages(struct domain *d) /* Does not fail with ENOMEM given the DESTROY flag */ BUG_ON(__mem_sharing_unshare_page(d, gfn, MEM_SHARING_DESTROY_GFN)); - /* Clear out the p2m entry so no one else may try to - * unshare */ - p2m->set_entry(p2m, gfn, _mfn(0), PAGE_ORDER_4K, - p2m_invalid, p2m_access_rwx); + /* Clear out the p2m entry so no one else may try to + * unshare. Must succeed: we just read the old entry and + * we hold the p2m lock. */ + set_rc = p2m->set_entry(p2m, gfn, _mfn(0), PAGE_ORDER_4K, + p2m_invalid, p2m_access_rwx); + ASSERT(set_rc != 0); count++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLbB-0006D2-24; Fri, 15 Mar 2013 03:46:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLb9-0006Ch-FZ for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:27 +0000 Received: from [193.109.254.147:27685] by server-10.bemta-14.messagelabs.com id A2/36-11798-29992415; Fri, 15 Mar 2013 03:46:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1363319180!8956340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21533 invoked from network); 15 Mar 2013 03:46:21 -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; 15 Mar 2013 03:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLb2-0006wb-0e for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLb1-000680-UE for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:19 +0000 Date: Fri, 15 Mar 2013 03:46:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_access: check for errors in p2m->set_entry(). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 225a09cda45ab1f381fe30a9fab74a584effd66c Author: Tim Deegan AuthorDate: Thu Mar 7 14:23:05 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:36:01 2013 +0000 x86/mem_access: check for errors in p2m->set_entry(). These calls ought always to succeed. Assert that they do rather than ignoring the return value. Signed-off-by: Tim Deegan Acked-by: Aravindh Puthiyaparambil --- xen/arch/x86/mm/p2m.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 4837de3..f5ddd20 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1262,21 +1262,27 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, p2m_type_t p2mt; p2m_access_t p2ma; mem_event_request_t *req; + int rc; - /* First, handle rx2rw conversion automatically */ + /* First, handle rx2rw conversion automatically. + * These calls to p2m->set_entry() must succeed: we have the gfn + * locked and just did a successful get_entry(). */ gfn_lock(p2m, gfn, 0); mfn = p2m->get_entry(p2m, gfn, &p2mt, &p2ma, 0, NULL); if ( access_w && p2ma == p2m_access_rx2rw ) { - p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rw); + rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rw); + ASSERT(rc); gfn_unlock(p2m, gfn, 0); return 1; } else if ( p2ma == p2m_access_n2rwx ) { ASSERT(access_w || access_r || access_x); - p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rwx); + rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + p2mt, p2m_access_rwx); + ASSERT(rc); } gfn_unlock(p2m, gfn, 0); @@ -1294,13 +1300,18 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, } else { + gfn_lock(p2m, gfn, 0); + mfn = p2m->get_entry(p2m, gfn, &p2mt, &p2ma, 0, NULL); if ( p2ma != p2m_access_n2rwx ) { - /* A listener is not required, so clear the access restrictions */ - gfn_lock(p2m, gfn, 0); - p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rwx); - gfn_unlock(p2m, gfn, 0); + /* A listener is not required, so clear the access + * restrictions. This set must succeed: we have the + * gfn locked and just did a successful get_entry(). */ + rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + p2mt, p2m_access_rwx); + ASSERT(rc); } + gfn_unlock(p2m, gfn, 0); return 1; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLbB-0006D2-24; Fri, 15 Mar 2013 03:46:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLb9-0006Ch-FZ for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:27 +0000 Received: from [193.109.254.147:27685] by server-10.bemta-14.messagelabs.com id A2/36-11798-29992415; Fri, 15 Mar 2013 03:46:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1363319180!8956340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21533 invoked from network); 15 Mar 2013 03:46:21 -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; 15 Mar 2013 03:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLb2-0006wb-0e for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLb1-000680-UE for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:19 +0000 Date: Fri, 15 Mar 2013 03:46:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_access: check for errors in p2m->set_entry(). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 225a09cda45ab1f381fe30a9fab74a584effd66c Author: Tim Deegan AuthorDate: Thu Mar 7 14:23:05 2013 +0000 Commit: Tim Deegan CommitDate: Thu Mar 14 10:36:01 2013 +0000 x86/mem_access: check for errors in p2m->set_entry(). These calls ought always to succeed. Assert that they do rather than ignoring the return value. Signed-off-by: Tim Deegan Acked-by: Aravindh Puthiyaparambil --- xen/arch/x86/mm/p2m.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 4837de3..f5ddd20 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1262,21 +1262,27 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, p2m_type_t p2mt; p2m_access_t p2ma; mem_event_request_t *req; + int rc; - /* First, handle rx2rw conversion automatically */ + /* First, handle rx2rw conversion automatically. + * These calls to p2m->set_entry() must succeed: we have the gfn + * locked and just did a successful get_entry(). */ gfn_lock(p2m, gfn, 0); mfn = p2m->get_entry(p2m, gfn, &p2mt, &p2ma, 0, NULL); if ( access_w && p2ma == p2m_access_rx2rw ) { - p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rw); + rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rw); + ASSERT(rc); gfn_unlock(p2m, gfn, 0); return 1; } else if ( p2ma == p2m_access_n2rwx ) { ASSERT(access_w || access_r || access_x); - p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rwx); + rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + p2mt, p2m_access_rwx); + ASSERT(rc); } gfn_unlock(p2m, gfn, 0); @@ -1294,13 +1300,18 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, } else { + gfn_lock(p2m, gfn, 0); + mfn = p2m->get_entry(p2m, gfn, &p2mt, &p2ma, 0, NULL); if ( p2ma != p2m_access_n2rwx ) { - /* A listener is not required, so clear the access restrictions */ - gfn_lock(p2m, gfn, 0); - p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rwx); - gfn_unlock(p2m, gfn, 0); + /* A listener is not required, so clear the access + * restrictions. This set must succeed: we have the + * gfn locked and just did a successful get_entry(). */ + rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + p2mt, p2m_access_rwx); + ASSERT(rc); } + gfn_unlock(p2m, gfn, 0); return 1; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLbG-0006E8-73; Fri, 15 Mar 2013 03:46:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbF-0006Dx-1j for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:33 +0000 Received: from [85.158.138.51:62623] by server-10.bemta-3.messagelabs.com id D6/B0-19664-89992415; Fri, 15 Mar 2013 03:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-174.messagelabs.com!1363319190!21352137!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16822 invoked from network); 15 Mar 2013 03:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbC-0006wg-8d for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLbC-000695-6N for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:30 +0000 Date: Fri, 15 Mar 2013 03:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: extend diagnostics for "No irq handler for vector" 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 5dc3fd23f66e8f3ce6aaecdf51a1d968f1db2ae4 Author: Jan Beulich AuthorDate: Thu Mar 14 12:10:53 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 14 12:10:53 2013 +0100 x86: extend diagnostics for "No irq handler for vector" messages By storing the inverted IRQ number in vector_irq[], we may be able to spot which IRQ a vector was used for most recently, thus hopefully permitting to understand why these messages trigger on certain systems. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/i8259.c | 2 +- xen/arch/x86/irq.c | 30 ++++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index b45f596..f637ecc 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -165,7 +165,7 @@ static void _disable_8259A_irq(unsigned int irq) outb(cached_A1,0xA1); else outb(cached_21,0x21); - per_cpu(vector_irq, 0)[LEGACY_VECTOR(irq)] = -1; + per_cpu(vector_irq, 0)[LEGACY_VECTOR(irq)] = ~irq; spin_unlock_irqrestore(&i8259A_lock, flags); } diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index ca829bb..8e0b004 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -227,7 +227,7 @@ static void __clear_irq_vector(int irq) for_each_cpu(cpu, &tmp_mask) { ASSERT( per_cpu(vector_irq, cpu)[vector] == irq ); - per_cpu(vector_irq, cpu)[vector] = -1; + per_cpu(vector_irq, cpu)[vector] = ~irq; } desc->arch.vector = IRQ_VECTOR_UNASSIGNED; @@ -253,8 +253,8 @@ static void __clear_irq_vector(int irq) for_each_cpu(cpu, &tmp_mask) { ASSERT( per_cpu(vector_irq, cpu)[old_vector] == irq ); TRACE_3D(TRC_HW_IRQ_MOVE_FINISH, irq, old_vector, cpu); - per_cpu(vector_irq, cpu)[old_vector] = -1; - } + per_cpu(vector_irq, cpu)[old_vector] = ~irq; + } desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; cpumask_clear(desc->arch.old_cpu_mask); @@ -334,7 +334,7 @@ int __init init_irq_data(void) int irq, vector; for (vector = 0; vector < NR_VECTORS; ++vector) - this_cpu(vector_irq)[vector] = -1; + this_cpu(vector_irq)[vector] = INT_MIN; irq_desc = xzalloc_array(struct irq_desc, nr_irqs); @@ -489,7 +489,7 @@ next: goto next; for_each_cpu(new_cpu, &tmp_mask) - if (per_cpu(vector_irq, new_cpu)[vector] != -1) + if (per_cpu(vector_irq, new_cpu)[vector] >= 0) goto next; /* Found one! */ current_vector = vector; @@ -551,7 +551,7 @@ void __setup_vector_irq(int cpu) /* Clear vector_irq */ for (vector = 0; vector < NR_VECTORS; ++vector) - per_cpu(vector_irq, cpu)[vector] = -1; + per_cpu(vector_irq, cpu)[vector] = INT_MIN; /* Mark the inuse vectors */ for (irq = 0; irq < nr_irqs; ++irq) { struct irq_desc *desc = irq_to_desc(irq); @@ -622,7 +622,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) struct irq_desc *desc; irq = __get_cpu_var(vector_irq)[vector]; - if (irq == -1) + if ((int)irq < 0) continue; desc = irq_to_desc(irq); @@ -655,7 +655,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP, irq, vector, smp_processor_id()); - __get_cpu_var(vector_irq)[vector] = -1; + __get_cpu_var(vector_irq)[vector] = ~irq; desc->arch.move_cleanup_count--; if ( desc->arch.move_cleanup_count == 0 ) @@ -819,8 +819,22 @@ void do_IRQ(struct cpu_user_regs *regs) if ( ! ( vector >= FIRST_LEGACY_VECTOR && vector <= LAST_LEGACY_VECTOR && bogus_8259A_irq(vector - FIRST_LEGACY_VECTOR) ) ) + { printk("CPU%u: No irq handler for vector %02x (IRQ %d%s)\n", smp_processor_id(), vector, irq, kind); + desc = irq_to_desc(~irq); + if ( ~irq < nr_irqs && irq_desc_initialized(desc) ) + { + spin_lock(&desc->lock); + printk("IRQ%d a=%04lx[%04lx,%04lx] v=%02x[%02x] t=%-15s s=%08x\n", + ~irq, *cpumask_bits(desc->affinity), + *cpumask_bits(desc->arch.cpu_mask), + *cpumask_bits(desc->arch.old_cpu_mask), + desc->arch.vector, desc->arch.old_vector, + desc->handler->typename, desc->status); + spin_unlock(&desc->lock); + } + } TRACE_1D(TRC_HW_IRQ_UNMAPPED_VECTOR, vector); } goto out_no_unlock; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLbG-0006E8-73; Fri, 15 Mar 2013 03:46:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbF-0006Dx-1j for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:33 +0000 Received: from [85.158.138.51:62623] by server-10.bemta-3.messagelabs.com id D6/B0-19664-89992415; Fri, 15 Mar 2013 03:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-174.messagelabs.com!1363319190!21352137!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16822 invoked from network); 15 Mar 2013 03:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbC-0006wg-8d for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLbC-000695-6N for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:30 +0000 Date: Fri, 15 Mar 2013 03:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: extend diagnostics for "No irq handler for vector" 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 5dc3fd23f66e8f3ce6aaecdf51a1d968f1db2ae4 Author: Jan Beulich AuthorDate: Thu Mar 14 12:10:53 2013 +0100 Commit: Jan Beulich CommitDate: Thu Mar 14 12:10:53 2013 +0100 x86: extend diagnostics for "No irq handler for vector" messages By storing the inverted IRQ number in vector_irq[], we may be able to spot which IRQ a vector was used for most recently, thus hopefully permitting to understand why these messages trigger on certain systems. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/i8259.c | 2 +- xen/arch/x86/irq.c | 30 ++++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index b45f596..f637ecc 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -165,7 +165,7 @@ static void _disable_8259A_irq(unsigned int irq) outb(cached_A1,0xA1); else outb(cached_21,0x21); - per_cpu(vector_irq, 0)[LEGACY_VECTOR(irq)] = -1; + per_cpu(vector_irq, 0)[LEGACY_VECTOR(irq)] = ~irq; spin_unlock_irqrestore(&i8259A_lock, flags); } diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index ca829bb..8e0b004 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -227,7 +227,7 @@ static void __clear_irq_vector(int irq) for_each_cpu(cpu, &tmp_mask) { ASSERT( per_cpu(vector_irq, cpu)[vector] == irq ); - per_cpu(vector_irq, cpu)[vector] = -1; + per_cpu(vector_irq, cpu)[vector] = ~irq; } desc->arch.vector = IRQ_VECTOR_UNASSIGNED; @@ -253,8 +253,8 @@ static void __clear_irq_vector(int irq) for_each_cpu(cpu, &tmp_mask) { ASSERT( per_cpu(vector_irq, cpu)[old_vector] == irq ); TRACE_3D(TRC_HW_IRQ_MOVE_FINISH, irq, old_vector, cpu); - per_cpu(vector_irq, cpu)[old_vector] = -1; - } + per_cpu(vector_irq, cpu)[old_vector] = ~irq; + } desc->arch.old_vector = IRQ_VECTOR_UNASSIGNED; cpumask_clear(desc->arch.old_cpu_mask); @@ -334,7 +334,7 @@ int __init init_irq_data(void) int irq, vector; for (vector = 0; vector < NR_VECTORS; ++vector) - this_cpu(vector_irq)[vector] = -1; + this_cpu(vector_irq)[vector] = INT_MIN; irq_desc = xzalloc_array(struct irq_desc, nr_irqs); @@ -489,7 +489,7 @@ next: goto next; for_each_cpu(new_cpu, &tmp_mask) - if (per_cpu(vector_irq, new_cpu)[vector] != -1) + if (per_cpu(vector_irq, new_cpu)[vector] >= 0) goto next; /* Found one! */ current_vector = vector; @@ -551,7 +551,7 @@ void __setup_vector_irq(int cpu) /* Clear vector_irq */ for (vector = 0; vector < NR_VECTORS; ++vector) - per_cpu(vector_irq, cpu)[vector] = -1; + per_cpu(vector_irq, cpu)[vector] = INT_MIN; /* Mark the inuse vectors */ for (irq = 0; irq < nr_irqs; ++irq) { struct irq_desc *desc = irq_to_desc(irq); @@ -622,7 +622,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) struct irq_desc *desc; irq = __get_cpu_var(vector_irq)[vector]; - if (irq == -1) + if ((int)irq < 0) continue; desc = irq_to_desc(irq); @@ -655,7 +655,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP, irq, vector, smp_processor_id()); - __get_cpu_var(vector_irq)[vector] = -1; + __get_cpu_var(vector_irq)[vector] = ~irq; desc->arch.move_cleanup_count--; if ( desc->arch.move_cleanup_count == 0 ) @@ -819,8 +819,22 @@ void do_IRQ(struct cpu_user_regs *regs) if ( ! ( vector >= FIRST_LEGACY_VECTOR && vector <= LAST_LEGACY_VECTOR && bogus_8259A_irq(vector - FIRST_LEGACY_VECTOR) ) ) + { printk("CPU%u: No irq handler for vector %02x (IRQ %d%s)\n", smp_processor_id(), vector, irq, kind); + desc = irq_to_desc(~irq); + if ( ~irq < nr_irqs && irq_desc_initialized(desc) ) + { + spin_lock(&desc->lock); + printk("IRQ%d a=%04lx[%04lx,%04lx] v=%02x[%02x] t=%-15s s=%08x\n", + ~irq, *cpumask_bits(desc->affinity), + *cpumask_bits(desc->arch.cpu_mask), + *cpumask_bits(desc->arch.old_cpu_mask), + desc->arch.vector, desc->arch.old_vector, + desc->handler->typename, desc->status); + spin_unlock(&desc->lock); + } + } TRACE_1D(TRC_HW_IRQ_UNMAPPED_VECTOR, vector); } goto out_no_unlock; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLbQ-0006Fw-AV; Fri, 15 Mar 2013 03:46:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbO-0006Fe-R8 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:43 +0000 Received: from [85.158.139.211:22935] by server-6.bemta-5.messagelabs.com id B8/14-21466-2A992415; Fri, 15 Mar 2013 03:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1363319200!18404918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28677 invoked from network); 15 Mar 2013 03:46:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbM-0006wm-Cj for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLbM-00069V-Bk for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:40 +0000 Date: Fri, 15 Mar 2013 03:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: unbreak build after ec41430ef6a7 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6444997896848230324==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6444997896848230324== Content-Type: text/plain commit 37d930430c2f2ef4dedf27deb404d2fe2602c039 Author: Ian Campbell AuthorDate: Thu Mar 14 09:45:57 2013 +0000 Commit: Ian Jackson CommitDate: Thu Mar 14 11:33:02 2013 +0000 tools: libxl: unbreak build after ec41430ef6a7 libxl_create.c: In function ‘libxl__domain_build_info_setdefault’: libxl_create.c:109: error: ‘info’ undeclared (first use in this function) libxl_create.c:109: error: (Each undeclared identifier is reported only once libxl_create.c:109: error: for each function it appears in.) cc1: warnings being treated as errors libxl_create.c:108: error: suggest explicit braces to avoid ambiguous ‘else’ libxl_create.c: At top level: libxl_create.c:141: error: expected identifier or ‘(’ before ‘if’ ... Fix is to insert the missing opening brace and s/info/b_info/ in one spot. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl_create.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 7ec8c2b..2ea628a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -105,8 +105,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) - if (libxl_defbool_val(info->device_model_stubdomain)) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (libxl_defbool_val(b_info->device_model_stubdomain)) { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6444997896848230324== 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 --===============6444997896848230324==-- From xen-changelog-bounces@lists.xen.org Fri Mar 15 03:46:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 03:46: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 1UGLbQ-0006Fw-AV; Fri, 15 Mar 2013 03:46:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbO-0006Fe-R8 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:43 +0000 Received: from [85.158.139.211:22935] by server-6.bemta-5.messagelabs.com id B8/14-21466-2A992415; Fri, 15 Mar 2013 03:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1363319200!18404918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28677 invoked from network); 15 Mar 2013 03:46:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 03:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGLbM-0006wm-Cj for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGLbM-00069V-Bk for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 03:46:40 +0000 Date: Fri, 15 Mar 2013 03:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: unbreak build after ec41430ef6a7 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6444997896848230324==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6444997896848230324== Content-Type: text/plain commit 37d930430c2f2ef4dedf27deb404d2fe2602c039 Author: Ian Campbell AuthorDate: Thu Mar 14 09:45:57 2013 +0000 Commit: Ian Jackson CommitDate: Thu Mar 14 11:33:02 2013 +0000 tools: libxl: unbreak build after ec41430ef6a7 libxl_create.c: In function ‘libxl__domain_build_info_setdefault’: libxl_create.c:109: error: ‘info’ undeclared (first use in this function) libxl_create.c:109: error: (Each undeclared identifier is reported only once libxl_create.c:109: error: for each function it appears in.) cc1: warnings being treated as errors libxl_create.c:108: error: suggest explicit braces to avoid ambiguous ‘else’ libxl_create.c: At top level: libxl_create.c:141: error: expected identifier or ‘(’ before ‘if’ ... Fix is to insert the missing opening brace and s/info/b_info/ in one spot. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl_create.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 7ec8c2b..2ea628a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -105,8 +105,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) - if (libxl_defbool_val(info->device_model_stubdomain)) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (libxl_defbool_val(b_info->device_model_stubdomain)) { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6444997896848230324== 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 --===============6444997896848230324==-- From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:33: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 1UGOCR-0000Bx-RC; Fri, 15 Mar 2013 06: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 1UGOCQ-0000Bo-6t for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:06 +0000 Received: from [85.158.139.211:44300] by server-3.bemta-5.messagelabs.com id 19/7E-17256-1A0C2415; Fri, 15 Mar 2013 06:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1363329183!18370692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30645 invoked from network); 15 Mar 2013 06:33:04 -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 Mar 2013 06:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCN-0000VH-51 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCM-0001qO-Ko for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:02 +0000 Date: Fri, 15 Mar 2013 06:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] vmx: fix handling of NMI VMEXIT. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 677c9126023e79cb8e0a74bc002bd7af06b53214 Author: Tim Deegan AuthorDate: Tue Mar 12 16:22:03 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:22:03 2013 +0100 vmx: fix handling of NMI VMEXIT. Call do_nmi() directly and explicitly re-enable NMIs rather than raising an NMI through the APIC. Since NMIs are disabled after the VMEXIT, the raised NMI would be blocked until the next IRET instruction (i.e. the next real interrupt, or after scheduling a PV guest) and in the meantime the guest will spin taking NMI VMEXITS. Also, handle NMIs before re-enabling interrupts, since if we handle an interrupt (and therefore IRET) before calling do_nmi(), we may end up running the NMI handler with NMIs enabled. Signed-off-by: Tim Deegan Acked-by: Andrew Cooper Acked-by: Jan Beulich master changeset: 7dd3b06ff031c9a8c727df16c5def2afb382101c master date: 2013-02-28 14:00:18 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++++++- xen/arch/x86/x86_32/entry.S | 10 +++++++++- xen/arch/x86/x86_64/entry.S | 16 ++++++++++++++++ xen/include/asm-x86/processor.h | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 918c624..e9f1323 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2154,6 +2154,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + if ( vector == TRAP_nmi + && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8)) ) + { + do_nmi(regs); + enable_nmis(); + } break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2327,7 +2334,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + /* Already handled above. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index dd62276..a7ce078 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -624,6 +624,14 @@ ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce +/* Enable NMIs. No special register assumptions. All registers are preserved. */ +ENTRY(enable_nmis) + /* Set up stack frame */ + pushf # EFLAGS + push %cs # CS + push $.Lret # EIP + iret # Disable the hardware NMI latch + ENTRY(setup_vm86_frame) mov %ecx,%ds mov %ecx,%es @@ -637,7 +645,7 @@ ENTRY(setup_vm86_frame) .endm copy_vm86_words addl $16,%esp - ret +.Lret: ret .section .rodata, "a", @progbits diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index be8a0c5..bc75041 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -648,6 +648,22 @@ ENTRY(machine_check) movl $TRAP_machine_check,4(%rsp) jmp handle_ist_exception +/* Enable NMIs. No special register assumptions. Only %rax is not preserved. */ +ENTRY(enable_nmis) + movq %rsp, %rax /* Grab RSP before pushing */ + + /* Set up stack frame */ + pushq $0 /* SS */ + pushq %rax /* RSP */ + pushfq /* RFLAGS */ + pushq $__HYPERVISOR_CS /* CS */ + leaq 1f(%rip),%rax + pushq %rax /* RIP */ + + iretq /* Disable the hardware NMI latch */ +1: + retq + .section .rodata, "a", @progbits ENTRY(exception_table) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index ad91c55..2662308 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -587,6 +587,8 @@ DECLARE_TRAP_HANDLER(alignment_check); DECLARE_TRAP_HANDLER(spurious_interrupt_bug); #undef DECLARE_TRAP_HANDLER +void enable_nmis(void); + int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); int rdmsr_hypervisor_regs(uint32_t idx, uint64_t *val); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:33: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 1UGOCR-0000Bx-RC; Fri, 15 Mar 2013 06: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 1UGOCQ-0000Bo-6t for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:06 +0000 Received: from [85.158.139.211:44300] by server-3.bemta-5.messagelabs.com id 19/7E-17256-1A0C2415; Fri, 15 Mar 2013 06:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1363329183!18370692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30645 invoked from network); 15 Mar 2013 06:33:04 -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 Mar 2013 06:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCN-0000VH-51 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCM-0001qO-Ko for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:02 +0000 Date: Fri, 15 Mar 2013 06:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] vmx: fix handling of NMI VMEXIT. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 677c9126023e79cb8e0a74bc002bd7af06b53214 Author: Tim Deegan AuthorDate: Tue Mar 12 16:22:03 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:22:03 2013 +0100 vmx: fix handling of NMI VMEXIT. Call do_nmi() directly and explicitly re-enable NMIs rather than raising an NMI through the APIC. Since NMIs are disabled after the VMEXIT, the raised NMI would be blocked until the next IRET instruction (i.e. the next real interrupt, or after scheduling a PV guest) and in the meantime the guest will spin taking NMI VMEXITS. Also, handle NMIs before re-enabling interrupts, since if we handle an interrupt (and therefore IRET) before calling do_nmi(), we may end up running the NMI handler with NMIs enabled. Signed-off-by: Tim Deegan Acked-by: Andrew Cooper Acked-by: Jan Beulich master changeset: 7dd3b06ff031c9a8c727df16c5def2afb382101c master date: 2013-02-28 14:00:18 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++++++- xen/arch/x86/x86_32/entry.S | 10 +++++++++- xen/arch/x86/x86_64/entry.S | 16 ++++++++++++++++ xen/include/asm-x86/processor.h | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 918c624..e9f1323 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2154,6 +2154,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + if ( vector == TRAP_nmi + && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8)) ) + { + do_nmi(regs); + enable_nmis(); + } break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2327,7 +2334,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + /* Already handled above. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index dd62276..a7ce078 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -624,6 +624,14 @@ ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce +/* Enable NMIs. No special register assumptions. All registers are preserved. */ +ENTRY(enable_nmis) + /* Set up stack frame */ + pushf # EFLAGS + push %cs # CS + push $.Lret # EIP + iret # Disable the hardware NMI latch + ENTRY(setup_vm86_frame) mov %ecx,%ds mov %ecx,%es @@ -637,7 +645,7 @@ ENTRY(setup_vm86_frame) .endm copy_vm86_words addl $16,%esp - ret +.Lret: ret .section .rodata, "a", @progbits diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index be8a0c5..bc75041 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -648,6 +648,22 @@ ENTRY(machine_check) movl $TRAP_machine_check,4(%rsp) jmp handle_ist_exception +/* Enable NMIs. No special register assumptions. Only %rax is not preserved. */ +ENTRY(enable_nmis) + movq %rsp, %rax /* Grab RSP before pushing */ + + /* Set up stack frame */ + pushq $0 /* SS */ + pushq %rax /* RSP */ + pushfq /* RFLAGS */ + pushq $__HYPERVISOR_CS /* CS */ + leaq 1f(%rip),%rax + pushq %rax /* RIP */ + + iretq /* Disable the hardware NMI latch */ +1: + retq + .section .rodata, "a", @progbits ENTRY(exception_table) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index ad91c55..2662308 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -587,6 +587,8 @@ DECLARE_TRAP_HANDLER(alignment_check); DECLARE_TRAP_HANDLER(spurious_interrupt_bug); #undef DECLARE_TRAP_HANDLER +void enable_nmis(void); + int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); int rdmsr_hypervisor_regs(uint32_t idx, uint64_t *val); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCb-0000Ch-UB; Fri, 15 Mar 2013 06:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCa-0000CX-67 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:16 +0000 Received: from [85.158.143.99:46984] by server-3.bemta-4.messagelabs.com id CA/3E-02186-BA0C2415; Fri, 15 Mar 2013 06:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1363329193!21863564!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5718 invoked from network); 15 Mar 2013 06:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCX-0000VK-HB for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCX-0001qm-8L for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:13 +0000 Date: Fri, 15 Mar 2013 06:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] Avoid stale pointer when moving domain to another cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ad719247a5072f3a1af6c77faf203e724acf2fd Author: Juergen Gross AuthorDate: Tue Mar 12 16:23:15 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:23:15 2013 +0100 Avoid stale pointer when moving domain to another cpupool When a domain is moved to another cpupool the scheduler private data pointers in vcpu and domain structures must never point to an already freed memory area. While at it, simplify sched_init_vcpu() by using DOM2OP instead VCPU2OP. Signed-off-by: Juergen Gross This also required commit dbfa7bba0f213b1802e1900b71bc34837c30ee52: xen, cpupools: Fix cpupool-move to make more consistent The full order for creating new private data structures when moving from one pool to another is now: * Allocate all new structures - Allocate a new private domain structure (but don't point there yet) - Allocate per-vcpu data structures (but don't point there yet) * Remove old structures - Remove each vcpu, freeing the associated data structure - Free the domain data structure * Switch to the new structures - Set the domain to the new cpupool, with the new private domain structure - Set each vcpu to the respective new structure, and insert This is in line with a (fairly reasonable) assumption in credit2 that the private structure of the domain will be the private structure pointed to by the per-vcpu private structure. Also fix a bug, in which insert_vcpu was called with the *old* vcpu ops rather than the new ones. Signed-off-by: George Dunlap master changeset: 482300def7d08e773ccd2a0d978bcb9469fdd810 master date: 2013-02-28 14:56:45 +0000 --- xen/common/schedule.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index be39b20..a116a71 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -227,7 +227,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) if ( v->sched_priv == NULL ) return 1; - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(DOM2OP(d), insert_vcpu, v); return 0; } @@ -238,6 +238,9 @@ int sched_move_domain(struct domain *d, struct cpupool *c) unsigned int new_p; void **vcpu_priv; void *domdata; + void *vcpudata; + struct scheduler *old_ops; + void *old_domdata; domdata = SCHED_OP(c->sched, alloc_domdata, d); if ( domdata == NULL ) @@ -269,16 +272,26 @@ int sched_move_domain(struct domain *d, struct cpupool *c) domain_pause(d); + old_ops = DOM2OP(d); + old_domdata = d->sched_priv; + + for_each_vcpu ( d, v ) + { + SCHED_OP(old_ops, remove_vcpu, v); + } + + d->cpupool = c; + d->sched_priv = domdata; + new_p = first_cpu(c->cpu_valid); for_each_vcpu ( d, v ) { + vcpudata = v->sched_priv; + migrate_timer(&v->periodic_timer, new_p); migrate_timer(&v->singleshot_timer, new_p); migrate_timer(&v->poll_timer, new_p); - SCHED_OP(VCPU2OP(v), remove_vcpu, v); - SCHED_OP(VCPU2OP(v), free_vdata, v->sched_priv); - cpus_setall(v->cpu_affinity); v->processor = new_p; v->sched_priv = vcpu_priv[v->vcpu_id]; @@ -286,16 +299,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cycle_cpu(new_p, c->cpu_valid); - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(c->sched, insert_vcpu, v); + + SCHED_OP(old_ops, free_vdata, vcpudata); } domain_update_node_affinity(d); - d->cpupool = c; - SCHED_OP(DOM2OP(d), free_domdata, d->sched_priv); - d->sched_priv = domdata; - domain_unpause(d); + SCHED_OP(old_ops, free_domdata, old_domdata); + xfree(vcpu_priv); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCb-0000Ch-UB; Fri, 15 Mar 2013 06:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCa-0000CX-67 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:16 +0000 Received: from [85.158.143.99:46984] by server-3.bemta-4.messagelabs.com id CA/3E-02186-BA0C2415; Fri, 15 Mar 2013 06:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1363329193!21863564!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5718 invoked from network); 15 Mar 2013 06:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCX-0000VK-HB for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCX-0001qm-8L for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:13 +0000 Date: Fri, 15 Mar 2013 06:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] Avoid stale pointer when moving domain to another cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ad719247a5072f3a1af6c77faf203e724acf2fd Author: Juergen Gross AuthorDate: Tue Mar 12 16:23:15 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:23:15 2013 +0100 Avoid stale pointer when moving domain to another cpupool When a domain is moved to another cpupool the scheduler private data pointers in vcpu and domain structures must never point to an already freed memory area. While at it, simplify sched_init_vcpu() by using DOM2OP instead VCPU2OP. Signed-off-by: Juergen Gross This also required commit dbfa7bba0f213b1802e1900b71bc34837c30ee52: xen, cpupools: Fix cpupool-move to make more consistent The full order for creating new private data structures when moving from one pool to another is now: * Allocate all new structures - Allocate a new private domain structure (but don't point there yet) - Allocate per-vcpu data structures (but don't point there yet) * Remove old structures - Remove each vcpu, freeing the associated data structure - Free the domain data structure * Switch to the new structures - Set the domain to the new cpupool, with the new private domain structure - Set each vcpu to the respective new structure, and insert This is in line with a (fairly reasonable) assumption in credit2 that the private structure of the domain will be the private structure pointed to by the per-vcpu private structure. Also fix a bug, in which insert_vcpu was called with the *old* vcpu ops rather than the new ones. Signed-off-by: George Dunlap master changeset: 482300def7d08e773ccd2a0d978bcb9469fdd810 master date: 2013-02-28 14:56:45 +0000 --- xen/common/schedule.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index be39b20..a116a71 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -227,7 +227,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) if ( v->sched_priv == NULL ) return 1; - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(DOM2OP(d), insert_vcpu, v); return 0; } @@ -238,6 +238,9 @@ int sched_move_domain(struct domain *d, struct cpupool *c) unsigned int new_p; void **vcpu_priv; void *domdata; + void *vcpudata; + struct scheduler *old_ops; + void *old_domdata; domdata = SCHED_OP(c->sched, alloc_domdata, d); if ( domdata == NULL ) @@ -269,16 +272,26 @@ int sched_move_domain(struct domain *d, struct cpupool *c) domain_pause(d); + old_ops = DOM2OP(d); + old_domdata = d->sched_priv; + + for_each_vcpu ( d, v ) + { + SCHED_OP(old_ops, remove_vcpu, v); + } + + d->cpupool = c; + d->sched_priv = domdata; + new_p = first_cpu(c->cpu_valid); for_each_vcpu ( d, v ) { + vcpudata = v->sched_priv; + migrate_timer(&v->periodic_timer, new_p); migrate_timer(&v->singleshot_timer, new_p); migrate_timer(&v->poll_timer, new_p); - SCHED_OP(VCPU2OP(v), remove_vcpu, v); - SCHED_OP(VCPU2OP(v), free_vdata, v->sched_priv); - cpus_setall(v->cpu_affinity); v->processor = new_p; v->sched_priv = vcpu_priv[v->vcpu_id]; @@ -286,16 +299,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cycle_cpu(new_p, c->cpu_valid); - SCHED_OP(VCPU2OP(v), insert_vcpu, v); + SCHED_OP(c->sched, insert_vcpu, v); + + SCHED_OP(old_ops, free_vdata, vcpudata); } domain_update_node_affinity(d); - d->cpupool = c; - SCHED_OP(DOM2OP(d), free_domdata, d->sched_priv); - d->sched_priv = domdata; - domain_unpause(d); + SCHED_OP(old_ops, free_domdata, old_domdata); + xfree(vcpu_priv); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGOCm-0000Dd-4T; Fri, 15 Mar 2013 06:33:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCk-0000DR-4T for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:26 +0000 Received: from [85.158.143.99:4504] by server-2.bemta-4.messagelabs.com id 0B/91-12656-5B0C2415; Fri, 15 Mar 2013 06:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1363329204!18805311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8198 invoked from network); 15 Mar 2013 06:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCh-0000VQ-SA for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCh-0001r8-Jf for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:23 +0000 Date: Fri, 15 Mar 2013 06:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] fix compat memory exchange op splitting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b2f399604ba0d46203855658b72b9fcba76a7ac Author: Jan Beulich AuthorDate: Tue Mar 12 16:23:55 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:23:55 2013 +0100 fix compat memory exchange op splitting A shift with a negative count was erroneously used here, yielding undefined behavior. Reported-by: Xi Wang Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: 53decd322157e922cac2988e07da6d39538c8033 master date: 2013-03-01 16:59:49 +0100 --- xen/common/compat/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 1d877fc..5f494eb 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -171,7 +171,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) if ( order_delta >= 0 ) nat.xchg->out.nr_extents = end_extent >> order_delta; else - nat.xchg->out.nr_extents = end_extent << order_delta; + nat.xchg->out.nr_extents = end_extent << -order_delta; ++split; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGOCm-0000Dd-4T; Fri, 15 Mar 2013 06:33:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCk-0000DR-4T for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:26 +0000 Received: from [85.158.143.99:4504] by server-2.bemta-4.messagelabs.com id 0B/91-12656-5B0C2415; Fri, 15 Mar 2013 06:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1363329204!18805311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8198 invoked from network); 15 Mar 2013 06:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCh-0000VQ-SA for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCh-0001r8-Jf for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:23 +0000 Date: Fri, 15 Mar 2013 06:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] fix compat memory exchange op splitting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b2f399604ba0d46203855658b72b9fcba76a7ac Author: Jan Beulich AuthorDate: Tue Mar 12 16:23:55 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:23:55 2013 +0100 fix compat memory exchange op splitting A shift with a negative count was erroneously used here, yielding undefined behavior. Reported-by: Xi Wang Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: 53decd322157e922cac2988e07da6d39538c8033 master date: 2013-03-01 16:59:49 +0100 --- xen/common/compat/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 1d877fc..5f494eb 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -171,7 +171,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) if ( order_delta >= 0 ) nat.xchg->out.nr_extents = end_extent >> order_delta; else - nat.xchg->out.nr_extents = end_extent << order_delta; + nat.xchg->out.nr_extents = end_extent << -order_delta; ++split; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGOCw-0000Ev-DU; Fri, 15 Mar 2013 06:33:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCu-0000Eg-Ol for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:37 +0000 Received: from [85.158.143.99:47678] by server-3.bemta-4.messagelabs.com id 5B/5E-02186-0C0C2415; Fri, 15 Mar 2013 06:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363329214!28022927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17534 invoked from network); 15 Mar 2013 06:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCs-0000VW-8p for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCr-0001rY-V1 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:34 +0000 Date: Fri, 15 Mar 2013 06:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: make certain memory sub-ops return valid values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44e4100a138b2caf6a0947ad7ddef65c7678dbf3 Author: Jan Beulich AuthorDate: Tue Mar 12 16:24:58 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:24:58 2013 +0100 x86: make certain memory sub-ops return valid values When a domain's shared info field "max_pfn" is zero, domain_get_maximum_gpfn() so far returned ULONG_MAX, which do_memory_op() in turn converted to -1 (i.e. -EPERM). Make the former always return a sensible number (i.e. zero if the field was zero) and have the latter no longer truncate return values. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master changeset: 7ffc9779aa5120c5098d938cb88f69a1dda9a0fe master date: 2013-03-04 10:16:04 +0100 --- xen/arch/x86/mm.c | 2 +- xen/common/compat/memory.c | 11 +++++++++-- xen/common/memory.c | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 30d281d..ca2c8f8 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -401,7 +401,7 @@ unsigned long domain_get_maximum_gpfn(struct domain *d) if ( is_hvm_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ - return arch_get_max_pfn(d) - 1; + return (arch_get_max_pfn(d) ?: 1) - 1; } void share_xen_page_with_guest( diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 5f494eb..d58fb50 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -15,7 +15,8 @@ CHECK_TYPE(domid); int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) { - int rc, split, op = cmd & MEMOP_CMD_MASK; + int split, op = cmd & MEMOP_CMD_MASK; + long rc; unsigned int start_extent = cmd >> MEMOP_EXTENT_SHIFT; do @@ -191,7 +192,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) rc = do_memory_op(cmd, nat.hnd); if ( rc < 0 ) - return rc; + break; cmd = 0; if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) @@ -304,5 +305,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) __HYPERVISOR_memory_op, "ih", cmd, compat); } while ( split > 0 ); + if ( unlikely(rc > INT_MAX) ) + return INT_MAX; + + if ( unlikely(rc < INT_MIN) ) + return INT_MIN; + return rc; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 51c3cc6..129f3d4 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -505,14 +505,13 @@ static long memory_exchange(XEN_GUEST_HANDLE(xen_memory_exchange_t) arg) long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg) { struct domain *d; - int rc, op; + long rc; unsigned int address_bits; unsigned long start_extent; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; - - op = cmd & MEMOP_CMD_MASK; + int op = cmd & MEMOP_CMD_MASK; switch ( op ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGOCw-0000Ev-DU; Fri, 15 Mar 2013 06:33:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCu-0000Eg-Ol for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:37 +0000 Received: from [85.158.143.99:47678] by server-3.bemta-4.messagelabs.com id 5B/5E-02186-0C0C2415; Fri, 15 Mar 2013 06:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363329214!28022927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17534 invoked from network); 15 Mar 2013 06:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOCs-0000VW-8p for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOCr-0001rY-V1 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:34 +0000 Date: Fri, 15 Mar 2013 06:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: make certain memory sub-ops return valid values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44e4100a138b2caf6a0947ad7ddef65c7678dbf3 Author: Jan Beulich AuthorDate: Tue Mar 12 16:24:58 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:24:58 2013 +0100 x86: make certain memory sub-ops return valid values When a domain's shared info field "max_pfn" is zero, domain_get_maximum_gpfn() so far returned ULONG_MAX, which do_memory_op() in turn converted to -1 (i.e. -EPERM). Make the former always return a sensible number (i.e. zero if the field was zero) and have the latter no longer truncate return values. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master changeset: 7ffc9779aa5120c5098d938cb88f69a1dda9a0fe master date: 2013-03-04 10:16:04 +0100 --- xen/arch/x86/mm.c | 2 +- xen/common/compat/memory.c | 11 +++++++++-- xen/common/memory.c | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 30d281d..ca2c8f8 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -401,7 +401,7 @@ unsigned long domain_get_maximum_gpfn(struct domain *d) if ( is_hvm_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ - return arch_get_max_pfn(d) - 1; + return (arch_get_max_pfn(d) ?: 1) - 1; } void share_xen_page_with_guest( diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 5f494eb..d58fb50 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -15,7 +15,8 @@ CHECK_TYPE(domid); int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) { - int rc, split, op = cmd & MEMOP_CMD_MASK; + int split, op = cmd & MEMOP_CMD_MASK; + long rc; unsigned int start_extent = cmd >> MEMOP_EXTENT_SHIFT; do @@ -191,7 +192,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) rc = do_memory_op(cmd, nat.hnd); if ( rc < 0 ) - return rc; + break; cmd = 0; if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) @@ -304,5 +305,11 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) __HYPERVISOR_memory_op, "ih", cmd, compat); } while ( split > 0 ); + if ( unlikely(rc > INT_MAX) ) + return INT_MAX; + + if ( unlikely(rc < INT_MIN) ) + return INT_MIN; + return rc; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 51c3cc6..129f3d4 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -505,14 +505,13 @@ static long memory_exchange(XEN_GUEST_HANDLE(xen_memory_exchange_t) arg) long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg) { struct domain *d; - int rc, op; + long rc; unsigned int address_bits; unsigned long start_extent; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; - - op = cmd & MEMOP_CMD_MASK; + int op = cmd & MEMOP_CMD_MASK; switch ( op ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:33: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 1UGODB-0000HS-Jz; Fri, 15 Mar 2013 06:33:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOD9-0000H4-S7 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:52 +0000 Received: from [85.158.137.99:54458] by server-11.bemta-3.messagelabs.com id 63/51-01263-AC0C2415; Fri, 15 Mar 2013 06:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-217.messagelabs.com!1363329224!17159621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18505 invoked from network); 15 Mar 2013 06:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOD2-0000Ve-Hj for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOD2-0001sQ-Bt for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:44 +0000 Date: Fri, 15 Mar 2013 06:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] SEDF: avoid gathering vCPU-s on pCPU0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16c0caad7d44e80535d44c0690a691d22f74d378 Author: Jan Beulich AuthorDate: Tue Mar 12 16:29:11 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:29:11 2013 +0100 SEDF: avoid gathering vCPU-s on pCPU0 The introduction of vcpu_force_reschedule() in 14320:215b799fa181 was incompatible with the SEDF scheduler: Any vCPU using VCPUOP_stop_periodic_timer (e.g. any vCPU of half way modern PV Linux guests) ends up on pCPU0 after that call. Obviously, running all PV guests' (and namely Dom0's) vCPU-s on pCPU0 causes problems for those guests rather sooner than later. So the main thing that was clearly wrong (and bogus from the beginning) was the use of cpumask_first() in sedf_pick_cpu(). It is being replaced by a construct that prefers to put back the vCPU on the pCPU that it got launched on. However, there's one more glitch: When reducing the affinity of a vCPU temporarily, and then widening it again to a set that includes the pCPU that the vCPU was last running on, the generic scheduler code would not force a migration of that vCPU, and hence it would forever stay on the pCPU it last ran on. Since that can again create a load imbalance, the SEDF scheduler wants a migration to happen regardless of it being apparently unnecessary. Of course, an alternative to checking for SEDF explicitly in vcpu_set_affinity() would be to introduce a flags field in struct scheduler, and have SEDF set a "always-migrate-on-affinity-change" flag. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: e6a6fd63652814e5c36a0016c082032f798ced1f master date: 2013-03-04 10:17:52 +0100 --- xen/common/sched_sedf.c | 3 ++- xen/common/schedule.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 70a1bc8..b1d6a2a 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -452,7 +452,8 @@ static int sedf_pick_cpu(const struct scheduler *ops, struct vcpu *v) online = SEDF_CPUONLINE(v->domain->cpupool); cpus_and(online_affinity, v->cpu_affinity, *online); - return first_cpu(online_affinity); + return cycle_cpu(v->vcpu_id % cpus_weight(online_affinity) - 1, + online_affinity); } /* diff --git a/xen/common/schedule.c b/xen/common/schedule.c index a116a71..001da3d 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -628,7 +628,8 @@ int vcpu_set_affinity(struct vcpu *v, cpumask_t *affinity) old_affinity = v->cpu_affinity; v->cpu_affinity = *affinity; *affinity = old_affinity; - if ( !cpu_isset(v->processor, v->cpu_affinity) ) + if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || + !cpu_isset(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:33:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:33: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 1UGODB-0000HS-Jz; Fri, 15 Mar 2013 06:33:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOD9-0000H4-S7 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:52 +0000 Received: from [85.158.137.99:54458] by server-11.bemta-3.messagelabs.com id 63/51-01263-AC0C2415; Fri, 15 Mar 2013 06:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-217.messagelabs.com!1363329224!17159621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18505 invoked from network); 15 Mar 2013 06:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOD2-0000Ve-Hj for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGOD2-0001sQ-Bt for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:44 +0000 Date: Fri, 15 Mar 2013 06:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] SEDF: avoid gathering vCPU-s on pCPU0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16c0caad7d44e80535d44c0690a691d22f74d378 Author: Jan Beulich AuthorDate: Tue Mar 12 16:29:11 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:29:11 2013 +0100 SEDF: avoid gathering vCPU-s on pCPU0 The introduction of vcpu_force_reschedule() in 14320:215b799fa181 was incompatible with the SEDF scheduler: Any vCPU using VCPUOP_stop_periodic_timer (e.g. any vCPU of half way modern PV Linux guests) ends up on pCPU0 after that call. Obviously, running all PV guests' (and namely Dom0's) vCPU-s on pCPU0 causes problems for those guests rather sooner than later. So the main thing that was clearly wrong (and bogus from the beginning) was the use of cpumask_first() in sedf_pick_cpu(). It is being replaced by a construct that prefers to put back the vCPU on the pCPU that it got launched on. However, there's one more glitch: When reducing the affinity of a vCPU temporarily, and then widening it again to a set that includes the pCPU that the vCPU was last running on, the generic scheduler code would not force a migration of that vCPU, and hence it would forever stay on the pCPU it last ran on. Since that can again create a load imbalance, the SEDF scheduler wants a migration to happen regardless of it being apparently unnecessary. Of course, an alternative to checking for SEDF explicitly in vcpu_set_affinity() would be to introduce a flags field in struct scheduler, and have SEDF set a "always-migrate-on-affinity-change" flag. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: e6a6fd63652814e5c36a0016c082032f798ced1f master date: 2013-03-04 10:17:52 +0100 --- xen/common/sched_sedf.c | 3 ++- xen/common/schedule.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 70a1bc8..b1d6a2a 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -452,7 +452,8 @@ static int sedf_pick_cpu(const struct scheduler *ops, struct vcpu *v) online = SEDF_CPUONLINE(v->domain->cpupool); cpus_and(online_affinity, v->cpu_affinity, *online); - return first_cpu(online_affinity); + return cycle_cpu(v->vcpu_id % cpus_weight(online_affinity) - 1, + online_affinity); } /* diff --git a/xen/common/schedule.c b/xen/common/schedule.c index a116a71..001da3d 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -628,7 +628,8 @@ int vcpu_set_affinity(struct vcpu *v, cpumask_t *affinity) old_affinity = v->cpu_affinity; v->cpu_affinity = *affinity; *affinity = old_affinity; - if ( !cpu_isset(v->processor, v->cpu_affinity) ) + if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || + !cpu_isset(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); vcpu_schedule_unlock_irq(v); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:34:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGODG-0000Ii-NN; Fri, 15 Mar 2013 06:33:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODF-0000IL-DZ for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:57 +0000 Received: from [85.158.143.99:5420] by server-3.bemta-4.messagelabs.com id 34/7E-02186-4D0C2415; Fri, 15 Mar 2013 06:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1363329235!21592502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7556 invoked from network); 15 Mar 2013 06:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODC-0000Vn-Tr for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGODC-0001sm-L1 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:54 +0000 Date: Fri, 15 Mar 2013 06:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: defer processing events on the NMI exit 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 d8f9d5b8b98de7d035c5064fe99a44f0a383842f Author: Jan Beulich AuthorDate: Tue Mar 12 16:30:04 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:30:04 2013 +0100 x86: defer processing events on the NMI exit path Otherwise, we may end up in the scheduler, keeping NMIs masked for a possibly unbounded period of time (until whenever the next IRET gets executed). Enforce timely event processing by sending a self IPI. Of course it's open for discussion whether to always use the straight exit path from handle_ist_exception. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: d463b005bbd6475ed930a302821efe239e1b2cf9 master date: 2013-03-04 10:19:34 +0100 --- xen/arch/x86/x86_32/entry.S | 26 +++++++++++++++++++++----- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 27 ++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index a7ce078..7941ee1 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -60,6 +60,7 @@ #include #include #include +#include ALIGN restore_all_guest: @@ -564,6 +565,8 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushl $TRAP_nmi<<16 handle_nmi_mce: #ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL # NMI/MCE entry protocol is incompatible with guest kernel in ring 0. @@ -584,7 +587,24 @@ handle_nmi_mce: * cases we have put guest DS/ES on the guest stack frame, which will * be detected by SAVE_ALL(), or we have rolled back restore_guest. */ - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%esp) + jne ret_from_intr + /* We want to get straight to the IRET on the NMI exit path. */ + GET_CURRENT(%ebx) + movl UREGS_eflags(%esp),%eax + movb UREGS_cs(%esp),%al + testl $(3|X86_EFLAGS_VM),%eax + jz restore_all_xen + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%ebx),%eax + shll $IRQSTAT_shift,%eax + cmpl $0,irq_stat(%eax) + je restore_all_guest + pushl $EVENT_CHECK_VECTOR + call send_IPI_self + addl $4,%esp + jmp restore_all_guest + .Lnmi_mce_xen: /* Check the outer (guest) context for %ds/%es state validity. */ GET_CPUINFO_FIELD(CPUINFO_guest_cpu_user_regs,%ebx) @@ -616,10 +636,6 @@ handle_nmi_mce: jmp .Lnmi_mce_common #endif /* !CONFIG_X86_SUPERVISOR_MODE_KERNEL */ -ENTRY(nmi) - pushl $TRAP_nmi<<16 - jmp handle_nmi_mce - ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index e7ac858..5c9b2e5 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -172,7 +172,7 @@ compat_bad_hypercall: jmp compat_test_all_events /* %rbx: struct vcpu, interrupts disabled */ -compat_restore_all_guest: +ENTRY(compat_restore_all_guest) ASSERT_INTERRUPTS_DISABLED RESTORE_ALL addq $8,%rsp diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index bc75041..2b8c99a 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -11,6 +11,7 @@ #include #include #include +#include ALIGN /* %rbx: struct vcpu */ @@ -622,6 +623,9 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushq $0 + movl $TRAP_nmi,4(%rsp) handle_ist_exception: SAVE_ALL testb $3,UREGS_cs(%rsp) @@ -636,12 +640,25 @@ handle_ist_exception: movl UREGS_entry_vector(%rsp),%eax leaq exception_table(%rip),%rdx callq *(%rdx,%rax,8) - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) + jne ret_from_intr -ENTRY(nmi) - pushq $0 - movl $TRAP_nmi,4(%rsp) - jmp handle_ist_exception + /* We want to get straight to the IRET on the NMI exit path. */ + testb $3,UREGS_cs(%rsp) + jz restore_all_xen + GET_CURRENT(%rbx) + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%rbx),%eax + shll $IRQSTAT_shift,%eax + leaq irq_stat(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + je 1f + movl $EVENT_CHECK_VECTOR,%edi + call send_IPI_self +1: movq VCPU_domain(%rbx),%rax + cmpb $0,DOMAIN_is_32bit_pv(%rax) + je restore_all_guest + jmp compat_restore_all_guest ENTRY(machine_check) pushq $0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:34:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGODG-0000Ii-NN; Fri, 15 Mar 2013 06:33:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODF-0000IL-DZ for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:57 +0000 Received: from [85.158.143.99:5420] by server-3.bemta-4.messagelabs.com id 34/7E-02186-4D0C2415; Fri, 15 Mar 2013 06:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1363329235!21592502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7556 invoked from network); 15 Mar 2013 06:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 06:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODC-0000Vn-Tr for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGODC-0001sm-L1 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:33:54 +0000 Date: Fri, 15 Mar 2013 06:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: defer processing events on the NMI exit 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 d8f9d5b8b98de7d035c5064fe99a44f0a383842f Author: Jan Beulich AuthorDate: Tue Mar 12 16:30:04 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:30:04 2013 +0100 x86: defer processing events on the NMI exit path Otherwise, we may end up in the scheduler, keeping NMIs masked for a possibly unbounded period of time (until whenever the next IRET gets executed). Enforce timely event processing by sending a self IPI. Of course it's open for discussion whether to always use the straight exit path from handle_ist_exception. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master changeset: d463b005bbd6475ed930a302821efe239e1b2cf9 master date: 2013-03-04 10:19:34 +0100 --- xen/arch/x86/x86_32/entry.S | 26 +++++++++++++++++++++----- xen/arch/x86/x86_64/compat/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 27 ++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index a7ce078..7941ee1 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -60,6 +60,7 @@ #include #include #include +#include ALIGN restore_all_guest: @@ -564,6 +565,8 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushl $TRAP_nmi<<16 handle_nmi_mce: #ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL # NMI/MCE entry protocol is incompatible with guest kernel in ring 0. @@ -584,7 +587,24 @@ handle_nmi_mce: * cases we have put guest DS/ES on the guest stack frame, which will * be detected by SAVE_ALL(), or we have rolled back restore_guest. */ - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%esp) + jne ret_from_intr + /* We want to get straight to the IRET on the NMI exit path. */ + GET_CURRENT(%ebx) + movl UREGS_eflags(%esp),%eax + movb UREGS_cs(%esp),%al + testl $(3|X86_EFLAGS_VM),%eax + jz restore_all_xen + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%ebx),%eax + shll $IRQSTAT_shift,%eax + cmpl $0,irq_stat(%eax) + je restore_all_guest + pushl $EVENT_CHECK_VECTOR + call send_IPI_self + addl $4,%esp + jmp restore_all_guest + .Lnmi_mce_xen: /* Check the outer (guest) context for %ds/%es state validity. */ GET_CPUINFO_FIELD(CPUINFO_guest_cpu_user_regs,%ebx) @@ -616,10 +636,6 @@ handle_nmi_mce: jmp .Lnmi_mce_common #endif /* !CONFIG_X86_SUPERVISOR_MODE_KERNEL */ -ENTRY(nmi) - pushl $TRAP_nmi<<16 - jmp handle_nmi_mce - ENTRY(machine_check) pushl $TRAP_machine_check<<16 jmp handle_nmi_mce diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index e7ac858..5c9b2e5 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -172,7 +172,7 @@ compat_bad_hypercall: jmp compat_test_all_events /* %rbx: struct vcpu, interrupts disabled */ -compat_restore_all_guest: +ENTRY(compat_restore_all_guest) ASSERT_INTERRUPTS_DISABLED RESTORE_ALL addq $8,%rsp diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index bc75041..2b8c99a 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -11,6 +11,7 @@ #include #include #include +#include ALIGN /* %rbx: struct vcpu */ @@ -622,6 +623,9 @@ ENTRY(early_page_fault) jmp restore_all_xen .popsection +ENTRY(nmi) + pushq $0 + movl $TRAP_nmi,4(%rsp) handle_ist_exception: SAVE_ALL testb $3,UREGS_cs(%rsp) @@ -636,12 +640,25 @@ handle_ist_exception: movl UREGS_entry_vector(%rsp),%eax leaq exception_table(%rip),%rdx callq *(%rdx,%rax,8) - jmp ret_from_intr + cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) + jne ret_from_intr -ENTRY(nmi) - pushq $0 - movl $TRAP_nmi,4(%rsp) - jmp handle_ist_exception + /* We want to get straight to the IRET on the NMI exit path. */ + testb $3,UREGS_cs(%rsp) + jz restore_all_xen + GET_CURRENT(%rbx) + /* Send an IPI to ourselves to cover for the lack of event checking. */ + movl VCPU_processor(%rbx),%eax + shll $IRQSTAT_shift,%eax + leaq irq_stat(%rip),%rcx + cmpl $0,(%rcx,%rax,1) + je 1f + movl $EVENT_CHECK_VECTOR,%edi + call send_IPI_self +1: movq VCPU_domain(%rbx),%rax + cmpb $0,DOMAIN_is_32bit_pv(%rax) + je restore_all_guest + jmp compat_restore_all_guest ENTRY(machine_check) pushq $0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:34:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGODc-0000Ls-St; Fri, 15 Mar 2013 06:34:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODb-0000Lb-M8 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:20 +0000 Received: from [193.109.254.147:50545] by server-4.bemta-14.messagelabs.com id BB/F6-17387-AE0C2415; Fri, 15 Mar 2013 06:34:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1363329255!8967017!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6681 invoked from network); 15 Mar 2013 06:34:16 -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; 15 Mar 2013 06:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODX-0000WP-IS for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGODX-0001tY-BK for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:15 +0000 Date: Fri, 15 Mar 2013 06:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b56fe0b46f98afe918455bae193d543d3ffc4598 Author: Jan Beulich AuthorDate: Tue Mar 12 16:46:09 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:46:09 2013 +0100 x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses This adds two new physdev operations for Dom0 to invoke when resource allocation for devices is known to be complete, so that the hypervisor can arrange for the respective MMIO ranges to be marked read-only before an eventual guest getting such a device assigned even gets started, such that it won't be able to set up writable mappings for these MMIO ranges before Xen has a chance to protect them. This also addresses another issue with the code being modified here, in that so far write protection for the address ranges in question got set up only once during the lifetime of a device (i.e. until either system shutdown or device hot removal), while teardown happened when the last interrupt was disposed of by the guest (which at least allowed the tables to be writable when the device got assigned to a second guest [instance] after the first terminated). Signed-off-by: Jan Beulich master changeset: 4245d331e0e75de8d1bddbbb518f3a8ce6d0bb7e master date: 2013-03-08 14:05:34 +0100 --- xen/arch/x86/msi.c | 198 +++++++++++++++++++++++++++--------------- xen/arch/x86/physdev.c | 14 +++ xen/include/asm-x86/msi.h | 1 + xen/include/public/physdev.h | 15 +++ xen/include/xen/pci.h | 1 + 5 files changed, 160 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 1579dfc..ef332fb 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -602,8 +602,8 @@ static u64 read_pci_mem_bar(u8 bus, u8 slot, u8 func, u8 bir, int vf) * @entries: pointer to an array of struct msix_entry entries * @nvec: number of @entries * - * Setup the MSI-X capability structure of device function with a - * single MSI-X irq. A return of zero indicates the successful setup of + * Setup the MSI-X capability structure of device function with the requested + * number MSI-X irqs. A return of zero indicates the successful setup of * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, @@ -611,84 +611,67 @@ static int msix_capability_init(struct pci_dev *dev, struct msi_desc **desc, unsigned int nr_entries) { - struct msi_desc *entry; - int pos; + struct msi_desc *entry = NULL; + int pos, vf; u16 control; - u64 table_paddr, entry_paddr; - u32 table_offset, entry_offset; - u8 bir; - void __iomem *base; - int idx; + u64 table_paddr; + u32 table_offset; + u8 bir, pbus, pslot, pfunc; u8 bus = dev->bus; u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); ASSERT(spin_is_locked(&pcidevs_lock)); - ASSERT(desc); pos = pci_find_cap_offset(bus, slot, func, PCI_CAP_ID_MSIX); control = pci_conf_read16(bus, slot, func, msix_control_reg(pos)); msix_set_enable(dev, 0);/* Ensure msix is disabled as I set it up */ - /* MSI-X Table Initialization */ - entry = alloc_msi_entry(); - if ( !entry ) - return -ENOMEM; + if ( desc ) + { + entry = alloc_msi_entry(); + if ( !entry ) + return -ENOMEM; + ASSERT(msi); + } - /* Request & Map MSI-X table region */ + /* Locate MSI-X table region */ table_offset = pci_conf_read32(bus, slot, func, msix_table_offset_reg(pos)); bir = (u8)(table_offset & PCI_MSIX_BIRMASK); table_offset &= ~PCI_MSIX_BIRMASK; - entry_offset = msi->entry_nr * PCI_MSIX_ENTRY_SIZE; - table_paddr = msi->table_base + table_offset; - entry_paddr = table_paddr + entry_offset; - idx = msix_get_fixmap(dev, table_paddr, entry_paddr); - if ( idx < 0 ) + if ( !dev->info.is_virtfn ) { - xfree(entry); - return idx; + pbus = bus; + pslot = slot; + pfunc = func; + vf = -1; } - base = (void *)(fix_to_virt(idx) + - ((unsigned long)entry_paddr & ((1UL << PAGE_SHIFT) - 1))); - - entry->msi_attrib.type = PCI_CAP_ID_MSIX; - 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.pos = pos; - entry->irq = msi->irq; - entry->dev = dev; - entry->mask_base = base; - - list_add_tail(&entry->list, &dev->msi_list); - - if ( !dev->msix_nr_entries ) + else { - u8 pbus, pslot, pfunc; - int vf; - u64 pba_paddr; - u32 pba_offset; + pbus = dev->info.physfn.bus; + pslot = PCI_SLOT(dev->info.physfn.devfn); + pfunc = PCI_FUNC(dev->info.physfn.devfn); + vf = PCI_BDF2(dev->bus, dev->devfn); + } - if ( !dev->info.is_virtfn ) - { - pbus = bus; - pslot = slot; - pfunc = func; - vf = -1; - } - else + table_paddr = read_pci_mem_bar(pbus, pslot, pfunc, bir, vf); + WARN_ON(msi && msi->table_base != table_paddr); + if ( !table_paddr ) + { + if ( !msi || !msi->table_base ) { - pbus = dev->info.physfn.bus; - pslot = PCI_SLOT(dev->info.physfn.devfn); - pfunc = PCI_FUNC(dev->info.physfn.devfn); - vf = PCI_BDF2(dev->bus, dev->devfn); + xfree(entry); + return -ENXIO; } + table_paddr = msi->table_base; + } + table_paddr += table_offset; - ASSERT(!dev->msix_used_entries); - WARN_ON(msi->table_base != - read_pci_mem_bar(pbus, pslot, pfunc, bir, vf)); + if ( !dev->msix_used_entries ) + { + u64 pba_paddr; + u32 pba_offset; dev->msix_nr_entries = nr_entries; dev->msix_table.first = PFN_DOWN(table_paddr); @@ -709,7 +692,42 @@ static int msix_capability_init(struct pci_dev *dev, BITS_TO_LONGS(nr_entries) - 1); WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, dev->msix_pba.first, dev->msix_pba.last)); + } + + if ( entry ) + { + /* Map MSI-X table region */ + u64 entry_paddr = table_paddr + msi->entry_nr * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(dev, table_paddr, entry_paddr); + void __iomem *base; + + if ( idx < 0 ) + { + xfree(entry); + return idx; + } + base = (void *)(fix_to_virt(idx) + + ((unsigned long)entry_paddr & (PAGE_SIZE - 1))); + + /* Mask interrupt here */ + writel(1, base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); + + entry->msi_attrib.type = PCI_CAP_ID_MSIX; + 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.pos = pos; + entry->irq = msi->irq; + entry->dev = dev; + entry->mask_base = base; + + list_add_tail(&entry->list, &dev->msi_list); + *desc = entry; + } + if ( !dev->msix_used_entries ) + { if ( rangeset_add_range(mmio_ro_ranges, dev->msix_table.first, dev->msix_table.last) ) WARN(); @@ -720,7 +738,7 @@ static int msix_capability_init(struct pci_dev *dev, if ( dev->domain ) p2m_change_entry_type_global(p2m_get_hostp2m(dev->domain), p2m_mmio_direct, p2m_mmio_direct); - if ( !dev->domain || !paging_mode_translate(dev->domain) ) + if ( desc && (!dev->domain || !paging_mode_translate(dev->domain)) ) { struct domain *d = dev->domain; @@ -734,6 +752,13 @@ static int msix_capability_init(struct pci_dev *dev, break; if ( d ) { + if ( !IS_PRIV(d) && dev->msix_warned != d->domain_id ) + { + dev->msix_warned = d->domain_id; + printk(XENLOG_ERR + "Potentially insecure use of MSI-X on %02x:%02x.%u by Dom%d\n", + bus, slot, func, d->domain_id); + } /* XXX How to deal with existing mappings? */ } } @@ -742,10 +767,6 @@ static int msix_capability_init(struct pci_dev *dev, WARN_ON(dev->msix_table.first != (table_paddr >> PAGE_SHIFT)); ++dev->msix_used_entries; - /* Mask interrupt here */ - writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); - - *desc = entry; /* Restore MSI-X enabled bits */ pci_conf_write16(bus, slot, func, msix_control_reg(pos), control); @@ -876,6 +897,19 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) return status; } +static void _pci_cleanup_msix(struct pci_dev *dev) +{ + if ( !--dev->msix_used_entries ) + { + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, + dev->msix_table.last) ) + WARN(); + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, + dev->msix_pba.last) ) + WARN(); + } +} + static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev; @@ -898,15 +932,41 @@ static void __pci_disable_msix(struct msi_desc *entry) pci_conf_write16(bus, slot, func, msix_control_reg(pos), control); - if ( !--dev->msix_used_entries ) + _pci_cleanup_msix(dev); +} + +int pci_prepare_msix(u8 bus, u8 devfn, bool_t off) +{ + int rc; + struct pci_dev *pdev; + u8 slot = PCI_SLOT(devfn), func = PCI_FUNC(devfn); + unsigned int pos = pci_find_cap_offset(bus, slot, func, + PCI_CAP_ID_MSIX); + + if ( !pos ) + return -ENODEV; + + spin_lock(&pcidevs_lock); + pdev = pci_get_pdev(bus, devfn); + if ( !pdev ) + rc = -ENODEV; + else if ( pdev->msix_used_entries != !!off ) + rc = -EBUSY; + else if ( off ) { - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, - dev->msix_table.last) ) - WARN(); - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, - dev->msix_pba.last) ) - WARN(); + _pci_cleanup_msix(pdev); + rc = 0; } + else + { + u16 control = pci_conf_read16(bus, slot, func, msix_control_reg(pos)); + + rc = msix_capability_init(pdev, NULL, NULL, + multi_msix_capable(control)); + } + spin_unlock(&pcidevs_lock); + + return rc; } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index de364f0..8feb84a 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -548,6 +548,20 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg) break; } + case PHYSDEVOP_prepare_msix: + case PHYSDEVOP_release_msix: { + struct physdev_pci_device dev; + + if ( copy_from_guest(&dev, arg, 1) ) + ret = -EFAULT; + else if ( dev.seg ) + ret = -EOPNOTSUPP; + else + ret = pci_prepare_msix(dev.bus, dev.devfn, + cmd != PHYSDEVOP_prepare_msix); + break; + } + case PHYSDEVOP_restore_msi: { struct physdev_restore_msi restore_msi; struct pci_dev *pdev; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index dc402b9..bd83a57 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -75,6 +75,7 @@ extern void unmask_msi_irq(unsigned int irq); extern void set_msi_affinity(unsigned int vector, cpumask_t mask); extern int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc); extern void pci_disable_msi(struct msi_desc *desc); +extern int pci_prepare_msix(u8 bus, u8 devfn, bool_t off); extern void pci_cleanup_msi(struct pci_dev *pdev); extern int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq); extern void teardown_msi_irq(int irq); diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index 6f792ee..d65f72b 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -264,6 +264,21 @@ typedef struct physdev_get_free_pirq physdev_get_free_pirq_t; DEFINE_XEN_GUEST_HANDLE(physdev_get_free_pirq_t); /* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 +struct physdev_pci_device { + /* IN */ + uint16_t seg; + uint8_t bus; + uint8_t devfn; +}; +typedef struct physdev_pci_device physdev_pci_device_t; +DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_t); + +/* * Notify that some PIRQ-bound event channels have been unmasked. * ** This command is obsolete since interface version 0x00030202 and is ** * ** unsupported by newer versions of Xen. ** diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index e1b9cdd..3b8067e 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -57,6 +57,7 @@ struct pci_dev { int msix_table_refcnt[MAX_MSIX_TABLE_PAGES]; int msix_table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t msix_table_lock; + domid_t msix_warned; struct domain *domain; const u8 bus; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:34:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 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 1UGODc-0000Ls-St; Fri, 15 Mar 2013 06:34:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODb-0000Lb-M8 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:20 +0000 Received: from [193.109.254.147:50545] by server-4.bemta-14.messagelabs.com id BB/F6-17387-AE0C2415; Fri, 15 Mar 2013 06:34:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1363329255!8967017!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6681 invoked from network); 15 Mar 2013 06:34:16 -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; 15 Mar 2013 06:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODX-0000WP-IS for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGODX-0001tY-BK for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:15 +0000 Date: Fri, 15 Mar 2013 06:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b56fe0b46f98afe918455bae193d543d3ffc4598 Author: Jan Beulich AuthorDate: Tue Mar 12 16:46:09 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:46:09 2013 +0100 x86/MSI: add mechanism to fully protect MSI-X table from PV guest accesses This adds two new physdev operations for Dom0 to invoke when resource allocation for devices is known to be complete, so that the hypervisor can arrange for the respective MMIO ranges to be marked read-only before an eventual guest getting such a device assigned even gets started, such that it won't be able to set up writable mappings for these MMIO ranges before Xen has a chance to protect them. This also addresses another issue with the code being modified here, in that so far write protection for the address ranges in question got set up only once during the lifetime of a device (i.e. until either system shutdown or device hot removal), while teardown happened when the last interrupt was disposed of by the guest (which at least allowed the tables to be writable when the device got assigned to a second guest [instance] after the first terminated). Signed-off-by: Jan Beulich master changeset: 4245d331e0e75de8d1bddbbb518f3a8ce6d0bb7e master date: 2013-03-08 14:05:34 +0100 --- xen/arch/x86/msi.c | 198 +++++++++++++++++++++++++++--------------- xen/arch/x86/physdev.c | 14 +++ xen/include/asm-x86/msi.h | 1 + xen/include/public/physdev.h | 15 +++ xen/include/xen/pci.h | 1 + 5 files changed, 160 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 1579dfc..ef332fb 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -602,8 +602,8 @@ static u64 read_pci_mem_bar(u8 bus, u8 slot, u8 func, u8 bir, int vf) * @entries: pointer to an array of struct msix_entry entries * @nvec: number of @entries * - * Setup the MSI-X capability structure of device function with a - * single MSI-X irq. A return of zero indicates the successful setup of + * Setup the MSI-X capability structure of device function with the requested + * number MSI-X irqs. A return of zero indicates the successful setup of * requested MSI-X entries with allocated irqs or non-zero for otherwise. **/ static int msix_capability_init(struct pci_dev *dev, @@ -611,84 +611,67 @@ static int msix_capability_init(struct pci_dev *dev, struct msi_desc **desc, unsigned int nr_entries) { - struct msi_desc *entry; - int pos; + struct msi_desc *entry = NULL; + int pos, vf; u16 control; - u64 table_paddr, entry_paddr; - u32 table_offset, entry_offset; - u8 bir; - void __iomem *base; - int idx; + u64 table_paddr; + u32 table_offset; + u8 bir, pbus, pslot, pfunc; u8 bus = dev->bus; u8 slot = PCI_SLOT(dev->devfn); u8 func = PCI_FUNC(dev->devfn); ASSERT(spin_is_locked(&pcidevs_lock)); - ASSERT(desc); pos = pci_find_cap_offset(bus, slot, func, PCI_CAP_ID_MSIX); control = pci_conf_read16(bus, slot, func, msix_control_reg(pos)); msix_set_enable(dev, 0);/* Ensure msix is disabled as I set it up */ - /* MSI-X Table Initialization */ - entry = alloc_msi_entry(); - if ( !entry ) - return -ENOMEM; + if ( desc ) + { + entry = alloc_msi_entry(); + if ( !entry ) + return -ENOMEM; + ASSERT(msi); + } - /* Request & Map MSI-X table region */ + /* Locate MSI-X table region */ table_offset = pci_conf_read32(bus, slot, func, msix_table_offset_reg(pos)); bir = (u8)(table_offset & PCI_MSIX_BIRMASK); table_offset &= ~PCI_MSIX_BIRMASK; - entry_offset = msi->entry_nr * PCI_MSIX_ENTRY_SIZE; - table_paddr = msi->table_base + table_offset; - entry_paddr = table_paddr + entry_offset; - idx = msix_get_fixmap(dev, table_paddr, entry_paddr); - if ( idx < 0 ) + if ( !dev->info.is_virtfn ) { - xfree(entry); - return idx; + pbus = bus; + pslot = slot; + pfunc = func; + vf = -1; } - base = (void *)(fix_to_virt(idx) + - ((unsigned long)entry_paddr & ((1UL << PAGE_SHIFT) - 1))); - - entry->msi_attrib.type = PCI_CAP_ID_MSIX; - 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.pos = pos; - entry->irq = msi->irq; - entry->dev = dev; - entry->mask_base = base; - - list_add_tail(&entry->list, &dev->msi_list); - - if ( !dev->msix_nr_entries ) + else { - u8 pbus, pslot, pfunc; - int vf; - u64 pba_paddr; - u32 pba_offset; + pbus = dev->info.physfn.bus; + pslot = PCI_SLOT(dev->info.physfn.devfn); + pfunc = PCI_FUNC(dev->info.physfn.devfn); + vf = PCI_BDF2(dev->bus, dev->devfn); + } - if ( !dev->info.is_virtfn ) - { - pbus = bus; - pslot = slot; - pfunc = func; - vf = -1; - } - else + table_paddr = read_pci_mem_bar(pbus, pslot, pfunc, bir, vf); + WARN_ON(msi && msi->table_base != table_paddr); + if ( !table_paddr ) + { + if ( !msi || !msi->table_base ) { - pbus = dev->info.physfn.bus; - pslot = PCI_SLOT(dev->info.physfn.devfn); - pfunc = PCI_FUNC(dev->info.physfn.devfn); - vf = PCI_BDF2(dev->bus, dev->devfn); + xfree(entry); + return -ENXIO; } + table_paddr = msi->table_base; + } + table_paddr += table_offset; - ASSERT(!dev->msix_used_entries); - WARN_ON(msi->table_base != - read_pci_mem_bar(pbus, pslot, pfunc, bir, vf)); + if ( !dev->msix_used_entries ) + { + u64 pba_paddr; + u32 pba_offset; dev->msix_nr_entries = nr_entries; dev->msix_table.first = PFN_DOWN(table_paddr); @@ -709,7 +692,42 @@ static int msix_capability_init(struct pci_dev *dev, BITS_TO_LONGS(nr_entries) - 1); WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, dev->msix_pba.first, dev->msix_pba.last)); + } + + if ( entry ) + { + /* Map MSI-X table region */ + u64 entry_paddr = table_paddr + msi->entry_nr * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(dev, table_paddr, entry_paddr); + void __iomem *base; + + if ( idx < 0 ) + { + xfree(entry); + return idx; + } + base = (void *)(fix_to_virt(idx) + + ((unsigned long)entry_paddr & (PAGE_SIZE - 1))); + + /* Mask interrupt here */ + writel(1, base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); + + entry->msi_attrib.type = PCI_CAP_ID_MSIX; + 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.pos = pos; + entry->irq = msi->irq; + entry->dev = dev; + entry->mask_base = base; + + list_add_tail(&entry->list, &dev->msi_list); + *desc = entry; + } + if ( !dev->msix_used_entries ) + { if ( rangeset_add_range(mmio_ro_ranges, dev->msix_table.first, dev->msix_table.last) ) WARN(); @@ -720,7 +738,7 @@ static int msix_capability_init(struct pci_dev *dev, if ( dev->domain ) p2m_change_entry_type_global(p2m_get_hostp2m(dev->domain), p2m_mmio_direct, p2m_mmio_direct); - if ( !dev->domain || !paging_mode_translate(dev->domain) ) + if ( desc && (!dev->domain || !paging_mode_translate(dev->domain)) ) { struct domain *d = dev->domain; @@ -734,6 +752,13 @@ static int msix_capability_init(struct pci_dev *dev, break; if ( d ) { + if ( !IS_PRIV(d) && dev->msix_warned != d->domain_id ) + { + dev->msix_warned = d->domain_id; + printk(XENLOG_ERR + "Potentially insecure use of MSI-X on %02x:%02x.%u by Dom%d\n", + bus, slot, func, d->domain_id); + } /* XXX How to deal with existing mappings? */ } } @@ -742,10 +767,6 @@ static int msix_capability_init(struct pci_dev *dev, WARN_ON(dev->msix_table.first != (table_paddr >> PAGE_SHIFT)); ++dev->msix_used_entries; - /* Mask interrupt here */ - writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); - - *desc = entry; /* Restore MSI-X enabled bits */ pci_conf_write16(bus, slot, func, msix_control_reg(pos), control); @@ -876,6 +897,19 @@ static int __pci_enable_msix(struct msi_info *msi, struct msi_desc **desc) return status; } +static void _pci_cleanup_msix(struct pci_dev *dev) +{ + if ( !--dev->msix_used_entries ) + { + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, + dev->msix_table.last) ) + WARN(); + if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, + dev->msix_pba.last) ) + WARN(); + } +} + static void __pci_disable_msix(struct msi_desc *entry) { struct pci_dev *dev; @@ -898,15 +932,41 @@ static void __pci_disable_msix(struct msi_desc *entry) pci_conf_write16(bus, slot, func, msix_control_reg(pos), control); - if ( !--dev->msix_used_entries ) + _pci_cleanup_msix(dev); +} + +int pci_prepare_msix(u8 bus, u8 devfn, bool_t off) +{ + int rc; + struct pci_dev *pdev; + u8 slot = PCI_SLOT(devfn), func = PCI_FUNC(devfn); + unsigned int pos = pci_find_cap_offset(bus, slot, func, + PCI_CAP_ID_MSIX); + + if ( !pos ) + return -ENODEV; + + spin_lock(&pcidevs_lock); + pdev = pci_get_pdev(bus, devfn); + if ( !pdev ) + rc = -ENODEV; + else if ( pdev->msix_used_entries != !!off ) + rc = -EBUSY; + else if ( off ) { - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_table.first, - dev->msix_table.last) ) - WARN(); - if ( rangeset_remove_range(mmio_ro_ranges, dev->msix_pba.first, - dev->msix_pba.last) ) - WARN(); + _pci_cleanup_msix(pdev); + rc = 0; } + else + { + u16 control = pci_conf_read16(bus, slot, func, msix_control_reg(pos)); + + rc = msix_capability_init(pdev, NULL, NULL, + multi_msix_capable(control)); + } + spin_unlock(&pcidevs_lock); + + return rc; } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index de364f0..8feb84a 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -548,6 +548,20 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg) break; } + case PHYSDEVOP_prepare_msix: + case PHYSDEVOP_release_msix: { + struct physdev_pci_device dev; + + if ( copy_from_guest(&dev, arg, 1) ) + ret = -EFAULT; + else if ( dev.seg ) + ret = -EOPNOTSUPP; + else + ret = pci_prepare_msix(dev.bus, dev.devfn, + cmd != PHYSDEVOP_prepare_msix); + break; + } + case PHYSDEVOP_restore_msi: { struct physdev_restore_msi restore_msi; struct pci_dev *pdev; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index dc402b9..bd83a57 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -75,6 +75,7 @@ extern void unmask_msi_irq(unsigned int irq); extern void set_msi_affinity(unsigned int vector, cpumask_t mask); extern int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc); extern void pci_disable_msi(struct msi_desc *desc); +extern int pci_prepare_msix(u8 bus, u8 devfn, bool_t off); extern void pci_cleanup_msi(struct pci_dev *pdev); extern int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq); extern void teardown_msi_irq(int irq); diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index 6f792ee..d65f72b 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -264,6 +264,21 @@ typedef struct physdev_get_free_pirq physdev_get_free_pirq_t; DEFINE_XEN_GUEST_HANDLE(physdev_get_free_pirq_t); /* + * Dom0 should use these two to announce MMIO resources assigned to + * MSI-X capable devices won't (prepare) or may (release) change. + */ +#define PHYSDEVOP_prepare_msix 30 +#define PHYSDEVOP_release_msix 31 +struct physdev_pci_device { + /* IN */ + uint16_t seg; + uint8_t bus; + uint8_t devfn; +}; +typedef struct physdev_pci_device physdev_pci_device_t; +DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_t); + +/* * Notify that some PIRQ-bound event channels have been unmasked. * ** This command is obsolete since interface version 0x00030202 and is ** * ** unsupported by newer versions of Xen. ** diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index e1b9cdd..3b8067e 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -57,6 +57,7 @@ struct pci_dev { int msix_table_refcnt[MAX_MSIX_TABLE_PAGES]; int msix_table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t msix_table_lock; + domid_t msix_warned; struct domain *domain; const u8 bus; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:35:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:35: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 1UGOEP-0000OK-2H; Fri, 15 Mar 2013 06:35:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOEN-0000OB-CG for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:35:07 +0000 Received: from [85.158.139.211:3813] by server-2.bemta-5.messagelabs.com id 7B/E0-23989-A11C2415; Fri, 15 Mar 2013 06:35:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1363329304!18332313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26089 invoked from network); 15 Mar 2013 06:35:05 -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; 15 Mar 2013 06:35:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODN-0000WM-80 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGODN-0001tA-1o for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:05 +0000 Date: Fri, 15 Mar 2013 06:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] credit1: Use atomic bit operations for the flags structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 672c075ab39e2dea517a75d5e6091e6df82c3f71 Author: George Dunlap AuthorDate: Tue Mar 12 16:30:41 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:30:41 2013 +0100 credit1: Use atomic bit operations for the flags structure The flags structure is not protected by locks (or more precisely, it is protected using an inconsistent set of locks); we therefore need to make sure that all accesses are atomic-safe. This is particulary important in the case of the PARKED flag, which if clobbered while changing the YIELD bit will leave a vcpu wedged in an offline state. Using the atomic bitops also requires us to change the size of the "flags" element. Spotted-by: Igor Pavlikevich Signed-off-by: George Dunlap master changeset: be6507509454adf3bb5a50b9406c88504e996d5a master date: 2013-03-04 13:37:39 +0100 --- xen/common/sched_credit.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7ec9605..addd249 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -58,8 +58,8 @@ /* * Flags */ -#define CSCHED_FLAG_VCPU_PARKED 0x0001 /* VCPU over capped credits */ -#define CSCHED_FLAG_VCPU_YIELD 0x0002 /* VCPU yielding */ +#define CSCHED_FLAG_VCPU_PARKED 0x0 /* VCPU over capped credits */ +#define CSCHED_FLAG_VCPU_YIELD 0x1 /* VCPU yielding */ /* @@ -134,7 +134,7 @@ struct csched_vcpu { struct vcpu *vcpu; atomic_t credit; s_time_t start_time; /* When we were scheduled (used for credit) */ - uint16_t flags; + unsigned flags; int16_t pri; #ifdef CSCHED_STATS struct { @@ -215,7 +215,7 @@ __runq_insert(unsigned int cpu, struct csched_vcpu *svc) /* If the vcpu yielded, try to put it behind one lower-priority * runnable vcpu if we can. The next runq_sort will bring it forward * within 30ms if the queue too long. */ - if ( svc->flags & CSCHED_FLAG_VCPU_YIELD + if ( test_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags) && __runq_elem(iter)->pri > CSCHED_PRI_IDLE ) { iter=iter->next; @@ -777,7 +777,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) * those. */ if ( svc->pri == CSCHED_PRI_TS_UNDER && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { svc->pri = CSCHED_PRI_TS_BOOST; } @@ -790,12 +790,12 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) static void csched_vcpu_yield(const struct scheduler *ops, struct vcpu *vc) { - struct csched_vcpu * const sv = CSCHED_VCPU(vc); + struct csched_vcpu * const svc = CSCHED_VCPU(vc); if ( !sched_credit_default_yield ) { /* Let the scheduler know that this vcpu is trying to yield */ - sv->flags |= CSCHED_FLAG_VCPU_YIELD; + set_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags); } } @@ -1090,11 +1090,10 @@ csched_acct(void* dummy) /* Park running VCPUs of capped-out domains */ if ( sdom->cap != 0U && credit < -credit_cap && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_and_set_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { CSCHED_STAT_CRANK(vcpu_park); vcpu_pause_nosync(svc->vcpu); - svc->flags |= CSCHED_FLAG_VCPU_PARKED; } /* Lower bound on credits */ @@ -1110,7 +1109,7 @@ csched_acct(void* dummy) svc->pri = CSCHED_PRI_TS_UNDER; /* Unpark any capped domains whose credits go positive */ - if ( svc->flags & CSCHED_FLAG_VCPU_PARKED) + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { /* * It's important to unset the flag AFTER the unpause() @@ -1119,7 +1118,6 @@ csched_acct(void* dummy) */ CSCHED_STAT_CRANK(vcpu_unpark); vcpu_unpause(svc->vcpu); - svc->flags &= ~CSCHED_FLAG_VCPU_PARKED; } /* Upper bound on credits means VCPU stops earning */ @@ -1378,8 +1376,7 @@ csched_schedule( /* * Clear YIELD flag before scheduling out */ - if ( scurr->flags & CSCHED_FLAG_VCPU_YIELD ) - scurr->flags &= ~(CSCHED_FLAG_VCPU_YIELD); + clear_bit(CSCHED_FLAG_VCPU_YIELD, &scurr->flags); /* * SMP Load balance: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 06:35:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 06:35: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 1UGOEP-0000OK-2H; Fri, 15 Mar 2013 06:35:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGOEN-0000OB-CG for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:35:07 +0000 Received: from [85.158.139.211:3813] by server-2.bemta-5.messagelabs.com id 7B/E0-23989-A11C2415; Fri, 15 Mar 2013 06:35:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1363329304!18332313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26089 invoked from network); 15 Mar 2013 06:35:05 -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; 15 Mar 2013 06:35:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGODN-0000WM-80 for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGODN-0001tA-1o for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 06:34:05 +0000 Date: Fri, 15 Mar 2013 06:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] credit1: Use atomic bit operations for the flags structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 672c075ab39e2dea517a75d5e6091e6df82c3f71 Author: George Dunlap AuthorDate: Tue Mar 12 16:30:41 2013 +0100 Commit: Jan Beulich CommitDate: Tue Mar 12 16:30:41 2013 +0100 credit1: Use atomic bit operations for the flags structure The flags structure is not protected by locks (or more precisely, it is protected using an inconsistent set of locks); we therefore need to make sure that all accesses are atomic-safe. This is particulary important in the case of the PARKED flag, which if clobbered while changing the YIELD bit will leave a vcpu wedged in an offline state. Using the atomic bitops also requires us to change the size of the "flags" element. Spotted-by: Igor Pavlikevich Signed-off-by: George Dunlap master changeset: be6507509454adf3bb5a50b9406c88504e996d5a master date: 2013-03-04 13:37:39 +0100 --- xen/common/sched_credit.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7ec9605..addd249 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -58,8 +58,8 @@ /* * Flags */ -#define CSCHED_FLAG_VCPU_PARKED 0x0001 /* VCPU over capped credits */ -#define CSCHED_FLAG_VCPU_YIELD 0x0002 /* VCPU yielding */ +#define CSCHED_FLAG_VCPU_PARKED 0x0 /* VCPU over capped credits */ +#define CSCHED_FLAG_VCPU_YIELD 0x1 /* VCPU yielding */ /* @@ -134,7 +134,7 @@ struct csched_vcpu { struct vcpu *vcpu; atomic_t credit; s_time_t start_time; /* When we were scheduled (used for credit) */ - uint16_t flags; + unsigned flags; int16_t pri; #ifdef CSCHED_STATS struct { @@ -215,7 +215,7 @@ __runq_insert(unsigned int cpu, struct csched_vcpu *svc) /* If the vcpu yielded, try to put it behind one lower-priority * runnable vcpu if we can. The next runq_sort will bring it forward * within 30ms if the queue too long. */ - if ( svc->flags & CSCHED_FLAG_VCPU_YIELD + if ( test_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags) && __runq_elem(iter)->pri > CSCHED_PRI_IDLE ) { iter=iter->next; @@ -777,7 +777,7 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) * those. */ if ( svc->pri == CSCHED_PRI_TS_UNDER && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { svc->pri = CSCHED_PRI_TS_BOOST; } @@ -790,12 +790,12 @@ csched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) static void csched_vcpu_yield(const struct scheduler *ops, struct vcpu *vc) { - struct csched_vcpu * const sv = CSCHED_VCPU(vc); + struct csched_vcpu * const svc = CSCHED_VCPU(vc); if ( !sched_credit_default_yield ) { /* Let the scheduler know that this vcpu is trying to yield */ - sv->flags |= CSCHED_FLAG_VCPU_YIELD; + set_bit(CSCHED_FLAG_VCPU_YIELD, &svc->flags); } } @@ -1090,11 +1090,10 @@ csched_acct(void* dummy) /* Park running VCPUs of capped-out domains */ if ( sdom->cap != 0U && credit < -credit_cap && - !(svc->flags & CSCHED_FLAG_VCPU_PARKED) ) + !test_and_set_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { CSCHED_STAT_CRANK(vcpu_park); vcpu_pause_nosync(svc->vcpu); - svc->flags |= CSCHED_FLAG_VCPU_PARKED; } /* Lower bound on credits */ @@ -1110,7 +1109,7 @@ csched_acct(void* dummy) svc->pri = CSCHED_PRI_TS_UNDER; /* Unpark any capped domains whose credits go positive */ - if ( svc->flags & CSCHED_FLAG_VCPU_PARKED) + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { /* * It's important to unset the flag AFTER the unpause() @@ -1119,7 +1118,6 @@ csched_acct(void* dummy) */ CSCHED_STAT_CRANK(vcpu_unpark); vcpu_unpause(svc->vcpu); - svc->flags &= ~CSCHED_FLAG_VCPU_PARKED; } /* Upper bound on credits means VCPU stops earning */ @@ -1378,8 +1376,7 @@ csched_schedule( /* * Clear YIELD flag before scheduling out */ - if ( scurr->flags & CSCHED_FLAG_VCPU_YIELD ) - scurr->flags &= ~(CSCHED_FLAG_VCPU_YIELD); + clear_bit(CSCHED_FLAG_VCPU_YIELD, &scurr->flags); /* * SMP Load balance: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 15 18:33:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 18:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGZRI-0002X1-PL; Fri, 15 Mar 2013 18:33:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGZRG-0002Wo-Uu for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 18:33:11 +0000 Received: from [85.158.137.99:36816] by server-2.bemta-3.messagelabs.com id D4/22-05208-16963415; Fri, 15 Mar 2013 18:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1363372383!13796281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16184 invoked from network); 15 Mar 2013 18:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 18:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGZR8-0000lB-VG for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 18:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGZR8-0003UV-Ki for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 18:33:02 +0000 Date: Fri, 15 Mar 2013 18:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen: Disable use of O_DIRECT by default as it results in crashes. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b86eb6bb95e67d22185967657c97fb6a2f131198 Author: Alex Bligh AuthorDate: Fri Mar 15 18:25:15 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 15 18:26:46 2013 +0000 xen: Disable use of O_DIRECT by default as it results in crashes. Due to what is almost certainly a kernel bug, writes with O_DIRECT may continue to reference the page after the write has been marked as completed, particularly in the case of TCP retransmit. In other scenarios, this "merely" risks data corruption on the write, but with Xen pages from domU are only transiently mapped into dom0's memory, resulting in kernel panics when they are subsequently accessed. This brings PV devices in line with emulated devices. Removing O_DIRECT is safe as barrier operations are now correctly passed through. See: http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html for more details. Signed-off-by: Alex Bligh Acked-by: Stefano Stabellini Backported to qemu-xen-unstable, Signed-off-by: Ian Jackson --- hw/xen_disk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 33a5531..ee8d36f 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -635,7 +635,7 @@ static int blk_init(struct XenDevice *xendev) return -1; /* read-only ? */ - qflags = BDRV_O_NOCACHE; + qflags = BDRV_O_CACHE_WB; if (strcmp(blkdev->mode, "w") == 0) { mode = O_RDWR; qflags |= BDRV_O_RDWR; -- 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 Fri Mar 15 18:33:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Mar 2013 18:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGZRI-0002X1-PL; Fri, 15 Mar 2013 18:33:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGZRG-0002Wo-Uu for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 18:33:11 +0000 Received: from [85.158.137.99:36816] by server-2.bemta-3.messagelabs.com id D4/22-05208-16963415; Fri, 15 Mar 2013 18:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1363372383!13796281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16184 invoked from network); 15 Mar 2013 18:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Mar 2013 18:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGZR8-0000lB-VG for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 18:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGZR8-0003UV-Ki for xen-changelog@lists.xensource.com; Fri, 15 Mar 2013 18:33:02 +0000 Date: Fri, 15 Mar 2013 18:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen: Disable use of O_DIRECT by default as it results in crashes. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b86eb6bb95e67d22185967657c97fb6a2f131198 Author: Alex Bligh AuthorDate: Fri Mar 15 18:25:15 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 15 18:26:46 2013 +0000 xen: Disable use of O_DIRECT by default as it results in crashes. Due to what is almost certainly a kernel bug, writes with O_DIRECT may continue to reference the page after the write has been marked as completed, particularly in the case of TCP retransmit. In other scenarios, this "merely" risks data corruption on the write, but with Xen pages from domU are only transiently mapped into dom0's memory, resulting in kernel panics when they are subsequently accessed. This brings PV devices in line with emulated devices. Removing O_DIRECT is safe as barrier operations are now correctly passed through. See: http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html for more details. Signed-off-by: Alex Bligh Acked-by: Stefano Stabellini Backported to qemu-xen-unstable, Signed-off-by: Ian Jackson --- hw/xen_disk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 33a5531..ee8d36f 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -635,7 +635,7 @@ static int blk_init(struct XenDevice *xendev) return -1; /* read-only ? */ - qflags = BDRV_O_NOCACHE; + qflags = BDRV_O_CACHE_WB; if (strcmp(blkdev->mode, "w") == 0) { mode = O_RDWR; qflags |= BDRV_O_RDWR; -- 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 Sat Mar 16 08:55:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Mar 2013 08:55: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 1UGmtR-0004c1-GK; Sat, 16 Mar 2013 08:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGmtQ-0004bl-7M for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 08:55:08 +0000 Received: from [85.158.138.51:62296] by server-1.bemta-3.messagelabs.com id 98/EE-13706-B6334415; Sat, 16 Mar 2013 08:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1363424104!27888189!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5804 invoked from network); 16 Mar 2013 08:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2013 08:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGmtM-0000nP-0N for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 08:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGmtL-0006ia-DI for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 08:55:03 +0000 Date: Sat, 16 Mar 2013 08:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] Add DomU xz kernel decompression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e73e3548ce70e433a03843ac4fc21a49277baad Author: Ian Jackson AuthorDate: Fri Mar 15 18:09:51 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 15 18:19:14 2013 +0000 Add DomU xz kernel decompression Signed-off-by: Jan Beulich xen-unstable changeset: 4afea3d65321c40bb8afec833c860f92176bfb42 xen-unstable date: Wed Mar 9 16:19:36 2011 +0000 Signed-off-by: Ian Jackson [ This is byte-for-byte identical to Bastian Blank's backport of the same changeset to xen-4.1, as found in Debian xen_4.1.4-2.* patch debian/patches/upstream-23002:eb64b8f8eebb -iwj ] --- tools/libxc/xc_dom_bzimageloader.c | 90 +++++++++++++++++++++++++---------- 1 files changed, 64 insertions(+), 26 deletions(-) diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 73cfad1..c5737db 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -187,11 +187,10 @@ static int xc_try_bzip2_decode( #include -static int xc_try_lzma_decode( - struct xc_dom_image *dom, void **blob, size_t *size) +static int _xc_try_lzma_decode( + struct xc_dom_image *dom, void **blob, size_t *size, + lzma_stream *stream, lzma_ret ret, const char *what) { - lzma_stream stream = LZMA_STREAM_INIT; - lzma_ret ret; lzma_action action = LZMA_RUN; unsigned char *out_buf; unsigned char *tmp_buf; @@ -201,14 +200,13 @@ static int xc_try_lzma_decode( if ( dom->kernel_size == 0) { - DOMPRINTF("LZMA: Input is 0 size"); + DOMPRINTF("%s: Input is 0 size", what); return -1; } - ret = lzma_alone_decoder(&stream, 128*1024*1024); if ( ret != LZMA_OK ) { - DOMPRINTF("LZMA: Failed to init stream decoder"); + DOMPRINTF("%s: Failed to init decoder", what); return -1; } @@ -220,22 +218,22 @@ static int xc_try_lzma_decode( out_buf = malloc(outsize); if ( out_buf == NULL ) { - DOMPRINTF("LZMA: Failed to alloc memory"); + DOMPRINTF("%s: Failed to alloc memory", what); goto lzma_cleanup; } - stream.next_in = dom->kernel_blob; - stream.avail_in = dom->kernel_size; + stream->next_in = dom->kernel_blob; + stream->avail_in = dom->kernel_size; - stream.next_out = out_buf; - stream.avail_out = dom->kernel_size; + stream->next_out = out_buf; + stream->avail_out = dom->kernel_size; for ( ; ; ) { - ret = lzma_code(&stream, action); + ret = lzma_code(stream, action); if ( ret == LZMA_STREAM_END ) { - DOMPRINTF("LZMA: Saw data stream end"); + DOMPRINTF("%s: Saw data stream end", what); retval = 0; break; } @@ -272,25 +270,25 @@ static int xc_try_lzma_decode( msg = "Internal program error (bug)"; break; } - DOMPRINTF("%s: LZMA decompression error %s", - __FUNCTION__, msg); + DOMPRINTF("%s: %s decompression error %s", + __FUNCTION__, what, msg); free(out_buf); goto lzma_cleanup; } - if ( stream.avail_out == 0 ) + if ( stream->avail_out == 0 ) { /* Protect against output buffer overflow */ if ( outsize > SIZE_MAX / 2 ) { - DOMPRINTF("LZMA: output buffer overflow"); + DOMPRINTF("%s: output buffer overflow", what); free(out_buf); goto lzma_cleanup; } if ( xc_dom_kernel_check_size(dom, outsize * 2) ) { - DOMPRINTF("LZMA: output too large"); + DOMPRINTF("%s: output too large", what); free(out_buf); goto lzma_cleanup; } @@ -298,32 +296,61 @@ static int xc_try_lzma_decode( tmp_buf = realloc(out_buf, outsize * 2); if ( tmp_buf == NULL ) { - DOMPRINTF("LZMA: Failed to realloc memory"); + DOMPRINTF("%s: Failed to realloc memory", what); free(out_buf); goto lzma_cleanup; } out_buf = tmp_buf; - stream.next_out = out_buf + outsize; - stream.avail_out = (outsize * 2) - outsize; + stream->next_out = out_buf + outsize; + stream->avail_out = (outsize * 2) - outsize; outsize *= 2; } } - DOMPRINTF("%s: LZMA decompress OK, 0x%zx -> 0x%zx", - __FUNCTION__, *size, (size_t)stream.total_out); + DOMPRINTF("%s: %s decompress OK, 0x%zx -> 0x%zx", + __FUNCTION__, what, *size, (size_t)stream->total_out); *blob = out_buf; - *size = stream.total_out; + *size = stream->total_out; lzma_cleanup: - lzma_end(&stream); + lzma_end(stream); return retval; } +/* 128 Mb is the minimum size (half-way) documented to work for all inputs. */ +#define LZMA_BLOCK_SIZE (128*1024*1024) + +static int xc_try_xz_decode( + struct xc_dom_image *dom, void **blob, size_t *size) +{ + lzma_stream stream = LZMA_STREAM_INIT; + lzma_ret ret = lzma_stream_decoder(&stream, LZMA_BLOCK_SIZE, 0); + + return _xc_try_lzma_decode(dom, blob, size, &stream, ret, "XZ"); +} + +static int xc_try_lzma_decode( + struct xc_dom_image *dom, void **blob, size_t *size) +{ + lzma_stream stream = LZMA_STREAM_INIT; + lzma_ret ret = lzma_alone_decoder(&stream, LZMA_BLOCK_SIZE); + + return _xc_try_lzma_decode(dom, blob, size, &stream, ret, "LZMA"); +} + #else /* !defined(HAVE_LZMA) */ +static int xc_try_xz_decode( + struct xc_dom_image *dom, void **blob, size_t *size) +{ + DOMPRINTF("%s: XZ decompress support unavailable", + __FUNCTION__); + return -1; +} + static int xc_try_lzma_decode( struct xc_dom_image *dom, void **blob, size_t *size) { @@ -659,6 +686,17 @@ static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) return -EINVAL; } } + else if ( check_magic(dom, "\3757zXZ", 6) ) + { + ret = xc_try_xz_decode(dom, &dom->kernel_blob, &dom->kernel_size); + if ( ret < 0 ) + { + xc_dom_panic(dom->xch, XC_INVALID_KERNEL, + "%s unable to XZ decompress kernel", + __FUNCTION__); + return -EINVAL; + } + } else if ( check_magic(dom, "\135\000", 2) ) { ret = xc_try_lzma_decode(dom, &dom->kernel_blob, &dom->kernel_size); -- 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 Sat Mar 16 08:55:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Mar 2013 08:55: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 1UGmtR-0004c1-GK; Sat, 16 Mar 2013 08:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGmtQ-0004bl-7M for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 08:55:08 +0000 Received: from [85.158.138.51:62296] by server-1.bemta-3.messagelabs.com id 98/EE-13706-B6334415; Sat, 16 Mar 2013 08:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1363424104!27888189!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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5804 invoked from network); 16 Mar 2013 08:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2013 08:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UGmtM-0000nP-0N for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 08:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UGmtL-0006ia-DI for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 08:55:03 +0000 Date: Sat, 16 Mar 2013 08:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] Add DomU xz kernel decompression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e73e3548ce70e433a03843ac4fc21a49277baad Author: Ian Jackson AuthorDate: Fri Mar 15 18:09:51 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 15 18:19:14 2013 +0000 Add DomU xz kernel decompression Signed-off-by: Jan Beulich xen-unstable changeset: 4afea3d65321c40bb8afec833c860f92176bfb42 xen-unstable date: Wed Mar 9 16:19:36 2011 +0000 Signed-off-by: Ian Jackson [ This is byte-for-byte identical to Bastian Blank's backport of the same changeset to xen-4.1, as found in Debian xen_4.1.4-2.* patch debian/patches/upstream-23002:eb64b8f8eebb -iwj ] --- tools/libxc/xc_dom_bzimageloader.c | 90 +++++++++++++++++++++++++---------- 1 files changed, 64 insertions(+), 26 deletions(-) diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 73cfad1..c5737db 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -187,11 +187,10 @@ static int xc_try_bzip2_decode( #include -static int xc_try_lzma_decode( - struct xc_dom_image *dom, void **blob, size_t *size) +static int _xc_try_lzma_decode( + struct xc_dom_image *dom, void **blob, size_t *size, + lzma_stream *stream, lzma_ret ret, const char *what) { - lzma_stream stream = LZMA_STREAM_INIT; - lzma_ret ret; lzma_action action = LZMA_RUN; unsigned char *out_buf; unsigned char *tmp_buf; @@ -201,14 +200,13 @@ static int xc_try_lzma_decode( if ( dom->kernel_size == 0) { - DOMPRINTF("LZMA: Input is 0 size"); + DOMPRINTF("%s: Input is 0 size", what); return -1; } - ret = lzma_alone_decoder(&stream, 128*1024*1024); if ( ret != LZMA_OK ) { - DOMPRINTF("LZMA: Failed to init stream decoder"); + DOMPRINTF("%s: Failed to init decoder", what); return -1; } @@ -220,22 +218,22 @@ static int xc_try_lzma_decode( out_buf = malloc(outsize); if ( out_buf == NULL ) { - DOMPRINTF("LZMA: Failed to alloc memory"); + DOMPRINTF("%s: Failed to alloc memory", what); goto lzma_cleanup; } - stream.next_in = dom->kernel_blob; - stream.avail_in = dom->kernel_size; + stream->next_in = dom->kernel_blob; + stream->avail_in = dom->kernel_size; - stream.next_out = out_buf; - stream.avail_out = dom->kernel_size; + stream->next_out = out_buf; + stream->avail_out = dom->kernel_size; for ( ; ; ) { - ret = lzma_code(&stream, action); + ret = lzma_code(stream, action); if ( ret == LZMA_STREAM_END ) { - DOMPRINTF("LZMA: Saw data stream end"); + DOMPRINTF("%s: Saw data stream end", what); retval = 0; break; } @@ -272,25 +270,25 @@ static int xc_try_lzma_decode( msg = "Internal program error (bug)"; break; } - DOMPRINTF("%s: LZMA decompression error %s", - __FUNCTION__, msg); + DOMPRINTF("%s: %s decompression error %s", + __FUNCTION__, what, msg); free(out_buf); goto lzma_cleanup; } - if ( stream.avail_out == 0 ) + if ( stream->avail_out == 0 ) { /* Protect against output buffer overflow */ if ( outsize > SIZE_MAX / 2 ) { - DOMPRINTF("LZMA: output buffer overflow"); + DOMPRINTF("%s: output buffer overflow", what); free(out_buf); goto lzma_cleanup; } if ( xc_dom_kernel_check_size(dom, outsize * 2) ) { - DOMPRINTF("LZMA: output too large"); + DOMPRINTF("%s: output too large", what); free(out_buf); goto lzma_cleanup; } @@ -298,32 +296,61 @@ static int xc_try_lzma_decode( tmp_buf = realloc(out_buf, outsize * 2); if ( tmp_buf == NULL ) { - DOMPRINTF("LZMA: Failed to realloc memory"); + DOMPRINTF("%s: Failed to realloc memory", what); free(out_buf); goto lzma_cleanup; } out_buf = tmp_buf; - stream.next_out = out_buf + outsize; - stream.avail_out = (outsize * 2) - outsize; + stream->next_out = out_buf + outsize; + stream->avail_out = (outsize * 2) - outsize; outsize *= 2; } } - DOMPRINTF("%s: LZMA decompress OK, 0x%zx -> 0x%zx", - __FUNCTION__, *size, (size_t)stream.total_out); + DOMPRINTF("%s: %s decompress OK, 0x%zx -> 0x%zx", + __FUNCTION__, what, *size, (size_t)stream->total_out); *blob = out_buf; - *size = stream.total_out; + *size = stream->total_out; lzma_cleanup: - lzma_end(&stream); + lzma_end(stream); return retval; } +/* 128 Mb is the minimum size (half-way) documented to work for all inputs. */ +#define LZMA_BLOCK_SIZE (128*1024*1024) + +static int xc_try_xz_decode( + struct xc_dom_image *dom, void **blob, size_t *size) +{ + lzma_stream stream = LZMA_STREAM_INIT; + lzma_ret ret = lzma_stream_decoder(&stream, LZMA_BLOCK_SIZE, 0); + + return _xc_try_lzma_decode(dom, blob, size, &stream, ret, "XZ"); +} + +static int xc_try_lzma_decode( + struct xc_dom_image *dom, void **blob, size_t *size) +{ + lzma_stream stream = LZMA_STREAM_INIT; + lzma_ret ret = lzma_alone_decoder(&stream, LZMA_BLOCK_SIZE); + + return _xc_try_lzma_decode(dom, blob, size, &stream, ret, "LZMA"); +} + #else /* !defined(HAVE_LZMA) */ +static int xc_try_xz_decode( + struct xc_dom_image *dom, void **blob, size_t *size) +{ + DOMPRINTF("%s: XZ decompress support unavailable", + __FUNCTION__); + return -1; +} + static int xc_try_lzma_decode( struct xc_dom_image *dom, void **blob, size_t *size) { @@ -659,6 +686,17 @@ static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) return -EINVAL; } } + else if ( check_magic(dom, "\3757zXZ", 6) ) + { + ret = xc_try_xz_decode(dom, &dom->kernel_blob, &dom->kernel_size); + if ( ret < 0 ) + { + xc_dom_panic(dom->xch, XC_INVALID_KERNEL, + "%s unable to XZ decompress kernel", + __FUNCTION__); + return -EINVAL; + } + } else if ( check_magic(dom, "\135\000", 2) ) { ret = xc_try_lzma_decode(dom, &dom->kernel_blob, &dom->kernel_size); -- 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 Sat Mar 16 23:55:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Mar 2013 23: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 1UH0wP-0005rf-5L; Sat, 16 Mar 2013 23:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wN-0005rU-DB for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:07 +0000 Received: from [85.158.143.99:22481] by server-1.bemta-4.messagelabs.com id 00/AC-06203-A5605415; Sat, 16 Mar 2013 23:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363478105!28522815!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5528 invoked from network); 16 Mar 2013 23:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2013 23:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wK-0002Ae-Q1 for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UH0wK-0001kf-IJ for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:04 +0000 Date: Sat, 16 Mar 2013 23:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: avoid undefined behavior in IS_NIL() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50ae2d0cb625a5c122f27ee69fc2f81479eee33e Author: Xi Wang AuthorDate: Fri Mar 15 10:26:17 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 15 10:26:17 2013 +0100 x86/mm: avoid undefined behavior in IS_NIL() Since pointer overflow is undefined behavior in C, some compilers such as clang optimize away the check !((ptr) + 1) in the macro IS_NIL(). This patch fixes the issue by casting the pointer type to uintptr_t, the operations of which are well-defined. Signed-off-by: Xi Wang With that, we also need to avoid the overflow in NIL(). Note that either part of the change results in the respective macros to become unsuitable for use with "void". Signed-off-by: Jan Beulich --- xen/include/asm-x86/mm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index fd9d654..41d3209 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -573,8 +573,8 @@ int donate_page( int map_ldt_shadow_page(unsigned int); -#define NIL(type) ((type *)NULL - 1) -#define IS_NIL(ptr) (!((ptr) + 1)) +#define NIL(type) ((type *)-sizeof(type)) +#define IS_NIL(ptr) (!((uintptr_t)(ptr) + sizeof(*(ptr)))) int create_perdomain_mapping(struct domain *, unsigned long va, unsigned int nr, l1_pgentry_t **, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 16 23:55:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Mar 2013 23: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 1UH0wP-0005rf-5L; Sat, 16 Mar 2013 23:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wN-0005rU-DB for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:07 +0000 Received: from [85.158.143.99:22481] by server-1.bemta-4.messagelabs.com id 00/AC-06203-A5605415; Sat, 16 Mar 2013 23:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1363478105!28522815!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5528 invoked from network); 16 Mar 2013 23:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2013 23:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wK-0002Ae-Q1 for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UH0wK-0001kf-IJ for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:04 +0000 Date: Sat, 16 Mar 2013 23:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: avoid undefined behavior in IS_NIL() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50ae2d0cb625a5c122f27ee69fc2f81479eee33e Author: Xi Wang AuthorDate: Fri Mar 15 10:26:17 2013 +0100 Commit: Jan Beulich CommitDate: Fri Mar 15 10:26:17 2013 +0100 x86/mm: avoid undefined behavior in IS_NIL() Since pointer overflow is undefined behavior in C, some compilers such as clang optimize away the check !((ptr) + 1) in the macro IS_NIL(). This patch fixes the issue by casting the pointer type to uintptr_t, the operations of which are well-defined. Signed-off-by: Xi Wang With that, we also need to avoid the overflow in NIL(). Note that either part of the change results in the respective macros to become unsuitable for use with "void". Signed-off-by: Jan Beulich --- xen/include/asm-x86/mm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index fd9d654..41d3209 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -573,8 +573,8 @@ int donate_page( int map_ldt_shadow_page(unsigned int); -#define NIL(type) ((type *)NULL - 1) -#define IS_NIL(ptr) (!((ptr) + 1)) +#define NIL(type) ((type *)-sizeof(type)) +#define IS_NIL(ptr) (!((uintptr_t)(ptr) + sizeof(*(ptr)))) int create_perdomain_mapping(struct domain *, unsigned long va, unsigned int nr, l1_pgentry_t **, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 16 23:55:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Mar 2013 23: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 1UH0wb-0005sN-8Q; Sat, 16 Mar 2013 23:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wZ-0005sB-A8 for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:19 +0000 Received: from [85.158.143.99:56857] by server-3.bemta-4.messagelabs.com id 92/E2-02186-66605415; Sat, 16 Mar 2013 23:55:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363478115!28268843!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20442 invoked from network); 16 Mar 2013 23:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2013 23:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wV-0002Ah-An for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UH0wU-0001l3-Uu for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:15 +0000 Date: Sat, 16 Mar 2013 23:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl/libxl: add gatewaydev/netdev to vif specification X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6673782013371470190==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6673782013371470190== Content-Type: text/plain commit e2abe690babf06fc49bdec49b08cb45dd3e09138 Author: Roger Pau Monne AuthorDate: Wed Mar 13 17:42:17 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 15 12:40:08 2013 +0000 xl/libxl: add gatewaydev/netdev to vif specification This option is used by the vif-route hotplug script. A new more descriptive name is used, "gatewaydev", but "netdev" is also supported as a deprecated backwards compatible option. This option was supported in the past, according to http://wiki.xen.org/wiki/Vif-route, so we should also support it in libxl. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Tested-by: Ulf Kreutzberg Cc: Ulf Kreutzberg Cc: Ian Campbell Cc: George Dunlap Acked-by: Ian Jackson --- docs/misc/xl-network-configuration.markdown | 10 ++++++++++ tools/libxl/libxl.c | 6 +++++- tools/libxl/libxl_linux.c | 9 ++++++++- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 14 ++++++++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/docs/misc/xl-network-configuration.markdown b/docs/misc/xl-network-configuration.markdown index 5e2f049..e0d3d2a 100644 --- a/docs/misc/xl-network-configuration.markdown +++ b/docs/misc/xl-network-configuration.markdown @@ -67,6 +67,15 @@ added to. The default is `xenbr0`. The bridge must be configured using your distribution's network configuration tools. See the [wiki][net] for guidance and examples. +### gatewaydev + +Specifies the name of the network interface which has an IP and which +is in the network the VIF should communicate with. This is used in the host +by the vif-route hotplug script. See [wiki][vifroute] for guidance and +examples. + +NOTE: netdev is a deprecated alias of this option. + ### type This keyword is valid for HVM guests only. @@ -158,3 +167,4 @@ on the underlying netback implementation. [oui]: http://en.wikipedia.org/wiki/Organizationally_Unique_Identifier [net]: http://wiki.xen.org/wiki/HostConfiguration/Networking +[vifroute]: http://wiki.xen.org/wiki/Vif-route diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a09c0fa..572c2c6 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2829,7 +2829,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, if (rc) goto out; front = flexarray_make(gc, 16, 1); - back = flexarray_make(gc, 16, 1); + back = flexarray_make(gc, 18, 1); if (nic->devid == -1) { if ((nic->devid = libxl__device_nextid(gc, domid, "vif") < 0)) { @@ -2865,6 +2865,10 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_append(back, "ip"); flexarray_append(back, libxl__strdup(gc, nic->ip)); } + if (nic->gatewaydev) { + flexarray_append(back, "gatewaydev"); + flexarray_append(back, libxl__strdup(gc, nic->gatewaydev)); + } if (nic->rate_interval_usecs > 0) { flexarray_append(back, "rate"); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index d34fbb3..37815eb 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -84,11 +84,16 @@ static char **get_hotplug_env(libxl__gc *gc, char *script, libxl__device *dev) { const char *type = libxl__device_kind_to_string(dev->backend_kind); + char *be_path = libxl__device_backend_path(gc, dev); char **env; + char *gatewaydev; int nr = 0; libxl_nic_type nictype; - const int arraysize = 13; + gatewaydev = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/%s", be_path, + "gatewaydev")); + + const int arraysize = 15; GCNEW_ARRAY(env, arraysize); env[nr++] = "script"; env[nr++] = script; @@ -98,6 +103,8 @@ static char **get_hotplug_env(libxl__gc *gc, env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid, dev->devid); env[nr++] = "XENBUS_BASE_PATH"; env[nr++] = "backend"; + env[nr++] = "netdev"; + env[nr++] = gatewaydev ? : ""; if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) { if (libxl__nic_type(gc, dev, &nictype)) { LOG(ERROR, "unable to get nictype"); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 5b080ed..f3c212b 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -385,6 +385,7 @@ libxl_device_nic = Struct("device_nic", [ ("nictype", libxl_nic_type), ("rate_bytes_per_interval", uint64), ("rate_interval_usecs", uint32), + ("gatewaydev", string), ]) libxl_device_pci = Struct("device_pci", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a98705e..d7ffc50 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1210,6 +1210,14 @@ static void parse_config_data(const char *config_source, parse_vif_rate(&config, (p2 + 1), nic); } else if (!strcmp(p, "accel")) { fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); + } else if (!strcmp(p, "netdev")) { + fprintf(stderr, "the netdev parameter is deprecated, " + "please use gatewaydev instead\n"); + free(nic->gatewaydev); + nic->gatewaydev = strdup(p2 + 1); + } else if (!strcmp(p, "gatewaydev")) { + free(nic->gatewaydev); + nic->gatewaydev = strdup(p2 + 1); } } while ((p = strtok(NULL, ",")) != NULL); skip_nic: @@ -5494,6 +5502,12 @@ int main_networkattach(int argc, char **argv) } } else if (MATCH_OPTION("bridge", *argv, oparg)) { replace_string(&nic.bridge, oparg); + } else if (MATCH_OPTION("netdev", *argv, oparg)) { + fprintf(stderr, "the netdev parameter is deprecated, " + "please use gatewaydev instead\n"); + replace_string(&nic.gatewaydev, oparg); + } else if (MATCH_OPTION("gatewaydev", *argv, oparg)) { + replace_string(&nic.gatewaydev, oparg); } else if (MATCH_OPTION("ip", *argv, oparg)) { replace_string(&nic.ip, oparg); } else if (MATCH_OPTION("script", *argv, oparg)) { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6673782013371470190== 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 --===============6673782013371470190==-- From xen-changelog-bounces@lists.xen.org Sat Mar 16 23:55:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Mar 2013 23: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 1UH0wb-0005sN-8Q; Sat, 16 Mar 2013 23:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wZ-0005sB-A8 for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:19 +0000 Received: from [85.158.143.99:56857] by server-3.bemta-4.messagelabs.com id 92/E2-02186-66605415; Sat, 16 Mar 2013 23:55:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1363478115!28268843!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20442 invoked from network); 16 Mar 2013 23:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 16 Mar 2013 23:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wV-0002Ah-An for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UH0wU-0001l3-Uu for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:15 +0000 Date: Sat, 16 Mar 2013 23:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl/libxl: add gatewaydev/netdev to vif specification X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6673782013371470190==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6673782013371470190== Content-Type: text/plain commit e2abe690babf06fc49bdec49b08cb45dd3e09138 Author: Roger Pau Monne AuthorDate: Wed Mar 13 17:42:17 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 15 12:40:08 2013 +0000 xl/libxl: add gatewaydev/netdev to vif specification This option is used by the vif-route hotplug script. A new more descriptive name is used, "gatewaydev", but "netdev" is also supported as a deprecated backwards compatible option. This option was supported in the past, according to http://wiki.xen.org/wiki/Vif-route, so we should also support it in libxl. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Tested-by: Ulf Kreutzberg Cc: Ulf Kreutzberg Cc: Ian Campbell Cc: George Dunlap Acked-by: Ian Jackson --- docs/misc/xl-network-configuration.markdown | 10 ++++++++++ tools/libxl/libxl.c | 6 +++++- tools/libxl/libxl_linux.c | 9 ++++++++- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 14 ++++++++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/docs/misc/xl-network-configuration.markdown b/docs/misc/xl-network-configuration.markdown index 5e2f049..e0d3d2a 100644 --- a/docs/misc/xl-network-configuration.markdown +++ b/docs/misc/xl-network-configuration.markdown @@ -67,6 +67,15 @@ added to. The default is `xenbr0`. The bridge must be configured using your distribution's network configuration tools. See the [wiki][net] for guidance and examples. +### gatewaydev + +Specifies the name of the network interface which has an IP and which +is in the network the VIF should communicate with. This is used in the host +by the vif-route hotplug script. See [wiki][vifroute] for guidance and +examples. + +NOTE: netdev is a deprecated alias of this option. + ### type This keyword is valid for HVM guests only. @@ -158,3 +167,4 @@ on the underlying netback implementation. [oui]: http://en.wikipedia.org/wiki/Organizationally_Unique_Identifier [net]: http://wiki.xen.org/wiki/HostConfiguration/Networking +[vifroute]: http://wiki.xen.org/wiki/Vif-route diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a09c0fa..572c2c6 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2829,7 +2829,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, if (rc) goto out; front = flexarray_make(gc, 16, 1); - back = flexarray_make(gc, 16, 1); + back = flexarray_make(gc, 18, 1); if (nic->devid == -1) { if ((nic->devid = libxl__device_nextid(gc, domid, "vif") < 0)) { @@ -2865,6 +2865,10 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_append(back, "ip"); flexarray_append(back, libxl__strdup(gc, nic->ip)); } + if (nic->gatewaydev) { + flexarray_append(back, "gatewaydev"); + flexarray_append(back, libxl__strdup(gc, nic->gatewaydev)); + } if (nic->rate_interval_usecs > 0) { flexarray_append(back, "rate"); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index d34fbb3..37815eb 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -84,11 +84,16 @@ static char **get_hotplug_env(libxl__gc *gc, char *script, libxl__device *dev) { const char *type = libxl__device_kind_to_string(dev->backend_kind); + char *be_path = libxl__device_backend_path(gc, dev); char **env; + char *gatewaydev; int nr = 0; libxl_nic_type nictype; - const int arraysize = 13; + gatewaydev = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/%s", be_path, + "gatewaydev")); + + const int arraysize = 15; GCNEW_ARRAY(env, arraysize); env[nr++] = "script"; env[nr++] = script; @@ -98,6 +103,8 @@ static char **get_hotplug_env(libxl__gc *gc, env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid, dev->devid); env[nr++] = "XENBUS_BASE_PATH"; env[nr++] = "backend"; + env[nr++] = "netdev"; + env[nr++] = gatewaydev ? : ""; if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) { if (libxl__nic_type(gc, dev, &nictype)) { LOG(ERROR, "unable to get nictype"); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 5b080ed..f3c212b 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -385,6 +385,7 @@ libxl_device_nic = Struct("device_nic", [ ("nictype", libxl_nic_type), ("rate_bytes_per_interval", uint64), ("rate_interval_usecs", uint32), + ("gatewaydev", string), ]) libxl_device_pci = Struct("device_pci", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a98705e..d7ffc50 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1210,6 +1210,14 @@ static void parse_config_data(const char *config_source, parse_vif_rate(&config, (p2 + 1), nic); } else if (!strcmp(p, "accel")) { fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); + } else if (!strcmp(p, "netdev")) { + fprintf(stderr, "the netdev parameter is deprecated, " + "please use gatewaydev instead\n"); + free(nic->gatewaydev); + nic->gatewaydev = strdup(p2 + 1); + } else if (!strcmp(p, "gatewaydev")) { + free(nic->gatewaydev); + nic->gatewaydev = strdup(p2 + 1); } } while ((p = strtok(NULL, ",")) != NULL); skip_nic: @@ -5494,6 +5502,12 @@ int main_networkattach(int argc, char **argv) } } else if (MATCH_OPTION("bridge", *argv, oparg)) { replace_string(&nic.bridge, oparg); + } else if (MATCH_OPTION("netdev", *argv, oparg)) { + fprintf(stderr, "the netdev parameter is deprecated, " + "please use gatewaydev instead\n"); + replace_string(&nic.gatewaydev, oparg); + } else if (MATCH_OPTION("gatewaydev", *argv, oparg)) { + replace_string(&nic.gatewaydev, oparg); } else if (MATCH_OPTION("ip", *argv, oparg)) { replace_string(&nic.ip, oparg); } else if (MATCH_OPTION("script", *argv, oparg)) { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6673782013371470190== 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 --===============6673782013371470190==-- From xen-changelog-bounces@lists.xen.org Sat Mar 16 23:55:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Mar 2013 23:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wl-0005tE-C3; Sat, 16 Mar 2013 23:55:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wj-0005t4-HP for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:29 +0000 Received: from [193.109.254.147:32263] by server-16.bemta-14.messagelabs.com id FD/8D-20064-07605415; Sat, 16 Mar 2013 23:55:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1363478126!6176220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24169 invoked from network); 16 Mar 2013 23:55:27 -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; 16 Mar 2013 23:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UH0wf-0002An-Sb for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UH0wf-0001lP-G8 for xen-changelog@lists.xensource.com; Sat, 16 Mar 2013 23:55:25 +0000 Date: Sat, 16 Mar 2013 23:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: allow specifying a default gatewaydev in xl.conf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4739927082402713120==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4739927082402713120== Content-Type: text/plain commit cb724faf0138a92dcebb8cf249ae79ba87a67ff9 Author: Roger Pau Monne AuthorDate: Wed Mar 13 17:42:17 2013 +0000 Commit: Ian Jackson CommitDate: Fri Mar 15 12:40:25 2013 +0000 xl: allow specifying a default gatewaydev in xl.conf This adds a new global option in the xl configuration file called "vif.default.gatewaydev", that is used to specify the default gatewaydev to use when none is passed in the vif specification. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Tested-by: Ulf Kreutzberg Cc: Ulf Kreutzberg Cc: Ian Campbell Cc: George Dunlap Acked-by: Ian Jackson --- docs/man/xl.conf.pod.5 | 6 ++++++ tools/examples/xl.conf | 3 +++ tools/libxl/xl.c | 14 ++++++++++++++ tools/libxl/xl.h | 1 + tools/libxl/xl_cmdimpl.c | 5 +++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5 index 82c6b20..f8f7e7f 100644 --- a/docs/man/xl.conf.pod.5 +++ b/docs/man/xl.conf.pod.5 @@ -82,6 +82,12 @@ Configures the default bridge to set for virtual network devices. Default: C +=item B + +Configures the default gateway device to set for virtual network devices. + +Default: C + =item B Configures the default output format used by xl when printing "machine diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf index 28ab796..9a03fff 100644 --- a/tools/examples/xl.conf +++ b/tools/examples/xl.conf @@ -20,3 +20,6 @@ # if disabled the old behaviour will be used, and hotplug scripts will be # launched by udev. #run_hotplug_scripts=1 + +# default gateway device to use with vif-route hotplug script +#vif.default.gatewaydev="eth0" diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index ecbcd3b..71561a4 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -43,6 +43,7 @@ int run_hotplug_scripts = 1; char *lockfile; char *default_vifscript = NULL; char *default_bridge = NULL; +char *default_gatewaydev = NULL; enum output_format default_output_format = OUTPUT_FORMAT_JSON; static xentoollog_level minmsglevel = XTL_PROGRESS; @@ -85,12 +86,25 @@ static void parse_global_config(const char *configfile, exit(1); } + /* + * For global options that are related to a specific type of device + * we use the following nomenclature: + * + * .default.